Index: head/security/ophcrack/files/patch-src_samdump2_samdump2.c =================================================================== --- head/security/ophcrack/files/patch-src_samdump2_samdump2.c (revision 419533) +++ head/security/ophcrack/files/patch-src_samdump2_samdump2.c (nonexistent) @@ -1,67 +0,0 @@ ---- src/samdump2/samdump2.c.orig 2015-03-30 02:26:33 UTC -+++ src/samdump2/samdump2.c -@@ -71,7 +71,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); - } - - /* -@@ -209,8 +209,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; - -@@ -418,15 +418,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); - - - -@@ -471,16 +471,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 ); Property changes on: head/security/ophcrack/files/patch-src_samdump2_samdump2.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/ophcrack/files/patch-src_lmtable.c =================================================================== --- head/security/ophcrack/files/patch-src_lmtable.c (revision 419533) +++ head/security/ophcrack/files/patch-src_lmtable.c (nonexistent) @@ -1,24 +0,0 @@ ---- src/lmtable.c.orig 2013-06-04 07:42:47 UTC -+++ src/lmtable.c -@@ -470,8 +470,8 @@ void lmtable_mkredux(table_t *tbl, uchar - /*-------------------------------------------------------------------------*/ - 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_ - 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: head/security/ophcrack/files/patch-src_lmtable.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/security/ophcrack/Makefile =================================================================== --- head/security/ophcrack/Makefile (revision 419533) +++ head/security/ophcrack/Makefile (revision 419534) @@ -1,60 +1,56 @@ # Created by: Alexey Dokuchaev # $FreeBSD$ PORTNAME= ophcrack -PORTVERSION= 3.6.0 +PORTVERSION= 3.6.1 CATEGORIES= security MASTER_SITES= SF MAINTAINER= danfe@FreeBSD.org COMMENT= Windows password cracker based on rainbow tables LICENSE= APACHE20 GPLv2 LICENSE_COMB= multi LIB_DEPENDS= libexpat.so:textproc/expat2 -USES= gmake tar:bzip2 +USES= gmake localbase ssl tar:bzip2 GNU_CONFIGURE= yes -USE_OPENSSL= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - PLIST_FILES= bin/ophcrack -PORTDOCS= ChangeLog README +PORTDOCS= AUTHORS ChangeLog README OPTIONS_DEFINE= X11 GRAPH DOCS OPTIONS_DEFAULT= X11 GRAPH X11_DESC= Build Qt 4 GUI frontend GRAPH_DESC= Enable graph rendering via Qwt .include .if ${PORT_OPTIONS:MX11} || ${PORT_OPTIONS:MGRAPH} USE_QT4= moc_build qmake_build rcc_build uic_build corelib gui .else CONFIGURE_ARGS+= --disable-gui .endif .if ${PORT_OPTIONS:MGRAPH} LIB_DEPENDS+= libqwt.so:x11-toolkits/qwt5 .else CONFIGURE_ARGS+= --disable-graph .endif post-patch: @${REINPLACE_CMD} -E '/#include /d ; \ /#include/s,"bswap\.h",, ; \ s,bswap_([[:digit:]]+),bswap\1, ' \ ${WRKSRC}/src/samdump2/bkhive.c \ ${WRKSRC}/src/samdump2/hive.c \ ${WRKSRC}/src/samdump2/samdump2.c \ ${WRKSRC}/src/misc.h -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include Index: head/security/ophcrack/distinfo =================================================================== --- head/security/ophcrack/distinfo (revision 419533) +++ head/security/ophcrack/distinfo (revision 419534) @@ -1,2 +1,2 @@ -SHA256 (ophcrack-3.6.0.tar.bz2) = 79219baa03afd7e52bc6d365dd5a445bc73dfac2e88216e7b050ad7749191893 -SIZE (ophcrack-3.6.0.tar.bz2) = 288830 +SHA256 (ophcrack-3.6.1.tar.bz2) = 82dd1699eb7340ce8c7913758db2ab434659f8ad0a27abb186467627a0b8b798 +SIZE (ophcrack-3.6.1.tar.bz2) = 296166