svn commit: r380875 - in head/security/pidentd: . files
Johan van Selst
johans at FreeBSD.org
Mon Mar 9 19:45:02 UTC 2015
Author: johans
Date: Mon Mar 9 19:45:00 2015
New Revision: 380875
URL: https://svnweb.freebsd.org/changeset/ports/380875
QAT: https://qat.redports.org/buildarchive/r380875/
Log:
security/pidentd uses deprecated des_ methods and types that were marked
deprecated by OpenSSL 0.9.7 and will be removed in OpenSSL 1.1.0.
This patch replaces the des_ methods and types with their new DES_ counterparts.
PR: 198364
Submitted by: Bernard Spil <spil.oss at gmail.com>
Added:
head/security/pidentd/files/patch-src_idecrypt.c (contents, props changed)
head/security/pidentd/files/patch-src_pides.c (contents, props changed)
Modified:
head/security/pidentd/Makefile
Modified: head/security/pidentd/Makefile
==============================================================================
--- head/security/pidentd/Makefile Mon Mar 9 19:41:18 2015 (r380874)
+++ head/security/pidentd/Makefile Mon Mar 9 19:45:00 2015 (r380875)
@@ -3,7 +3,7 @@
PORTNAME= pidentd
PORTVERSION= 3.0.19
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.lysator.liu.se/pub/unix/ident/servers/ \
ftp://ftp.stack.nl/pub/users/johans/pidentd/
Added: head/security/pidentd/files/patch-src_idecrypt.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/pidentd/files/patch-src_idecrypt.c Mon Mar 9 19:45:00 2015 (r380875)
@@ -0,0 +1,46 @@
+--- src/idecrypt.c.orig 2015-02-28 20:14:56.633084000 +0100
++++ src/idecrypt.c 2015-02-28 20:19:20.661476344 +0100
+@@ -100,8 +100,8 @@
+ char buf1[40], buf2[40];
+ struct sockaddr_gen ip_local, ip_remote;
+ int keyfile_fd;
+- des_cblock key_bin;
+- des_key_schedule sched;
++ DES_cblock key_bin;
++ DES_key_schedule sched;
+ static char readable[256];
+
+
+@@ -118,8 +118,8 @@
+ while (read(keyfile_fd, keybuf, sizeof(keybuf)-1) == sizeof(keybuf)-1)
+ {
+ keybuf[sizeof(keybuf)-1] = '\0';
+- des_string_to_key(keybuf, &key_bin);
+- des_set_key(&key_bin, sched);
++ DES_string_to_key(keybuf, &key_bin);
++ DES_set_key(&key_bin, &sched);
+
+ count = (len == 32) ? 24 : 48;
+ for (i = 0, j = 0; i < count; i += 3, j += 4)
+@@ -131,15 +131,15 @@
+
+ count = (len == 32) ? 2 : 8;
+ for (i = count; i >= 0; i -= 2) {
+- des_ecb_encrypt((des_cblock *)&(r.longs[i+2]),
+- (des_cblock *)&(r.longs[i+2]),
+- sched, DES_DECRYPT);
++ DES_ecb_encrypt((DES_cblock *)&(r.longs[i+2]),
++ (DES_cblock *)&(r.longs[i+2]),
++ &sched, DES_DECRYPT);
+ r.longs[i+2] ^= r.longs[i ];
+ r.longs[i+3] ^= r.longs[i+1];
+ }
+- des_ecb_encrypt((des_cblock *)&(r.longs[0]),
+- (des_cblock *)&(r.longs[0]),
+- sched, DES_DECRYPT);
++ DES_ecb_encrypt((DES_cblock *)&(r.longs[0]),
++ (DES_cblock *)&(r.longs[0]),
++ &sched, DES_DECRYPT);
+
+ count = (len == 32) ? 6 : 12;
+ for (i = 1; i < count; i++)
Added: head/security/pidentd/files/patch-src_pides.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/security/pidentd/files/patch-src_pides.c Mon Mar 9 19:45:00 2015 (r380875)
@@ -0,0 +1,52 @@
+--- src/pdes.c.orig 2015-02-28 20:14:56.633084000 +0100
++++ src/pdes.c 2015-02-28 20:17:14.869504878 +0100
+@@ -46,7 +46,7 @@
+
+
+
+-static des_key_schedule sched;
++static DES_key_schedule sched;
+
+
+
+@@ -55,7 +55,7 @@
+ {
+ char keybuf[1024+1];
+ int fd, res;
+- des_cblock key_bin;
++ DES_cblock key_bin;
+
+
+ if (keyfile == NULL)
+@@ -100,8 +100,8 @@
+ }
+
+ keybuf[sizeof(keybuf)-1] = '\0';
+- des_string_to_key(keybuf, &key_bin);
+- des_set_key(&key_bin, sched);
++ DES_string_to_key(keybuf, &key_bin);
++ DES_set_key(&key_bin, &sched);
+
+ return 0;
+ }
+@@ -162,16 +162,16 @@
+ for (i = 1; i < count; i++)
+ r.longs[0] ^= r.longs[i];
+
+- des_ecb_encrypt((des_cblock *)&(r.longs[0]), (des_cblock *)&(r.longs[0]),
+- sched, DES_ENCRYPT);
++ DES_ecb_encrypt((DES_cblock *)&(r.longs[0]), (DES_cblock *)&(r.longs[0]),
++ &sched, DES_ENCRYPT);
+
+ count = (family == AF_INET) ? 4 : 10;
+ for (i = 0; i < count; i += 2) {
+ r.longs[i+2] ^= r.longs[i ];
+ r.longs[i+3] ^= r.longs[i+1];
+
+- des_ecb_encrypt((des_cblock *)&(r.longs[i+2]),
+- (des_cblock *)&(r.longs[i+2]), sched, DES_ENCRYPT);
++ DES_ecb_encrypt((DES_cblock *)&(r.longs[i+2]),
++ (DES_cblock *)&(r.longs[i+2]), &sched, DES_ENCRYPT);
+ }
+
+ count = (family == AF_INET) ? 24 : 48;
More information about the svn-ports-head
mailing list