Attachment 153919 Details for Bug 198364 – svn diff for security/pidentd

[patch] svn diff for security/pidentd

patch-security_pidentd (text/plain), 3.96 KB, created by Bernard Spil on 2015-03-06 17:59:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-03-06 17:59:49 UTC

Size: 3.96 KB

patch

obsolete

>Index: security/pidentd/files/patch-src_idecrypt.c
>===================================================================
>--- security/pidentd/files/patch-src_idecrypt.c	(revision 0)
>+++ security/pidentd/files/patch-src_idecrypt.c	(working copy)
>@@ -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++)
>
>Property changes on: security/pidentd/files/patch-src_idecrypt.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: security/pidentd/files/patch-src_pides.c
>===================================================================
>--- security/pidentd/files/patch-src_pides.c	(revision 0)
>+++ security/pidentd/files/patch-src_pides.c	(working copy)
>@@ -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;
>
>Property changes on: security/pidentd/files/patch-src_pides.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198364: 153919 | 153922 | 153923