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

(-)security/hydra/files/patch-hydra-oracle-listener.c (+33 lines)
Line 0 Link Here
1
--- hydra-oracle-listener.c.orig	2014-12-07 15:50:20.000000000 +0100
2
+++ hydra-oracle-listener.c	2015-02-28 12:55:33.285896567 +0100
3
@@ -106,7 +106,7 @@
4
 int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) {
5
   int i = 0;
6
   char lastkey[8];
7
-  des_key_schedule ks1;
8
+  DES_key_schedule ks1;
9
   unsigned char key1[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF };
10
   unsigned char ivec1[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
11
   unsigned char *desresult;
12
@@ -116,17 +116,17 @@
13
     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
14
     return 1;
15
   }
16
-  des_key_sched((C_Block *) key1, ks1);
17
-  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
18
+  DES_key_sched((DES_cblock *) key1, &ks1);
19
+  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
20
 
21
   for (i = 0; i < 8; i++) {
22
     lastkey[i] = desresult[siz - 8 + i];
23
   }
24
 
25
-  des_key_sched((C_Block *) lastkey, ks1);
26
+  DES_key_sched((DES_cblock *) lastkey, &ks1);
27
   memset(desresult, 0, siz);
28
   memset(ivec1, 0, sizeof(ivec1));
29
-  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
30
+  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
31
 
32
   if ((*rs = malloc(siz)) == NULL) {
33
     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
(-)security/hydra/files/patch-hydra-smb.c (+25 lines)
Line 0 Link Here
1
--- hydra-smb.c.orig	2014-12-07 15:50:24.000000000 +0100
2
+++ hydra-smb.c	2015-02-28 12:46:44.362186221 +0100
3
@@ -176,17 +176,17 @@
4
   des_key[6] = Get7Bits(key, 42);
5
   des_key[7] = Get7Bits(key, 49);
6
 
7
-  des_set_odd_parity((des_cblock *) des_key);
8
+  DES_set_odd_parity((DES_cblock *) des_key);
9
 }
10
 
11
 /* Do the DesEncryption */
12
 void DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher) {
13
-  des_cblock des_key;
14
-  des_key_schedule key_schedule;
15
+  DES_cblock des_key;
16
+  DES_key_schedule key_schedule;
17
 
18
   MakeKey(key, des_key);
19
-  des_set_key(&des_key, key_schedule);
20
-  des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cipher, key_schedule, 1);
21
+  DES_set_key(&des_key, &key_schedule);
22
+  DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cipher, &key_schedule, 1);
23
 }
24
 
25
 /*
(-)security/hydra/files/patch-hydra-snmp.c (+28 lines)
Line 0 Link Here
1
--- hydra-snmp.c.orig	2014-12-07 15:50:24.000000000 +0100
2
+++ hydra-snmp.c	2015-02-28 12:52:49.999228359 +0100
3
@@ -335,13 +335,13 @@
4
       // xor initVect with salt  
5
       for (i = 0; i < 8; i++)
6
         initVect[i] ^= privacy_params[i];
7
-      des_key_sched((C_Block *) key, symcbc);
8
-      des_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, symcbc, (C_Block *) (initVect), DES_ENCRYPT);
9
+      DES_key_sched((DES_cblock *) key, &symcbc);
10
+      DES_ncbc_encrypt(snmpv3_get2 + 2, buf, sizeof(snmpv3_get2) - 2, &symcbc, (DES_cblock *) (initVect), DES_ENCRYPT);
11
 
12
 #endif
13
 
14
 /*  for (i = 0; i <= sizeof(snmpv3_get2) - 8; i += 8) {  
15
-    des_ncbc_encrypt(snmpv3_get2 + i, buf + i, 8, (C_Block*)(initVect), DES_ENCRYPT);
16
+    DES_ncbc_encrypt(snmpv3_get2 + i, buf + i, 8, (DES_cblock*)(initVect), DES_ENCRYPT);
17
   }  
18
   // last part of buffer
19
   if (buffer_len % 8) {  
20
@@ -351,7 +351,7 @@
21
     memset(tmp_buf, 0, 8);  
22
     for (unsigned int l = start; l < buffer_len; l++)  
23
       *tmp_buf_ptr++ = buffer[l];  
24
-    des_ncbc_encrypt(tmp_buf, buf + start, 1, symcbc, (C_Block*)(initVect), DES_ENCRYPT);
25
+    DES_ncbc_encrypt(tmp_buf, buf + start, 1, &symcbc, (DES_cblock*)(initVect), DES_ENCRYPT);
26
     *out_buffer_len = buffer_len + 8 - (buffer_len % 8);  
27
   } else  
28
     *out_buffer_len = buffer_len;  

Return to bug 198533