Bug#828537: samdump2: FTBFS with openssl 1.1.0
Control: tags 828537 patch
Hi,
I believe that the attached patch will solve the issue.
Regards,
Eriberto
Description: fix a FTBFS, making the source code compatible with new
OpenSSL 1.1.0. (Closes: #828537)
Author: Joao Eriberto Mota Filho <eriberto@debian.org>
Last-Update: 2016-11-11
Index: samdump2-3.0.0/samdump2.c
===================================================================
--- samdump2-3.0.0.orig/samdump2.c
+++ samdump2-3.0.0/samdump2.c
@@ -72,7 +72,7 @@ void str_to_key(unsigned char *str,unsig
for (i=0;i<8;i++) {
key[i] = (key[i]<<1);
}
- des_set_odd_parity((des_cblock *)key);
+ DES_set_odd_parity((DES_cblock *)key);
}
/*
@@ -210,8 +210,8 @@ unsigned char* utf16_to_utf8 (unsigned c
unsigned char hbootkey[0x20];
/* Des */
- des_key_schedule ks1, ks2;
- des_cblock deskey1, deskey2;
+ DES_key_schedule ks1, ks2;
+ DES_cblock deskey1, deskey2;
int i, j;
@@ -419,15 +419,15 @@ unsigned char* utf16_to_utf8 (unsigned c
/* Get the two decrpt keys. */
sid_to_key1(rid,(unsigned char *)deskey1);
- des_set_key_checked((des_cblock *)deskey1,ks1);
+ DES_set_key_checked((DES_cblock *)deskey1, &ks1);
sid_to_key2(rid,(unsigned char *)deskey2);
- des_set_key_unchecked((des_cblock *)deskey2,ks2);
+ DES_set_key_unchecked((DES_cblock *)deskey2, &ks2);
/* Decrypt the lanman password hash as two 8 byte blocks. */
- des_ecb_encrypt((des_cblock *)obfkey,
- (des_cblock *)fb, ks1, DES_DECRYPT);
- des_ecb_encrypt((des_cblock *)(obfkey + 8),
- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
+ DES_ecb_encrypt((DES_cblock *)obfkey,
+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
@@ -472,16 +472,16 @@ unsigned char* utf16_to_utf8 (unsigned c
if (lm_size != 0x14) {
/* Get the two decrpt keys. */
sid_to_key1(rid,(unsigned char *)deskey1);
- des_set_key((des_cblock *)deskey1,ks1);
+ DES_set_key((DES_cblock *)deskey1,&ks1);
sid_to_key2(rid,(unsigned char *)deskey2);
- des_set_key((des_cblock *)deskey2,ks2);
+ DES_set_key((DES_cblock *)deskey2,&ks2);
}
/* Decrypt the NT md4 password hash as two 8 byte blocks. */
- des_ecb_encrypt((des_cblock *)obfkey,
- (des_cblock *)fb, ks1, DES_DECRYPT);
- des_ecb_encrypt((des_cblock *)(obfkey + 8),
- (des_cblock *)&fb[8], ks2, DES_DECRYPT);
+ DES_ecb_encrypt((DES_cblock *)obfkey,
+ (DES_cblock *)fb, &ks1, DES_DECRYPT);
+ DES_ecb_encrypt((DES_cblock *)(obfkey + 8),
+ (DES_cblock *)&fb[8], &ks2, DES_DECRYPT);
/* sf27 wrap to sf25 */
//sf27( obfkey, (int*)&rid, fb );
Reply to: