From efcc9ed5a63b01a210e2592f43c2b332a6e5032d Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Wed, 25 Feb 2015 14:19:43 +0000
Subject: Fix build with LibreSSL
PR: 196800
Approved by: maintainer timeout
---
net/mpd5/files/patch-src_ecp__dese.c | 39 +++++++++++++++++++++++++++++++
net/mpd5/files/patch-src_ecp__dese.h | 17 ++++++++++++++
net/mpd5/files/patch-src_ecp__dese__bis.c | 39 +++++++++++++++++++++++++++++++
net/mpd5/files/patch-src_ecp__dese__bis.h | 17 ++++++++++++++
net/mpd5/files/patch-src_msoft.c | 25 ++++++++++++++++++++
5 files changed, 137 insertions(+)
create mode 100644 net/mpd5/files/patch-src_ecp__dese.c
create mode 100644 net/mpd5/files/patch-src_ecp__dese.h
create mode 100644 net/mpd5/files/patch-src_ecp__dese__bis.c
create mode 100644 net/mpd5/files/patch-src_ecp__dese__bis.h
create mode 100644 net/mpd5/files/patch-src_msoft.c
(limited to 'net/mpd5')
diff --git a/net/mpd5/files/patch-src_ecp__dese.c b/net/mpd5/files/patch-src_ecp__dese.c
new file mode 100644
index 000000000000..1057c93a2468
--- /dev/null
+++ b/net/mpd5/files/patch-src_ecp__dese.c
@@ -0,0 +1,39 @@
+--- src/ecp_dese.c.orig 2013-06-11 09:00:00 UTC
++++ src/ecp_dese.c
+@@ -89,11 +89,10 @@ DesConfigure(Bund b)
+ {
+ EcpState const ecp = &b->ecp;
+ DesInfo const des = &ecp->des;
+- des_cblock key;
++ DES_cblock key;
+
+- des_check_key = FALSE;
+- des_string_to_key(ecp->key, &key);
+- des_set_key(&key, des->ks);
++ DES_string_to_key(ecp->key, &key);
++ DES_set_key(&key, &des->ks);
+ des->xmit_seq = 0;
+ des->recv_seq = 0;
+ }
+@@ -191,7 +190,7 @@ DesEncrypt(Bund b, Mbuf plain)
+ {
+ u_char *const block = MBDATA(cypher) + DES_OVERHEAD + k;
+
+- des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
++ DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
+ memcpy(des->xmit_ivec, block, 8);
+ }
+
+@@ -258,10 +257,10 @@ DesDecrypt(Bund b, Mbuf cypher)
+ for (k = 0; k < clen; k += 8)
+ {
+ u_char *const block = MBDATA(plain) + k;
+- des_cblock next_ivec;
++ DES_cblock next_ivec;
+
+ memcpy(next_ivec, block, 8);
+- des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
++ DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
+ memcpy(des->recv_ivec, next_ivec, 8);
+ }
+
diff --git a/net/mpd5/files/patch-src_ecp__dese.h b/net/mpd5/files/patch-src_ecp__dese.h
new file mode 100644
index 000000000000..df8a19bd33f6
--- /dev/null
+++ b/net/mpd5/files/patch-src_ecp__dese.h
@@ -0,0 +1,17 @@
+--- src/ecp_dese.h.orig 2013-06-11 09:00:00 UTC
++++ src/ecp_dese.h
+@@ -30,11 +30,11 @@
+
+ struct desinfo
+ {
+- des_cblock xmit_ivec; /* Xmit initialization vector */
+- des_cblock recv_ivec; /* Recv initialization vector */
++ DES_cblock xmit_ivec; /* Xmit initialization vector */
++ DES_cblock recv_ivec; /* Recv initialization vector */
+ u_int16_t xmit_seq; /* Transmit sequence number */
+ u_int16_t recv_seq; /* Receive sequence number */
+- des_key_schedule ks; /* Key schedule */
++ DES_key_schedule ks; /* Key schedule */
+ struct dese_stats recv_stats;
+ struct dese_stats xmit_stats;
+ };
diff --git a/net/mpd5/files/patch-src_ecp__dese__bis.c b/net/mpd5/files/patch-src_ecp__dese__bis.c
new file mode 100644
index 000000000000..574c1e263bda
--- /dev/null
+++ b/net/mpd5/files/patch-src_ecp__dese__bis.c
@@ -0,0 +1,39 @@
+--- src/ecp_dese_bis.c.orig 2013-06-11 09:00:00 UTC
++++ src/ecp_dese_bis.c
+@@ -89,11 +89,10 @@ DeseBisConfigure(Bund b)
+ {
+ EcpState const ecp = &b->ecp;
+ DeseBisInfo const des = &ecp->desebis;
+- des_cblock key;
++ DES_cblock key;
+
+- des_check_key = FALSE;
+- des_string_to_key(ecp->key, &key);
+- des_set_key(&key, des->ks);
++ DES_string_to_key(ecp->key, &key);
++ DES_set_key(&key, &des->ks);
+ des->xmit_seq = 0;
+ des->recv_seq = 0;
+ }
+@@ -204,7 +203,7 @@ DeseBisEncrypt(Bund b, Mbuf plain)
+ {
+ u_char *const block = MBDATA(cypher) + DES_OVERHEAD + k;
+
+- des_cbc_encrypt(block, block, 8, des->ks, &des->xmit_ivec, TRUE);
++ DES_cbc_encrypt(block, block, 8, &des->ks, &des->xmit_ivec, TRUE);
+ memcpy(des->xmit_ivec, block, 8);
+ }
+
+@@ -271,10 +270,10 @@ DeseBisDecrypt(Bund b, Mbuf cypher)
+ for (k = 0; k < clen; k += 8)
+ {
+ u_char *const block = MBDATA(plain) + k;
+- des_cblock next_ivec;
++ DES_cblock next_ivec;
+
+ memcpy(next_ivec, block, 8);
+- des_cbc_encrypt(block, block, 8, des->ks, &des->recv_ivec, FALSE);
++ DES_cbc_encrypt(block, block, 8, &des->ks, &des->recv_ivec, FALSE);
+ memcpy(des->recv_ivec, next_ivec, 8);
+ }
+
diff --git a/net/mpd5/files/patch-src_ecp__dese__bis.h b/net/mpd5/files/patch-src_ecp__dese__bis.h
new file mode 100644
index 000000000000..9c14d0cad1b4
--- /dev/null
+++ b/net/mpd5/files/patch-src_ecp__dese__bis.h
@@ -0,0 +1,17 @@
+--- src/ecp_dese_bis.h.orig 2013-06-11 09:00:00 UTC
++++ src/ecp_dese_bis.h
+@@ -30,11 +30,11 @@
+
+ struct desebisinfo
+ {
+- des_cblock xmit_ivec; /* Xmit initialization vector */
+- des_cblock recv_ivec; /* Recv initialization vector */
++ DES_cblock xmit_ivec; /* Xmit initialization vector */
++ DES_cblock recv_ivec; /* Recv initialization vector */
+ u_int16_t xmit_seq; /* Transmit sequence number */
+ u_int16_t recv_seq; /* Receive sequence number */
+- des_key_schedule ks; /* Key schedule */
++ DES_key_schedule ks; /* Key schedule */
+ struct desebis_stats recv_stats;
+ struct desebis_stats xmit_stats;
+ };
diff --git a/net/mpd5/files/patch-src_msoft.c b/net/mpd5/files/patch-src_msoft.c
new file mode 100644
index 000000000000..cc6160c0d4d2
--- /dev/null
+++ b/net/mpd5/files/patch-src_msoft.c
@@ -0,0 +1,25 @@
+--- src/msoft.c.orig 2013-06-11 09:00:00 UTC
++++ src/msoft.c
+@@ -164,7 +164,7 @@ ChallengeResponse(const u_char *chal, co
+ static void
+ DesEncrypt(const u_char *clear, u_char *key0, u_char *cypher)
+ {
+- des_key_schedule ks;
++ DES_key_schedule ks;
+ u_char key[8];
+
+ /* Create DES key */
+@@ -177,11 +177,11 @@ DesEncrypt(const u_char *clear, u_char *
+ key[5] = (key0[4] << 3) | (key0[5] >> 5);
+ key[6] = (key0[5] << 2) | (key0[6] >> 6);
+ key[7] = key0[6] << 1;
+- des_set_key((des_cblock *) key, ks);
++ DES_set_key((DES_cblock *) key, &ks);
+
+ /* Encrypt using key */
+
+- des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cypher, ks, 1);
++ DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cypher, &ks, 1);
+ }
+
+ /*
--
cgit v1.2.3