Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Mar 2019 11:37:55 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r494924 - in head/security/john: . files
Message-ID:  <201903071137.x27BbtwM059508@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Thu Mar  7 11:37:55 2019
New Revision: 494924
URL: https://svnweb.freebsd.org/changeset/ports/494924

Log:
  - Drop PFX support code: incompatible with newer OpenSSL versions
  - Remove `ssh_fmt_plug.c' file (should've been part of r494696)
  
  Obtained from:	https://github.com/magnumripper/JohnTheRipper/commit/12e8d57

Modified:
  head/security/john/Makefile
  head/security/john/files/patch-Makefile.in
  head/security/john/files/patch-Makefile.legacy
  head/security/john/files/patch-john.c

Modified: head/security/john/Makefile
==============================================================================
--- head/security/john/Makefile	Thu Mar  7 11:33:20 2019	(r494923)
+++ head/security/john/Makefile	Thu Mar  7 11:37:55 2019	(r494924)
@@ -58,6 +58,9 @@ PORTDOCS=	*
 OPTIONS_DEFINE=	DOCS #OPENMP
 #OPENMP_USES=	compiler:openmp
 
+post-extract:
+	@${RM} ${WRKSRC}/pfx_fmt_plug.c ${WRKSRC}/ssh_fmt_plug.c
+
 post-patch:
 # Replace methods and types that were marked deprecated by OpenSSL 0.9.7
 # and removed in OpenSSL 1.1.0 and LibreSSL

Modified: head/security/john/files/patch-Makefile.in
==============================================================================
--- head/security/john/files/patch-Makefile.in	Thu Mar  7 11:33:20 2019	(r494923)
+++ head/security/john/files/patch-Makefile.in	Thu Mar  7 11:37:55 2019	(r494924)
@@ -1,14 +1,15 @@
 --- Makefile.in.orig	2014-12-18 13:53:53 UTC
 +++ Makefile.in
-@@ -84,7 +84,6 @@ JOHN_OBJS = \
+@@ -84,8 +84,6 @@ JOHN_OBJS = \
  	base64.o base64_convert.o \
  	md4.o sha2.o \
  	dynamic_fmt.o dynamic_parser.o dynamic_preloads.o dynamic_utils.o dynamic_big_crypt.o \
 -	ssh2john.o \
- 	pfx2john.o \
+-	pfx2john.o \
  	unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \
  	rar2john.o \
-@@ -132,7 +131,7 @@ GENMKVPWD_OBJS = \
+ 	zip2john.o gladman_hmac.o gladman_pwd2key.o \
+@@ -132,10 +130,10 @@ GENMKVPWD_OBJS = \
  	genmkvpwd.o mkvlib.o memory.o miscnl.o path.o memdbg.o
  
  PROJ = ../run/john@EXE_EXT@ ../run/unshadow@EXE_EXT@ ../run/unafs@EXE_EXT@ ../run/unique@EXE_EXT@ ../run/undrop@EXE_EXT@ \
@@ -16,8 +17,12 @@
 +	../run/rar2john@EXE_EXT@ ../run/zip2john@EXE_EXT@ \
  	../run/genmkvpwd@EXE_EXT@ ../run/mkvcalcproba@EXE_EXT@ ../run/calc_stat@EXE_EXT@ \
  	../run/tgtsnarf@EXE_EXT@ ../run/racf2john@EXE_EXT@ ../run/hccap2john@EXE_EXT@ \
- 	../run/pwsafe2john@EXE_EXT@ ../run/raw2dyna@EXE_EXT@ ../run/keepass2john@EXE_EXT@ ../run/pfx2john@EXE_EXT@ \
-@@ -305,10 +304,6 @@ miscnl.o: misc.c
+-	../run/pwsafe2john@EXE_EXT@ ../run/raw2dyna@EXE_EXT@ ../run/keepass2john@EXE_EXT@ ../run/pfx2john@EXE_EXT@ \
++	../run/pwsafe2john@EXE_EXT@ ../run/raw2dyna@EXE_EXT@ ../run/keepass2john@EXE_EXT@ \
+ 	../run/keychain2john@EXE_EXT@ ../run/keyring2john@EXE_EXT@ ../run/kwallet2john@EXE_EXT@ \
+ 	../run/dmg2john@EXE_EXT@ ../run/putty2john@EXE_EXT@ ../run/uaf2john@EXE_EXT@ \
+ 	../run/truecrypt_volume2john@EXE_EXT@ ../run/keystore2john@EXE_EXT@ ../run/wpapcap2john@EXE_EXT@ \
+@@ -305,18 +303,10 @@ miscnl.o: misc.c
  	$(RM) ../run/undrop
  	$(LN) john ../run/undrop
  
@@ -28,14 +33,29 @@
  ../run/putty2john: ../run/john
  	$(RM) ../run/putty2john
  	$(LN) john ../run/putty2john
-@@ -396,10 +391,6 @@ miscnl.o: misc.c
- ../run/undrop.exe: symlink.c
+ 
+-../run/pfx2john: ../run/john
+-	$(RM) ../run/pfx2john
+-	$(LN) john ../run/pfx2john
+-
+ ../run/keepass2john: ../run/john
+ 	$(RM) ../run/keepass2john
+ 	$(LN) john ../run/keepass2john
+@@ -397,17 +387,9 @@ miscnl.o: misc.c
  	$(CC) symlink.c -o ../run/undrop.exe
  	$(STRIP) ../run/undrop.exe
--
+ 
 -../run/ssh2john.exe: symlink.c
 -	$(CC) symlink.c -o ../run/ssh2john.exe
 -	$(STRIP) ../run/ssh2john.exe
- 
+-
  ../run/putty2john.exe: symlink.c
  	$(CC) symlink.c -o ../run/putty2john.exe
+ 	$(STRIP) ../run/putty2john.exe
+-
+-../run/pfx2john.exe: symlink.c
+-	$(CC) symlink.c -o ../run/pfx2john.exe
+-	$(STRIP) ../run/pfx2john.exe
+ 
+ ../run/keepass2john.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/keepass2john.exe

Modified: head/security/john/files/patch-Makefile.legacy
==============================================================================
--- head/security/john/files/patch-Makefile.legacy	Thu Mar  7 11:33:20 2019	(r494923)
+++ head/security/john/files/patch-Makefile.legacy	Thu Mar  7 11:37:55 2019	(r494924)
@@ -1,14 +1,15 @@
 --- Makefile.legacy.orig	2014-12-18 07:59:02 UTC
 +++ Makefile.legacy
-@@ -127,7 +127,6 @@ JOHN_OBJS = \
+@@ -127,8 +127,6 @@ JOHN_OBJS = \
  	base64.o base64_convert.o \
  	md4.o sha2.o \
  	dynamic_fmt.o dynamic_parser.o dynamic_preloads.o dynamic_utils.o dynamic_big_crypt.o \
 -	ssh2john.o \
- 	pfx2john.o \
+-	pfx2john.o \
  	unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \
  	rar2john.o \
-@@ -209,7 +208,7 @@ GENMKVPWD_OBJS = \
+ 	zip2john.o gladman_hmac.o gladman_pwd2key.o \
+@@ -209,10 +207,10 @@ GENMKVPWD_OBJS = \
  	genmkvpwd.o mkvlib.o memory.o miscnl.o path.o memdbg.o
  
  PROJ = ../run/john ../run/unshadow ../run/unafs ../run/unique ../run/undrop \
@@ -16,17 +17,23 @@
 +	../run/rar2john ../run/zip2john \
  	../run/genmkvpwd ../run/mkvcalcproba ../run/calc_stat \
  	../run/tgtsnarf ../run/racf2john ../run/hccap2john \
- 	../run/pwsafe2john ../run/raw2dyna ../run/keepass2john ../run/pfx2john \
-@@ -220,7 +219,7 @@ PROJ = ../run/john ../run/unshadow ../run/unafs ../run
+-	../run/pwsafe2john ../run/raw2dyna ../run/keepass2john ../run/pfx2john \
++	../run/pwsafe2john ../run/raw2dyna ../run/keepass2john \
+ 	../run/keychain2john ../run/keyring2john ../run/kwallet2john \
+ 	../run/dmg2john ../run/putty2john john.local.conf ../run/uaf2john \
+ 	../run/truecrypt_volume2john ../run/keystore2john ../run/wpapcap2john \
+@@ -220,30 +218,30 @@ PROJ = ../run/john ../run/unshadow ../run/unafs ../run
  PROJ_DOS = ../run/john.bin ../run/john.com \
  	../run/unshadow.com ../run/unafs.com ../run/unique.com \
  	../run/undrop.com \
 -	../run/ssh2john.com ../run/rar2john.com ../run/zip2john \
 +	../run/rar2john.com ../run/zip2john \
  	../run/racf2john.com ../run/hccap2john.com \
- 	../run/pwsafe2john.com ../run/keepass2john.com ../run/pfx2john.com \
+-	../run/pwsafe2john.com ../run/keepass2john.com ../run/pfx2john.com \
++	../run/pwsafe2john.com ../run/keepass2john.com \
  	../run/keychain2john.com ../run/keyring2john.com ../run/kwallet2john.com \
-@@ -229,7 +228,7 @@ PROJ_DOS = ../run/john.bin ../run/john.com \
+ 	../run/dmg2john.com ../run/putty2john.com john.local.conf \
+ 	../run/gpg2john.com
  PROJ_WIN32 = ../run/john.exe \
  	../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \
  	../run/undrop.exe \
@@ -35,7 +42,10 @@
  	../run/genmkvpwd.exe ../run/mkvcalcproba.exe ../run/calc_stat.exe \
  	../run/racf2john.exe ../run/hccap2john.exe \
  	../run/pwsafe2john.exe ../run/raw2dyna.exe ../run/keepass2john.exe \
-@@ -239,7 +238,7 @@ PROJ_WIN32 = ../run/john.exe \
+-	../run/pfx2john.exe ../run/keychain2john.exe ../run/keyring2john.exe \
++	../run/keychain2john.exe ../run/keyring2john.exe \
+ 	../run/kwallet2john.exe ../run/dmg2john.exe ../run/putty2john.exe \
+ 	john.local.conf ../run/gpg2john.exe ../run/base64conv.exe
  PROJ_WIN32_MINGW = ../run/john-mingw.exe \
  	../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \
  	../run/undrop.exe \
@@ -44,7 +54,12 @@
  	../run/genmkvpwd.exe ../run/mkvcalcproba.exe ../run/calc_stat.exe \
  	../run/racf2john.exe ../run/hccap2john.exe \
  	../run/pwsafe2john.exe ../run/raw2dyna.exe ../run/keepass2john.exe \
-@@ -2029,10 +2028,6 @@ $(SUBDIRS):
+-	../run/pfx2john.exe ../run/keychain2john.exe ../run/keyring2john.exe \
++	../run/keychain2john.exe ../run/keyring2john.exe \
+ 	../run/kwallet2john.exe ../run/putty2john.exe john.local.conf \
+ 	../run/gpg2john.exe ../run/base64conv.exe
+ PROJ_PCAP = ../run/SIPdump ../run/vncpcap2john
+@@ -2029,18 +2027,10 @@ $(SUBDIRS):
  	$(RM) ../run/undrop
  	ln -s john ../run/undrop
  
@@ -55,7 +70,15 @@
  ../run/putty2john: ../run/john
  	$(RM) ../run/putty2john
  	ln -s john ../run/putty2john
-@@ -2114,9 +2109,6 @@ $(SUBDIRS):
+ 
+-../run/pfx2john: ../run/john
+-	$(RM) ../run/pfx2john
+-	ln -s john ../run/pfx2john
+-
+ ../run/keepass2john: ../run/john
+ 	$(RM) ../run/keepass2john
+ 	ln -s john ../run/keepass2john
+@@ -2114,15 +2104,9 @@ $(SUBDIRS):
  ../run/undrop.com: john.com
  	copy john.com ..\run\undrop.com
  
@@ -65,14 +88,27 @@
  ../run/putty2john.com: john.com
  	copy john.com ..\run\putty2john.com
  
-@@ -2197,10 +2189,6 @@ john.com: john.asm
- ../run/undrop.exe: symlink.c
+-../run/pfx2john.com: john.com
+-	copy john.com ..\run\pfx2john.com
+-
+ ../run/keepass2john.com: john.com
+ 	copy john.com ..\run\keepass2john.com
+ 
+@@ -2198,17 +2182,9 @@ john.com: john.asm
  	$(CC) symlink.c -o ../run/undrop.exe
  	$(STRIP) ../run/undrop.exe
--
+ 
 -../run/ssh2john.exe: symlink.c
 -	$(CC) symlink.c -o ../run/ssh2john.exe
 -	$(STRIP) ../run/ssh2john.exe
- 
+-
  ../run/putty2john.exe: symlink.c
  	$(CC) symlink.c -o ../run/putty2john.exe
+ 	$(STRIP) ../run/putty2john.exe
+-
+-../run/pfx2john.exe: symlink.c
+-	$(CC) symlink.c -o ../run/pfx2john.exe
+-	$(STRIP) ../run/pfx2john.exe
+ 
+ ../run/keepass2john.exe: symlink.c
+ 	$(CC) symlink.c -o ../run/keepass2john.exe

Modified: head/security/john/files/patch-john.c
==============================================================================
--- head/security/john/files/patch-john.c	Thu Mar  7 11:33:20 2019	(r494923)
+++ head/security/john/files/patch-john.c	Thu Mar  7 11:37:55 2019	(r494924)
@@ -1,22 +1,31 @@
 --- john.c.orig	2014-12-18 07:59:02 UTC
 +++ john.c
-@@ -153,7 +153,6 @@ extern int base64conv(int argc, char **argv);
+@@ -153,8 +153,6 @@ extern int base64conv(int argc, char **argv);
  extern int hccap2john(int argc, char **argv);
  extern int zip2john(int argc, char **argv);
  extern int gpg2john(int argc, char **argv);
 -extern int ssh2john(int argc, char **argv);
- extern int pfx2john(int argc, char **argv);
+-extern int pfx2john(int argc, char **argv);
  extern int keychain2john(int argc, char **argv);
  extern int kwallet2john(int argc, char **argv);
-@@ -1540,11 +1539,6 @@ int main(int argc, char **argv)
- 	if (!strcmp(name, "unique")) {
- 		CPU_detect_or_fallback(argv, 0);
+ extern int keepass2john(int argc, char **argv);
+@@ -1542,19 +1540,9 @@ int main(int argc, char **argv)
  		return unique(argc, argv);
--	}
--
+ 	}
+ 
 -	if (!strcmp(name, "ssh2john")) {
 -		CPU_detect_or_fallback(argv, 0);
 -		return ssh2john(argc, argv);
+-	}
+-
+ 	if (!strcmp(name, "putty2john")) {
+ 		CPU_detect_or_fallback(argv, 0);
+ 		return putty2john(argc, argv);
+-	}
+-
+-	if (!strcmp(name, "pfx2john")) {
+-		CPU_detect_or_fallback(argv, 0);
+-		return pfx2john(argc, argv);
  	}
  
- 	if (!strcmp(name, "putty2john")) {
+ 	if (!strcmp(name, "keychain2john")) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903071137.x27BbtwM059508>