Only two des_ heads to cut off...

ok?

Index: patches/patch-hydra-oracle-listener_c
===================================================================
RCS file: patches/patch-hydra-oracle-listener_c
diff -N patches/patch-hydra-oracle-listener_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-hydra-oracle-listener_c       14 Apr 2014 20:53:00 -0000
@@ -0,0 +1,34 @@
+$OpenBSD$
+--- hydra-oracle-listener.c.orig       Sun Oct  2 10:06:15 2011
++++ hydra-oracle-listener.c    Mon Apr 14 22:49:36 2014
+@@ -105,7 +105,7 @@ int convert_byteorder(unsigned char **result, int size
+ int ora_descrypt(unsigned char **rs, unsigned char *result, int siz) {
+   int i = 0;
+   char lastkey[8];
+-  des_key_schedule ks1;
++  DES_key_schedule ks1;
+   unsigned char key1[8] = { 0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF };
+   unsigned char ivec1[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+   unsigned char *desresult;
+@@ -115,17 +115,17 @@ int ora_descrypt(unsigned char **rs, unsigned char *re
+     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
+     return 1;
+   }
+-  des_key_sched((C_Block *) key1, ks1);
+-  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
++  DES_key_sched((DES_cblock *) key1, &ks1);
++  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
+ 
+   for (i = 0; i < 8; i++) {
+     lastkey[i] = desresult[siz - 8 + i];
+   }
+ 
+-  des_key_sched((C_Block *) lastkey, ks1);
++  DES_key_sched((DES_cblock *) lastkey, &ks1);
+   memset(desresult, 0, siz);
+   memset(ivec1, 0, sizeof(ivec1));
+-  des_ncbc_encrypt(result, desresult, siz, ks1, &ivec1, DES_ENCRYPT);
++  DES_ncbc_encrypt(result, desresult, siz, &ks1, &ivec1, DES_ENCRYPT);
+ 
+   if ((*rs = malloc(siz)) == NULL) {
+     hydra_report(stderr, "[ERROR] Can't allocate memory\n");
Index: patches/patch-hydra-smb_c
===================================================================
RCS file: patches/patch-hydra-smb_c
diff -N patches/patch-hydra-smb_c
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-hydra-smb_c   14 Apr 2014 20:53:00 -0000
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- hydra-smb.c.orig   Sun Oct  2 10:06:15 2011
++++ hydra-smb.c        Mon Apr 14 22:35:34 2014
+@@ -139,19 +139,19 @@ MakeKey(unsigned char *key, unsigned char *des_key)
+   des_key[6] = Get7Bits(key, 42);
+   des_key[7] = Get7Bits(key, 49);
+ 
+-  des_set_odd_parity((des_cblock *) des_key);
++  DES_set_odd_parity((DES_cblock *) des_key);
+ }
+ 
+ /* Do the DesEncryption */
+ void
+ DesEncrypt(unsigned char *clear, unsigned char *key, unsigned char *cipher)
+ {
+-  des_cblock des_key;
+-  des_key_schedule key_schedule;
++  DES_cblock des_key;
++  DES_key_schedule key_schedule;
+ 
+   MakeKey(key, des_key);
+-  des_set_key(&des_key, key_schedule);
+-  des_ecb_encrypt((des_cblock *) clear, (des_cblock *) cipher, key_schedule, 
1);
++  DES_set_key(&des_key, &key_schedule);
++  DES_ecb_encrypt((DES_cblock *) clear, (DES_cblock *) cipher, &key_schedule, 
1);
+ }
+ 
+ /*
-- 
Christian "naddy" Weisgerber                          [email protected]

Reply via email to