View | Details | Raw Unified | Return to bug 198348
Collapse All | Expand All

(-)security/john/files/patch-src__KRB4_fmt_plug.c (+11 lines)
Line 0 Link Here
1 
--- src/KRB4_fmt_plug.c.orig	2012-09-17 10:30:39.000000000 +0200
2 
+++ src/KRB4_fmt_plug.c	2015-02-28 20:34:23.845351319 +0100
3 
@@ -182,7 +182,7 @@
4 
 	if (saved_salt->realm[0] != '\0')
5 
 		afs_string_to_key(key, saved_salt->realm, &saved_key.key);
6 
 	else
7 
-		des_string_to_key(key, &saved_key.key);
8 
+		DES_string_to_key(key, &saved_key.key);
9
10 
 	strnzcpy(saved_key.string, key, sizeof(saved_key.string));
11 
 }
(-)security/john/files/patch-src__KRB4_std_plug.c (+11 lines)
Line 0 Link Here
1 
--- src/KRB4_std_plug.c.orig	2012-07-10 12:35:20.000000000 +0200
2 
+++ src/KRB4_std_plug.c	2015-02-28 20:32:34.494881776 +0100
3 
@@ -29,7 +29,7 @@
4 
 #include "KRB4_std.h"
5
6 
 #ifndef des_fixup_key_parity
7 
-#define des_fixup_key_parity	des_set_odd_parity
8 
+#define des_fixup_key_parity	DES_set_odd_parity
9 
 #endif
10
11 
 static void
(-)security/john/files/patch-src__keychain_fmt_plug.c (+15 lines)
Line 0 Link Here
1 
--- src/keychain_fmt_plug.c.orig	2012-09-17 10:30:39.000000000 +0200
2 
+++ src/keychain_fmt_plug.c	2015-02-28 20:31:01.902977498 +0100
3 
@@ -119,9 +119,9 @@
4 
 	memcpy(key1, key, 8);
5 
 	memcpy(key2, key + 8, 8);
6 
 	memcpy(key3, key + 16, 8);
7 
-	DES_set_key((C_Block *) key1, &ks1);
8 
-	DES_set_key((C_Block *) key2, &ks2);
9 
-	DES_set_key((C_Block *) key3, &ks3);
10 
+	DES_set_key((DES_cblock *) key1, &ks1);
11 
+	DES_set_key((DES_cblock *) key2, &ks2);
12 
+	DES_set_key((DES_cblock *) key3, &ks3);
13 
 	memcpy(ivec, iv, 8);
14 
 	DES_ede3_cbc_encrypt(data, out, CTLEN, &ks1, &ks2, &ks3, &ivec,  DES_DECRYPT);
15

Return to bug 198348