Date: Mon, 12 Sep 2016 05:05:33 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421906 - in head/security/john: . files Message-ID: <201609120505.u8C55XTN056381@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Sep 12 05:05:32 2016 New Revision: 421906 URL: https://svnweb.freebsd.org/changeset/ports/421906 Log: security/john: Handle SLL libraries without SHA0 (e.g. LibreSSL) Approved by: SSL blanket Added: head/security/john/files/patch-src_john.c (contents, props changed) head/security/john/files/patch-src_rawSHA0__fmt.c (contents, props changed) Modified: head/security/john/Makefile Modified: head/security/john/Makefile ============================================================================== --- head/security/john/Makefile Mon Sep 12 04:53:28 2016 (r421905) +++ head/security/john/Makefile Mon Sep 12 05:05:32 2016 (r421906) @@ -15,9 +15,8 @@ COMMENT= Featureful Unix password cracke LICENSE= GPLv2 -USES= gmake shebangfix tar:bzip2 +USES= gmake shebangfix ssl tar:bzip2 SHEBANG_FILES= run/*.pl -USE_OPENSSL= yes BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src # We prefer -jumbo (community-enhanced) versions instead of vanilla releases Added: head/security/john/files/patch-src_john.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/john/files/patch-src_john.c Mon Sep 12 05:05:32 2016 (r421906) @@ -0,0 +1,22 @@ +--- src/john.c.orig 2012-09-20 01:50:17 UTC ++++ src/john.c +@@ -183,7 +183,9 @@ extern struct fmt_main fmt_wpapsk; + + extern struct fmt_main fmt_hmacMD5; + extern struct fmt_main fmt_hmacSHA1; ++#ifndef OPENSSL_NO_SHA0 + extern struct fmt_main fmt_rawSHA0; ++#endif + + extern int unique(int argc, char **argv); + extern int unshadow(int argc, char **argv); +@@ -241,7 +243,9 @@ static void john_register_all(void) + + john_register_one(&fmt_hmacMD5); + john_register_one(&fmt_hmacSHA1); ++#ifndef OPENSSL_NO_SHA0 + john_register_one(&fmt_rawSHA0); ++#endif + + #if OPENSSL_VERSION_NUMBER >= 0x00908000 + john_register_one(&fmt_rawSHA224); Added: head/security/john/files/patch-src_rawSHA0__fmt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/john/files/patch-src_rawSHA0__fmt.c Mon Sep 12 05:05:32 2016 (r421906) @@ -0,0 +1,17 @@ +--- src/rawSHA0_fmt.c.orig 2012-09-17 08:30:39 UTC ++++ src/rawSHA0_fmt.c +@@ -9,6 +9,8 @@ + #include <string.h> + #include "sha.h" + ++#ifndef OPENSSL_NO_SHA0 ++ + #include "arch.h" + #include "misc.h" + #include "common.h" +@@ -189,3 +191,5 @@ struct fmt_main fmt_rawSHA0 = { + cmp_exact + } + }; ++ ++#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609120505.u8C55XTN056381>