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

(-)security/ophcrack/files/patch-src_lmtable.c (+24 lines)
Line 0 Link Here
1 
--- src/lmtable.c.orig	2013-06-04 09:42:47.000000000 +0200
2 
+++ src/lmtable.c	2015-02-28 16:09:56.704714102 +0100
3 
@@ -470,8 +470,8 @@
4 
 /*-------------------------------------------------------------------------*/
5 
 void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
6 
   uchar_t key[8];
7 
-  des_key_schedule ks;
8 
-  des_cblock *magic = (des_cblock*)lmmagic;
9 
+  DES_key_schedule ks;
10 
+  DES_cblock *magic = (DES_cblock*)lmmagic;
11
12 
   key[0] = pwd[0];
13 
   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
14 
@@ -482,7 +482,7 @@
15 
   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
16 
   key[7] = (pwd[6] << 1) ;
17
18 
-  des_set_odd_parity(&key);
19 
-  des_set_key(&key, ks);
20 
-  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
21 
+  DES_set_odd_parity(&key);
22 
+  DES_set_key(&key, &ks);
23 
+  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
24 
 }
(-)security/ophcrack/files/patch-src_samdump2_samdump2.c (+67 lines)
Line 0 Link Here
1 
--- src/samdump2/samdump2.c.orig	2015-02-28 16:01:54.751900000 +0100
2 
+++ src/samdump2/samdump2.c	2015-02-28 16:08:38.049462876 +0100
3 
@@ -71,7 +71,7 @@
4 
 	for (i=0;i<8;i++) {
5 
 		key[i] = (key[i]<<1);
6 
 	}
7 
-	des_set_odd_parity((des_cblock *)key);
8 
+	DES_set_odd_parity((DES_cblock *)key);
9 
 }
10
11 
 /*
12 
@@ -209,8 +209,8 @@
13 
   unsigned char hbootkey[0x20];
14
15 
   /* Des */
16 
-  des_key_schedule ks1, ks2;
17 
-  des_cblock deskey1, deskey2;
18 
+  DES_key_schedule ks1, ks2;
19 
+  DES_cblock deskey1, deskey2;
20
21 
   int i, j;
22
23 
@@ -418,15 +418,15 @@
24
25 
       /* Get the two decrpt keys. */
26 
       sid_to_key1(rid,(unsigned char *)deskey1);
27 
-      des_set_key_checked((des_cblock *)deskey1,ks1);
28 
+      DES_set_key_checked((DES_cblock *)deskey1,&ks1);
29 
       sid_to_key2(rid,(unsigned char *)deskey2);
30 
-      des_set_key_unchecked((des_cblock *)deskey2,ks2);
31 
+      DES_set_key_unchecked((DES_cblock *)deskey2,&ks2);
32
33 
       /* Decrypt the lanman password hash as two 8 byte blocks. */
34 
-      des_ecb_encrypt((des_cblock *)obfkey,
35 
-		      (des_cblock *)fb, ks1, DES_DECRYPT);
36 
-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
37 
-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
38 
+      DES_ecb_encrypt((DES_cblock *)obfkey,
39 
+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
40 
+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
41 
+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
42
43
44
45 
@@ -471,16 +471,16 @@
46 
       if (lm_size != 0x14) {
47 
 	/* Get the two decrpt keys. */
48 
 	sid_to_key1(rid,(unsigned char *)deskey1);
49 
-	des_set_key((des_cblock *)deskey1,ks1);
50 
+	DES_set_key((DES_cblock *)deskey1,&ks1);
51 
 	sid_to_key2(rid,(unsigned char *)deskey2);
52 
-	des_set_key((des_cblock *)deskey2,ks2);
53 
+	DES_set_key((DES_cblock *)deskey2,&ks2);
54 
       }
55
56 
       /* Decrypt the NT md4 password hash as two 8 byte blocks. */
57 
-      des_ecb_encrypt((des_cblock *)obfkey,
58 
-		      (des_cblock *)fb, ks1, DES_DECRYPT);
59 
-      des_ecb_encrypt((des_cblock *)(obfkey + 8),
60 
-		      (des_cblock *)&fb[8], ks2, DES_DECRYPT);
61 
+      DES_ecb_encrypt((DES_cblock *)obfkey,
62 
+		      (DES_cblock *)fb, &ks1, DES_DECRYPT);
63 
+      DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
64 
+		      (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
65
66 
       /* sf27 wrap to sf25 */
67 
       //sf27( obfkey, (int*)&rid, fb );

Return to bug 198352