View | Details | Raw Unified | Return to bug 198364 | Differences between
and this patch

Collapse All | Expand All

(-)security/pidentd/files/patch-src_idecrypt.c (+46 lines)
Line 0 Link Here
1 
--- src/idecrypt.c.orig	2015-02-28 20:14:56.633084000 +0100
2 
+++ src/idecrypt.c	2015-02-28 20:19:20.661476344 +0100
3 
@@ -100,8 +100,8 @@
4 
     char buf1[40], buf2[40];
5 
     struct sockaddr_gen ip_local, ip_remote;
6 
     int keyfile_fd;
7 
-    des_cblock key_bin;
8 
-    des_key_schedule sched;
9 
+    DES_cblock key_bin;
10 
+    DES_key_schedule sched;
11 
     static char readable[256];
12
13
14 
@@ -118,8 +118,8 @@
15 
     while (read(keyfile_fd, keybuf, sizeof(keybuf)-1) == sizeof(keybuf)-1)
16 
     {
17 
 	keybuf[sizeof(keybuf)-1] = '\0';
18 
-	des_string_to_key(keybuf, &key_bin);
19 
-	des_set_key(&key_bin, sched);
20 
+	DES_string_to_key(keybuf, &key_bin);
21 
+	DES_set_key(&key_bin, sched);
22
23 
 	count = (len == 32) ? 24 : 48;
24 
 	for (i = 0, j = 0; i < count; i += 3, j += 4)
25 
@@ -131,15 +131,15 @@
26
27 
 	count = (len == 32) ? 2 : 8;
28 
 	for (i = count; i >= 0; i -= 2) {
29 
-	    des_ecb_encrypt((des_cblock *)&(r.longs[i+2]),
30 
-			    (des_cblock *)&(r.longs[i+2]),
31 
-			    sched, DES_DECRYPT);
32 
+	    DES_ecb_encrypt((DES_cblock *)&(r.longs[i+2]),
33 
+			    (DES_cblock *)&(r.longs[i+2]),
34 
+			    &sched, DES_DECRYPT);
35 
 	    r.longs[i+2] ^= r.longs[i  ];
36 
 	    r.longs[i+3] ^= r.longs[i+1];
37 
 	}
38 
-	des_ecb_encrypt((des_cblock *)&(r.longs[0]),
39 
-			(des_cblock *)&(r.longs[0]),
40 
-			sched, DES_DECRYPT);
41 
+	DES_ecb_encrypt((DES_cblock *)&(r.longs[0]),
42 
+			(DES_cblock *)&(r.longs[0]),
43 
+			&sched, DES_DECRYPT);
44
45 
 	count = (len == 32) ? 6 : 12;
46 
 	for (i = 1; i < count; i++)
(-)security/pidentd/files/patch-src_pides.c (+52 lines)
Line 0 Link Here
1 
--- src/pdes.c.orig	2015-02-28 20:14:56.633084000 +0100
2 
+++ src/pdes.c	2015-02-28 20:17:14.869504878 +0100
3 
@@ -46,7 +46,7 @@
4
5
6
7 
-static des_key_schedule sched;
8 
+static DES_key_schedule sched;
9
10
11
12 
@@ -55,7 +55,7 @@
13 
 {
14 
     char keybuf[1024+1];
15 
     int fd, res;
16 
-    des_cblock key_bin;
17 
+    DES_cblock key_bin;
18
19
20 
     if (keyfile == NULL)
21 
@@ -100,8 +100,8 @@
22 
     }
23
24 
     keybuf[sizeof(keybuf)-1] = '\0';
25 
-    des_string_to_key(keybuf, &key_bin);
26 
-    des_set_key(&key_bin, sched);
27 
+    DES_string_to_key(keybuf, &key_bin);
28 
+    DES_set_key(&key_bin, &sched);
29
30 
     return 0;
31 
 }
32 
@@ -162,16 +162,16 @@
33 
     for (i = 1; i < count; i++)
34 
 	r.longs[0] ^= r.longs[i];
35
36 
-    des_ecb_encrypt((des_cblock *)&(r.longs[0]), (des_cblock *)&(r.longs[0]),
37 
-		    sched, DES_ENCRYPT);
38 
+    DES_ecb_encrypt((DES_cblock *)&(r.longs[0]), (DES_cblock *)&(r.longs[0]),
39 
+		    &sched, DES_ENCRYPT);
40
41 
     count = (family == AF_INET) ? 4 : 10;
42 
     for (i = 0; i < count; i += 2) {
43 
 	r.longs[i+2] ^= r.longs[i  ];
44 
 	r.longs[i+3] ^= r.longs[i+1];
45
46 
-	des_ecb_encrypt((des_cblock *)&(r.longs[i+2]),
47 
-			(des_cblock *)&(r.longs[i+2]), sched, DES_ENCRYPT);
48 
+	DES_ecb_encrypt((DES_cblock *)&(r.longs[i+2]),
49 
+			(DES_cblock *)&(r.longs[i+2]), &sched, DES_ENCRYPT);
50 
     }
51
52 
     count = (family == AF_INET) ? 24 : 48;

Return to bug 198364