Attachment 153895 Details for Bug 198352 – svn diff for security/ophcrack

[patch] svn diff for security/ophcrack

patch-security_ophcrack (text/plain), 4.37 KB, created by Bernard Spil on 2015-03-06 13:13:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2015-03-06 13:13:11 UTC

Size: 4.37 KB

patch

obsolete

>Index: security/ophcrack/files/patch-src_lmtable.c
>===================================================================
>--- security/ophcrack/files/patch-src_lmtable.c	(revision 0)
>+++ security/ophcrack/files/patch-src_lmtable.c	(working copy)
>@@ -0,0 +1,24 @@
>+--- src/lmtable.c.orig	2013-06-04 09:42:47.000000000 +0200
>++++ src/lmtable.c	2015-02-28 16:09:56.704714102 +0100
>+@@ -470,8 +470,8 @@
>+ /*-------------------------------------------------------------------------*/
>+ void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
>+   uchar_t key[8];
>+-  des_key_schedule ks;
>+-  des_cblock *magic = (des_cblock*)lmmagic;
>++  DES_key_schedule ks;
>++  DES_cblock *magic = (DES_cblock*)lmmagic;
>+   
>+   key[0] = pwd[0];
>+   key[1] = (pwd[0] << 7) | (pwd[1] >> 1);
>+@@ -482,7 +482,7 @@
>+   key[6] = (pwd[5] << 2) | (pwd[6] >> 6);
>+   key[7] = (pwd[6] << 1) ;
>+ 
>+-  des_set_odd_parity(&key);
>+-  des_set_key(&key, ks);
>+-  des_ecb_encrypt(magic, (des_cblock*)hash, ks, DES_ENCRYPT);
>++  DES_set_odd_parity(&key);
>++  DES_set_key(&key, &ks);
>++  DES_ecb_encrypt(magic, (DES_cblock*)hash, &ks, DES_ENCRYPT);
>+ }
>
>Property changes on: security/ophcrack/files/patch-src_lmtable.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: security/ophcrack/files/patch-src_samdump2_samdump2.c
>===================================================================
>--- security/ophcrack/files/patch-src_samdump2_samdump2.c	(revision 0)
>+++ security/ophcrack/files/patch-src_samdump2_samdump2.c	(working copy)
>@@ -0,0 +1,67 @@
>+--- src/samdump2/samdump2.c.orig	2015-02-28 16:01:54.751900000 +0100
>++++ src/samdump2/samdump2.c	2015-02-28 16:08:38.049462876 +0100
>+@@ -71,7 +71,7 @@
>+ 	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);
>+ }
>+ 
>+ /*
>+@@ -209,8 +209,8 @@
>+   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;
>+   
>+@@ -418,15 +418,15 @@
>+       
>+       /* 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);
>+       
>+       
>+       
>+@@ -471,16 +471,16 @@
>+       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 );
>
>Property changes on: security/ophcrack/files/patch-src_samdump2_samdump2.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 198352: 153895 | 153896