cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to john-jumbo 1.80-1

Browse Source
This commit is contained in:
sthen 2015-01-16 15:40:01 +00:00
parent fa98efa5b4
commit ace0907db8
13 changed files with 123 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/john-jumbo/Makefile
View File

@ -1,19 +1,14 @@
# $OpenBSD: Makefile,v 1.8 2015/01/16 15:02:23 sthen Exp $
# $OpenBSD: Makefile,v 1.9 2015/01/16 15:40:01 sthen Exp $
COMMENT = extremely fast password cracker, with community patches
BROKEN-alpha = DES_bs.c:173: internal compiler error: in get_callee_fndecl, at tree.c:5940
V = 1.8.0
JV = 20140604
REVISION = 0
# when jumbo1 is out, use JV=1 and change PKGNAME to use pl${JV} not pre${JV}
GH_ACCOUNT = magnumripper
GH_PROJECT = JohnTheRipper
GH_COMMIT = 3f5494dc78c2ee64fbbbd8c74d495d0bcc895dbc
JV = 1
EXTRACT_SUFX = .tar.xz
DISTNAME = john-$V-jumbo-${JV}
PKGNAME = john-jumbo-$Vpre${JV}
PKGNAME = john-jumbo-$V.${JV}
CATEGORIES = security
HOMEPAGE = http://www.openwall.com/john/
@ -25,14 +20,12 @@ PERMIT_PACKAGE_FTP = Yes
WANTLIB += c crypto m nspr4 nss3 pcap plc4 plds4 pthread smime3
WANTLIB += softokn3 sqlite3 ssl ssl3 z
# Using a bleeding-jumbo snapshot for now.
# Releases: http://www.openwall.com/john/g/
MASTER_SITES = http://www.openwall.com/john/j/
LIB_DEPENDS = security/nss
USE_GMAKE = Yes
MAKE_FILE = Makefile.orig
PATCHORIG = .orig.port
MAKE_FILE = Makefile.legacy
MODULES += lang/python
MODPY_BUILDDEP = No

4
security/john-jumbo/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (john-1.8.0-jumbo-20140604.tar.gz) = 0adzxvejTVgEFMKlSeK7MZCmfTYYSUN+0QxnsmNim+k=
SIZE (john-1.8.0-jumbo-20140604.tar.gz) = 32293921
SHA256 (john-1.8.0-jumbo-1.tar.xz) = usk9AlmVoFHwVa29fOLxl1Z2ysbHSmx6PuTP3ZwWCSM=
SIZE (john-1.8.0-jumbo-1.tar.xz) = 23232492

16
security/john-jumbo/patches/patch-src_Makefile_orig → security/john-jumbo/patches/patch-src_Makefile_legacy
View File

@ -1,11 +1,7 @@
$OpenBSD: patch-src_Makefile_orig,v 1.2 2014/10/03 19:59:46 naddy Exp $
Yes, the Makefile we are using really is named Makefile.orig.
(there's a wip autoconf conversion, but it doesn't build yet).
--- src/Makefile.orig.orig.port Wed Jun 4 09:49:27 2014
+++ src/Makefile.orig Fri Oct 3 21:27:53 2014
@@ -1123,11 +1123,9 @@ openbsd-alpha:
$OpenBSD: patch-src_Makefile_legacy,v 1.1 2015/01/16 15:40:01 sthen Exp $
--- src/Makefile.legacy.orig Thu Dec 18 07:59:02 2014
+++ src/Makefile.legacy Fri Jan 16 15:08:20 2015
@@ -1073,11 +1073,9 @@ openbsd-alpha:
openbsd-sparc64:
$(LN) sparc64.h arch.h
@echo "#define JOHN_BLD" '"'$@'"' > john_build_rule.h
@ -19,11 +15,11 @@ Yes, the Makefile we are using really is named Makefile.orig.
@echo "All done"
openbsd-sparc:
@@ -2402,7 +2400,7 @@ endif
@@ -2307,7 +2305,7 @@ john.com: john.asm
../run/cprepair: cprepair.c unicode.c unicode.h options.h misc.h misc.c \
memdbg.h memdbg.c
- gcc -Wall -O3 -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
- $(CC) -Wall -O3 -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
+ $(CC) -Wall $(COPTFLAGS) -s -DNOT_JOHN -D_JOHN_MISC_NO_LOG cprepair.c unicode.c \
misc.c memdbg.c -o ../run/cprepair

6
security/john-jumbo/patches/patch-src_SIPdump_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_SIPdump_c,v 1.2 2014/06/04 13:52:40 sthen Exp $
--- src/SIPdump.c.orig.port Wed Jun 4 12:03:19 2014
+++ src/SIPdump.c Wed Jun 4 12:03:26 2014
$OpenBSD: patch-src_SIPdump_c,v 1.3 2015/01/16 15:40:01 sthen Exp $
--- src/SIPdump.c.orig Fri Sep 19 17:40:51 2014
+++ src/SIPdump.c Fri Jan 16 15:08:20 2015
@@ -15,8 +15,8 @@
#define HAVE_PCAP_H 1
#define HAVE_SYS_SOCKET_H 1

