cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to ophcrack-3.6.1.

Browse Source
This commit is contained in:
benoit 2016-08-03 06:18:18 +00:00
parent 428acccf6b
commit 15d9f30cf9
4 changed files with 7 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/ophcrack/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2013/06/07 10:03:23 benoit Exp $
# $OpenBSD: Makefile,v 1.13 2016/08/03 06:18:18 benoit Exp $
COMMENT = password cracker based on rainbow tables
DISTNAME = ophcrack-3.6.0
DISTNAME = ophcrack-3.6.1
CATEGORIES = security
HOMEPAGE = http://ophcrack.sourceforge.net/

4
security/ophcrack/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ophcrack-3.6.0.tar.bz2) = eSGbqgOv1+UrxtNl3VpEW8c9+sLoghbnsFCtd0kZGJM=
SIZE (ophcrack-3.6.0.tar.bz2) = 288830
SHA256 (ophcrack-3.6.1.tar.bz2) = gt0WmetzQM6MeRN1jbKrQ0ZZ+K0KJ6uxhkZ2J6C4t5g=
SIZE (ophcrack-3.6.1.tar.bz2) = 296166

25
security/ophcrack/patches/patch-src_lmtable_c
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-src_lmtable_c,v 1.1 2014/04/15 11:38:53 naddy Exp $
--- src/lmtable.c.orig Tue Jun 4 09:42:47 2013
+++ src/lmtable.c Mon Apr 14 20:43:25 2014
@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar_t *hash, ucha
/*-------------------------------------------------------------------------*/
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 @@ void lmtable_mkhash(uchar_t *pwd, uchar_t *hash) {
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);
}

71
security/ophcrack/patches/patch-src_samdump2_samdump2_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_samdump2_samdump2_c,v 1.2 2014/04/15 11:38:53 naddy Exp $
--- src/samdump2/samdump2.c.orig Tue Jun 4 09:42:47 2013
+++ src/samdump2/samdump2.c Mon Apr 14 20:40:55 2014
$OpenBSD: patch-src_samdump2_samdump2_c,v 1.3 2016/08/03 06:18:18 benoit Exp $
--- src/samdump2/samdump2.c.orig Tue Aug 2 16:41:44 2016
+++ src/samdump2/samdump2.c Wed Aug 3 08:02:48 2016
@@ -41,7 +41,7 @@
#ifdef BYTE_ORDER
#if BYTE_ORDER == LITTLE_ENDIAN
@ -10,68 +10,3 @@ $OpenBSD: patch-src_samdump2_samdump2_c,v 1.2 2014/04/15 11:38:53 naddy Exp $
#else
#warning "Doesn't define a standard ENDIAN type"
#endif
@@ -72,7 +72,7 @@ void str_to_key(unsigned char *str,unsigned char *key)
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 char *dest, uns
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 char *dest, uns
/* 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 char *dest, uns
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 );