From owner-svn-ports-head@freebsd.org Mon Sep 12 05:05:34 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66A61BD628C; Mon, 12 Sep 2016 05:05:34 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D7F4163F; Mon, 12 Sep 2016 05:05:34 +0000 (UTC) (envelope-from marino@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8C55XlB056384; Mon, 12 Sep 2016 05:05:33 GMT (envelope-from marino@FreeBSD.org) Received: (from marino@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8C55XTN056381; Mon, 12 Sep 2016 05:05:33 GMT (envelope-from marino@FreeBSD.org) Message-Id: <201609120505.u8C55XTN056381@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marino set sender to marino@FreeBSD.org using -f From: John Marino Date: Mon, 12 Sep 2016 05:05:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421906 - in head/security/john: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 05:05:34 -0000 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 + #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