8
security/john-jumbo/patches/patch-src_efs_fmt_plug_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_efs_fmt_plug_c,v 1.2 2015/01/16 15:02:23 sthen Exp $
--- src/efs_fmt_plug.c.orig.port Wed Jun 4 01:49:27 2014
+++ src/efs_fmt_plug.c Fri Jan 16 07:57:11 2015
@@ -16,6 +16,7 @@
$OpenBSD: patch-src_efs_fmt_plug_c,v 1.3 2015/01/16 15:40:01 sthen Exp $
--- src/efs_fmt_plug.c.orig Thu Dec 18 07:59:02 2014
+++ src/efs_fmt_plug.c Fri Jan 16 15:08:20 2015
@@ -21,6 +21,7 @@ john_register_one(&fmt_efs);
#include <string.h>
#include <assert.h>

10
security/john-jumbo/patches/patch-src_gpg_fmt_plug_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_gpg_fmt_plug_c,v 1.2 2015/01/16 15:02:23 sthen Exp $
--- src/gpg_fmt_plug.c.orig.port Wed Jun 4 01:49:27 2014
+++ src/gpg_fmt_plug.c Fri Jan 16 07:56:50 2015
@@ -21,6 +21,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/> */
$OpenBSD: patch-src_gpg_fmt_plug_c,v 1.3 2015/01/16 15:40:01 sthen Exp $
--- src/gpg_fmt_plug.c.orig Thu Dec 18 07:59:02 2014
+++ src/gpg_fmt_plug.c Fri Jan 16 15:08:20 2015
@@ -27,6 +27,7 @@ john_register_one(&fmt_gpg);
#else
#include <string.h>
+#include <crypto/des.h>

8
security/john-jumbo/patches/patch-src_keychain_fmt_plug_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_keychain_fmt_plug_c,v 1.3 2015/01/16 15:02:23 sthen Exp $
--- src/keychain_fmt_plug.c.orig.port Wed Jun 4 01:49:27 2014
+++ src/keychain_fmt_plug.c Fri Jan 16 07:57:33 2015
@@ -11,6 +11,7 @@
$OpenBSD: patch-src_keychain_fmt_plug_c,v 1.4 2015/01/16 15:40:01 sthen Exp $
--- src/keychain_fmt_plug.c.orig Thu Dec 18 07:59:02 2014
+++ src/keychain_fmt_plug.c Fri Jan 16 15:08:20 2015
@@ -17,6 +17,7 @@ john_register_one(&fmt_keychain);
#include <string.h>
#include <assert.h>

11
security/john-jumbo/patches/patch-src_mozilla_ng_fmt_plug_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_mozilla_ng_fmt_plug_c,v 1.1 2015/01/16 15:40:01 sthen Exp $
--- src/mozilla_ng_fmt_plug.c.orig Fri Jan 16 15:13:05 2015
+++ src/mozilla_ng_fmt_plug.c Fri Jan 16 15:17:01 2015
@@ -36,6 +36,7 @@ john_register_one(&fmt_mozilla);
#include "options.h"
#include "memdbg.h"
#include "stdint.h"
+#include <crypto/des.h>
#include <openssl/des.h>
#include "sha.h"

26
security/john-jumbo/patches/patch-src_rawSHA1_ng_fmt_c
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-src_rawSHA1_ng_fmt_c,v 1.2 2014/06/04 13:52:40 sthen Exp $
revert https://github.com/magnumripper/JohnTheRipper/commit/ef2b184a571851ecf0ddc509ae387d54209eaf6b; segfaults in tests
--- src/rawSHA1_ng_fmt.c.orig.port Wed Jun 4 08:49:27 2014
+++ src/rawSHA1_ng_fmt.c Wed Jun 4 11:10:28 2014
@@ -406,7 +406,7 @@ static void sha1_fmt_set_key(char *key, int index)
static char * sha1_fmt_get_key(int index)
{
- static uint32_t key[5];
+ static uint32_t key[4];
// This function is not hot, we can do this slowly. First, restore
// endianness.
@@ -415,8 +415,8 @@ static char * sha1_fmt_get_key(int index)
key[2] = __builtin_bswap32(M[index][2]);
key[3] = __builtin_bswap32(M[index][3]);
- // Skip backwards until we hit the trailing bit, then remove it.
- memset(strrchr((char *)(key), 0x80), 0x00, 1);
+ // Skip backwards until we hit the trailing bit
+ memset(memrchr(key, 0x80, sizeof key), 0x00, 1);
return (char *) key;
}

