Index: head/security/john/Makefile =================================================================== --- head/security/john/Makefile (revision 382631) +++ head/security/john/Makefile (revision 382632) @@ -1,93 +1,101 @@ # Created by: David O'Brien # $FreeBSD$ PORTNAME= john DISTVERSION= 1.7.9-jumbo-7 PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.openwall.com/john/g/ \ http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ http://distro.ibiblio.org/pub/linux/distributions/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ http://gd.tuwien.ac.at/opsys/linux/openwall/projects/john/${DISTVERSION:C/-.*//}/ MAINTAINER= danfe@FreeBSD.org COMMENT= Featureful Unix password cracker LICENSE= GPLv2 USES= gmake shebangfix tar:bzip2 SHEBANG_FILES= run/*.pl USE_OPENSSL= yes BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src # We prefer -jumbo (community-enhanced) versions instead of vanilla releases # due to the sad fact that `-jumbo-???' suffixed versions *precede* official # ones per pkg_version(1) -t check. So, when Alexander rolls out new "plain" # release, just hold the horses and wait for corresponding -jumbo one, which # usually does not take too long to appear. # PORTSCOUT= limit:.*-jumbo OSNAME= freebsd CFLAGS+= -DJOHN_SYSTEMWIDE=1 \ -DJOHN_SYSTEMWIDE_HOME=\\"${DATADIR}\\" \ -DCFG_FULL_NAME=\\"${PREFIX}/etc/${PORTNAME}.conf\\" PORTDOCS= CHANGES CONFIG EXAMPLES EXTERNAL FAQ MODES OPTIONS README \ RULES CONTACT CREDITS OPTIONS_DEFINE= OPENMP DOCS OPENMP_DESC= Compile with OpenMP support .include .if ${ARCH} == "i386" . if ${MACHINE_CPU:Msse2} ALL_TARGET= ${OSNAME}-x86-sse2 . elif ${MACHINE_CPU:Mmmx} ALL_TARGET= ${OSNAME}-x86-mmx . else ALL_TARGET= ${OSNAME}-x86-any . endif .elif ${ARCH} == "amd64" ALL_TARGET= ${OSNAME}-x86-64 .else ALL_TARGET= generic .endif .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif post-patch: @${REINPLACE_CMD} -e 's|= gcc|= ${CC}|' \ -e '/^CFLAGS =/s|-O2|${CFLAGS}|' ${WRKSRC}/src/Makefile .if ${PORT_OPTIONS:MOPENMP} @${REINPLACE_CMD} -E \ '/(fopenmp|-m${MACHINE_CPU:Msse2})$$/s,#(OMPFLAGS =),\1,' \ ${WRKSRC}/src/Makefile .endif @${REINPLACE_CMD} -i '' -e 's|/usr/bin|${LOCALBASE}/bin|' \ ${WRKSRC}/run/*.rb @${REINPLACE_CMD} -e '/_XOPEN_SOURCE/d' ${WRKSRC}/src/recovery.c +# Replace methods and types that were marked deprecated by OpenSSL 0.9.7 +# and will be removed in OpenSSL 1.1.0 + @${REINPLACE_CMD} -e 's|des_string_to_key|DES_string_to_key|' \ + ${WRKSRC}/src/KRB4_fmt_plug.c + @${REINPLACE_CMD} -e 's|des_set_odd_parity|DES_set_odd_parity|' \ + ${WRKSRC}/src/KRB4_std_plug.c + @${REINPLACE_CMD} -e 's|C_Block|DES_cblock|' \ + ${WRKSRC}/src/keychain_fmt_plug.c pre-build: @${ECHO_CMD} @${ECHO_CMD} "Building John the Ripper for ${ALL_TARGET}" \ ${WITH_OPENMP:C/.*/with/}${WITHOUT_OPENMP:C/.*/without/} \ "OpenMP support" @${ECHO_CMD} do-install: ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${STAGEDIR}${PREFIX}/bin ${LN} -sf john ${STAGEDIR}${PREFIX}/bin/xtract ${LN} -sf john ${STAGEDIR}${PREFIX}/bin/unshadow @${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC}/run && ${INSTALL_DATA} *.??? [^j]*.conf ${STAGEDIR}${DATADIR} cd ${WRKSRC}/run && ${INSTALL_SCRIPT} *.?? mailer ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/run/john.conf \ ${STAGEDIR}${PREFIX}/etc/john.conf.default @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Index: head/security/ophcrack/files/patch-src_lmtable.c =================================================================== --- head/security/ophcrack/files/patch-src_lmtable.c (nonexistent) +++ head/security/ophcrack/files/patch-src_lmtable.c (revision 382632) @@ -0,0 +1,24 @@ +--- 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 ___________________________________________________________________ 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: head/security/ophcrack/files/patch-src_samdump2_samdump2.c =================================================================== --- head/security/ophcrack/files/patch-src_samdump2_samdump2.c (nonexistent) +++ head/security/ophcrack/files/patch-src_samdump2_samdump2.c (revision 382632) @@ -0,0 +1,67 @@ +--- 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 ___________________________________________________________________ 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