diff options
| author | John Marino <marino@FreeBSD.org> | 2016-09-12 05:05:32 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2016-09-12 05:05:32 +0000 |
| commit | f32fb89f589210edb51214e8efe29eccf727aa4e (patch) | |
| tree | f5e97193480cb6f3a2118e72031f57915bc5cc94 /security/john | |
| parent | mail/deforaos-mailer: Support non-base SSL including no SSLv3 (LibreSSL) (diff) | |
security/john: Handle SLL libraries without SHA0 (e.g. LibreSSL)
Approved by: SSL blanket
Notes
Notes:
svn path=/head/; revision=421906
Diffstat (limited to 'security/john')
| -rw-r--r-- | security/john/Makefile | 3 | ||||
| -rw-r--r-- | security/john/files/patch-src_john.c | 22 | ||||
| -rw-r--r-- | security/john/files/patch-src_rawSHA0__fmt.c | 17 |
3 files changed, 40 insertions, 2 deletions
diff --git a/security/john/Makefile b/security/john/Makefile index 5bf56efc4ddd..039f7245b1e4 100644 --- a/security/john/Makefile +++ b/security/john/Makefile @@ -15,9 +15,8 @@ COMMENT= Featureful Unix password cracker 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 diff --git a/security/john/files/patch-src_john.c b/security/john/files/patch-src_john.c new file mode 100644 index 000000000000..9227093af893 --- /dev/null +++ b/security/john/files/patch-src_john.c @@ -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); diff --git a/security/john/files/patch-src_rawSHA0__fmt.c b/security/john/files/patch-src_rawSHA0__fmt.c new file mode 100644 index 000000000000..c9325bc663e9 --- /dev/null +++ b/security/john/files/patch-src_rawSHA0__fmt.c @@ -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 |