10
security/john-jumbo/patches/patch-src_ssh_ng_fmt_plug_c
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-src_ssh_ng_fmt_plug_c,v 1.2 2015/01/16 15:02:23 sthen Exp $
--- src/ssh_ng_fmt_plug.c.orig.port Wed Jun 4 01:49:27 2014
+++ src/ssh_ng_fmt_plug.c Fri Jan 16 07:56:10 2015
@@ -10,6 +10,7 @@
* are permitted. */
$OpenBSD: patch-src_ssh_ng_fmt_plug_c,v 1.3 2015/01/16 15:40:01 sthen Exp $
--- src/ssh_ng_fmt_plug.c.orig Thu Dec 18 07:59:02 2014
+++ src/ssh_ng_fmt_plug.c Fri Jan 16 15:08:20 2015
@@ -20,6 +20,7 @@ john_register_one(&fmt_sshng);
#else
#include <string.h>
+#include <crypto/des.h>

60
security/john-jumbo/patches/patch-src_truecrypt_fmt_plug_c Normal file
View File

@ -0,0 +1,60 @@
$OpenBSD: patch-src_truecrypt_fmt_plug_c,v 1.1 2015/01/16 15:40:01 sthen Exp $
From 61d7d8b0985a3015921df839c68cf42e49d72260 Mon Sep 17 00:00:00 2001
From: jfoug <jfoug@cox.net>
Date: Tue, 23 Dec 2014 06:28:40 -0600
Subject: [PATCH] truecrypt: fixed unified format. Fix #941
--- src/truecrypt_fmt_plug.c.orig Thu Dec 18 07:59:02 2014
+++ src/truecrypt_fmt_plug.c Fri Jan 16 15:37:15 2015
@@ -235,18 +235,24 @@ static void* get_salt(char *ciphertext)
return s;
}
-/***********************************************************************************************************
- * we know first sector has Tweak value of 0. For this, we just AES a null 16 bytes, then do the XeX using
- * the results for our xor, then modular mult GF(2) that value for the next round. NOTE, len MUST
- * be an even multiple of 16 bytes. We do NOT handle CT stealing. But the way we use it in the TC format
- * we only decrypt 16 bytes, and later (if it looks 'good'), we decrypt the whole first sector (512-64 bytes)
- * both which are even 16 byte data.
- * This code has NOT been optimized. It was based on simple reference code that I could get my hands on. However,
- * 'mostly' we do a single limb AES-XTS which is just 2 AES, and the buffers xored (before and after). There is
- * no mulmod GF(2) logic done in that case. NOTE, there was NO noticable change in speed, from using original
- * oSSL EVP_AES_256_XTS vs this code, so this code is deemed 'good enough' for usage in this location.
- ***********************************************************************************************************/
-static void AES_256_XTS_first_sector(const unsigned char *double_key, unsigned char *out, const unsigned char *data, unsigned len) {
+/*****************************************************************************
+ * we know first sector has Tweak value of 0. For this, we just AES a null 16
+ * bytes, then do the XeX using the results for our xor, then modular mult
+ * GF(2) that value for the next round. NOTE, len MUST be an even multiple of
+ * 16 bytes. We do NOT handle CT stealing. But the way we use it in the TC
+ * format we only decrypt 16 bytes, and later (if it looks 'good'), we decrypt
+ * the whole first sector (512-64 bytes) both which are even 16 byte data.
+ * This code has NOT been optimized. It was based on simple reference code that
+ * I could get my hands on. However, 'mostly' we do a single limb AES-XTS which
+ * is just 2 AES, and the buffers xored (before and after). There is no mulmod
+ * GF(2) logic done in that case. NOTE, there was NO noticable change in
+ * speed, from using original oSSL EVP_AES_256_XTS vs this code, so this code
+ * is deemed 'good enough' for usage in this location.
+ *****************************************************************************/
+static void AES_256_XTS_first_sector(const unsigned char *double_key,
+ unsigned char *out,
+ const unsigned char *data,
+ unsigned len) {
unsigned char tweak[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
unsigned char buf[16];
int i, j, cnt;
@@ -463,8 +469,13 @@ struct fmt_main fmt_truecrypt = {
BINARY_ALIGN,
SALT_SIZE,
SALT_ALIGN,
+#if SSE_GROUP_SZ_SHA512
+ SSE_GROUP_SZ_SHA512,
+ SSE_GROUP_SZ_SHA512,
+#else
MIN_KEYS_PER_CRYPT,
MAX_KEYS_PER_CRYPT,
+#endif
FMT_CASE | FMT_8_BIT | FMT_OMP,
#if FMT_MAIN_VERSION > 11
{

6
security/john-jumbo/patches/patch-src_vncpcap2john_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_vncpcap2john_c,v 1.1 2014/06/04 13:52:40 sthen Exp $
--- src/vncpcap2john.c.orig.port Wed Jun 4 08:49:27 2014
+++ src/vncpcap2john.c Wed Jun 4 11:42:26 2014
$OpenBSD: patch-src_vncpcap2john_c,v 1.2 2015/01/16 15:40:01 sthen Exp $
--- src/vncpcap2john.c.orig Fri Sep 19 17:40:51 2014
+++ src/vncpcap2john.c Fri Jan 16 15:08:20 2015
@@ -36,13 +36,13 @@
/* on a legacy build, we do not KNOW if pcap is installed. We just run, and make will fail if it is not there */
#define HAVE_SYS_SOCKET_H 1

22
security/john-jumbo/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2014/06/04 13:52:40 sthen Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/01/16 15:40:01 sthen Exp $
@conflict john-*
bin/1password2john.py
bin/7z2john.py
@ -7,6 +7,7 @@ bin/aix2john.pl
bin/aix2john.py
bin/androidfde2john.py
bin/apex2john.py
bin/base64conv
bin/bitcoin2john.py
bin/blockchain2john.py
@bin bin/calc_stat
@ -16,8 +17,8 @@ bin/cracf2john.py
bin/dmg2john
bin/dmg2john.py
bin/ecryptfs2john.py
bin/efs2john.py
bin/encfs2john.py
bin/gadu2john.py
bin/genincstats.rb
@bin bin/genmkvpwd
bin/gpg2john
@ -34,10 +35,9 @@ bin/keychain2john.py
bin/keyring2john
bin/keystore2john
bin/keystore2john.py
bin/krbpa2john.py
bin/known_hosts2john.py
bin/kwallet2john
bin/kwallet2john.py
bin/lastpass2john.py
bin/ldif2john.pl
bin/leet.pl
bin/lion2john-alt.pl
@ -49,13 +49,15 @@ bin/makechr
bin/mcafee_epo2john.py
@bin bin/mkvcalcproba
bin/ml2john.py
bin/mozilla2john
bin/mozilla2john.py
bin/netntlm.pl
bin/netscreen.py
bin/odf2john.py
bin/office2john.py
bin/openbsd_softraid2john.py
bin/openssl2john.py
bin/pass_gen.pl
bin/pcap2john.py
bin/pdf2john.py
bin/pfx2john
bin/putty2john
@ -63,10 +65,8 @@ bin/pwsafe2john
bin/racf2john
bin/radius2john.pl
bin/rar2john
bin/rar5tojohn.py
@bin bin/raw2dyna
bin/rexgen2rules.pl
bin/s7tojohn.py
bin/sap2john.pl
bin/sha-dump.pl
bin/sha-test.pl
@ -76,7 +76,6 @@ bin/ssh2sshng.py
bin/sshng2john.py
bin/strip2john.py
bin/sxc2john.py
bin/tcpmd5tojohn.py
@bin bin/tgtsnarf
bin/truecrypt_volume2john
@bin bin/uaf2john
@ -88,6 +87,7 @@ bin/unshadow
@bin bin/wpapcap2john
bin/zip2john
share/doc/john/
share/doc/john/AddressSanitizer-HOWTO.txt
share/doc/john/BUGS
share/doc/john/CHANGES
share/doc/john/CHANGES-jumbo
@ -106,9 +106,11 @@ share/doc/john/FAQ
share/doc/john/HDAA_README
share/doc/john/INSTALL
share/doc/john/INSTALL-UBUNTU
share/doc/john/Kerberos-Auditing-HOWTO.md
share/doc/john/LICENSE
share/doc/john/LICENSE.mpi
share/doc/john/MARKOV
share/doc/john/MASK
share/doc/john/MODES
share/doc/john/NETNTLM_README
share/doc/john/OFFICE
@ -117,7 +119,9 @@ share/doc/john/README
share/doc/john/README-CUDA
share/doc/john/README-OPENCL
share/doc/john/README-krb5-18-23
share/doc/john/README.Apple_DMG
share/doc/john/README.FreeBSD
share/doc/john/README.LUKS
share/doc/john/README.LotusNotes
share/doc/john/README.MinGW
share/doc/john/README.apex
@ -139,10 +143,12 @@ share/doc/john/README.ssh
share/doc/john/RULES
share/doc/john/Regen-Lost-Salts.txt
share/doc/john/SIPcrack-LICENSE
share/doc/john/SecureMode-tutorial.md
share/doc/john/dynamic_history.txt
share/doc/john/john-1.7.9-jumbo-7-licensing-stats.txt
share/doc/john/john-1.7.9-jumbo-7-licensing.txt
share/doc/john/pass_gen.Manifest
share/doc/john/pcap2john.readme
share/doc/john/pdfcrack_README
share/doc/john/pdfcrack_TODO
share/examples/john/