- Remove SSH private keys format converter which is dead upstream, users

  should use `sshng2john.py' script instead
- Add a comment about how we should handle -jumbo versions in the future

Obtained from:	https://github.com/magnumripper/JohnTheRipper/commit/7a71705

5 files changed, 145 insertions, 2 deletions

diff --git a/security/john/Makefile b/security/john/Makefile
index a3645ac67318..89019b16475b 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -40,6 +40,9 @@ CFLAGS+=	-DJOHN_SYSTEMWIDE=1 \
 # release, just hold the horses and wait for corresponding -jumbo one, which
 # usually does not take too long to appear.
 #
+# Starting from the next version, community-enhanced (jumbo) should be added
+# as an optional feature, as suggested by Alexander himself.
+#
 PORTSCOUT=	limit:.*-jumbo
 
 BINARIES=	calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \
@@ -47,7 +50,7 @@ BINARIES=	calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \
 
 BINLINKS=	base64conv dmg2john gpg2john hccap2john keepass2john \
 		keychain2john keyring2john keystore2john kwallet2john \
-		pfx2john putty2john pwsafe2john racf2john rar2john ssh2john \
+		pfx2john putty2john pwsafe2john racf2john rar2john \
 		truecrypt_volume2john unafs undrop unique unshadow zip2john
 
 PORTDOCS=	*
diff --git a/security/john/files/patch-Makefile.in b/security/john/files/patch-Makefile.in
new file mode 100644
index 000000000000..3d12b2a6eb8d
--- /dev/null
+++ b/security/john/files/patch-Makefile.in
@@ -0,0 +1,41 @@
+--- Makefile.in.orig	2014-12-18 13:53:53 UTC
++++ Makefile.in
+@@ -84,7 +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 \
+ 	unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \
+ 	rar2john.o \
+@@ -132,7 +131,7 @@ 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@ \
+-	../run/ssh2john@EXE_EXT@ ../run/rar2john@EXE_EXT@ ../run/zip2john@EXE_EXT@ \
++	../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
+ 	$(RM) ../run/undrop
+ 	$(LN) john ../run/undrop
+ 
+-../run/ssh2john: ../run/john
+-	$(RM) ../run/ssh2john
+-	$(LN) john ../run/ssh2john
+-
+ ../run/putty2john: ../run/john
+ 	$(RM) ../run/putty2john
+ 	$(LN) john ../run/putty2john
+@@ -396,10 +391,6 @@ miscnl.o: misc.c
+ ../run/undrop.exe: symlink.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
diff --git a/security/john/files/patch-Makefile.legacy b/security/john/files/patch-Makefile.legacy
new file mode 100644
index 000000000000..1eaf32b73164
--- /dev/null
+++ b/security/john/files/patch-Makefile.legacy
@@ -0,0 +1,78 @@
+--- Makefile.legacy.orig	2014-12-18 07:59:02 UTC
++++ Makefile.legacy
+@@ -127,7 +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 \
+ 	unrarcmd.o unrarfilter.o unrarhlp.o unrar.o unrarppm.o unrarvm.o \
+ 	rar2john.o \
+@@ -209,7 +208,7 @@ 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 \
+-	../run/ssh2john ../run/rar2john ../run/zip2john \
++	../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
+ 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/keychain2john.com ../run/keyring2john.com ../run/kwallet2john.com \
+@@ -229,7 +228,7 @@ PROJ_DOS = ../run/john.bin ../run/john.com \
+ PROJ_WIN32 = ../run/john.exe \
+ 	../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \
+ 	../run/undrop.exe \
+-	../run/ssh2john.exe ../run/rar2john.exe ../run/zip2john.exe \
++	../run/rar2john.exe ../run/zip2john.exe \
+ 	../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 \
+ PROJ_WIN32_MINGW = ../run/john-mingw.exe \
+ 	../run/unshadow.exe ../run/unafs.exe ../run/unique.exe \
+ 	../run/undrop.exe \
+-	../run/ssh2john.exe ../run/rar2john.exe ../run/zip2john.exe \
++	../run/rar2john.exe ../run/zip2john.exe \
+ 	../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):
+ 	$(RM) ../run/undrop
+ 	ln -s john ../run/undrop
+ 
+-../run/ssh2john: ../run/john
+-	$(RM) ../run/ssh2john
+-	ln -s john ../run/ssh2john
+-
+ ../run/putty2john: ../run/john
+ 	$(RM) ../run/putty2john
+ 	ln -s john ../run/putty2john
+@@ -2114,9 +2109,6 @@ $(SUBDIRS):
+ ../run/undrop.com: john.com
+ 	copy john.com ..\run\undrop.com
+ 
+-../run/ssh2john.com: john.com
+-	copy john.com ..\run\ssh2john.com
+-
+ ../run/putty2john.com: john.com
+ 	copy john.com ..\run\putty2john.com
+ 
+@@ -2197,10 +2189,6 @@ john.com: john.asm
+ ../run/undrop.exe: symlink.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
diff --git a/security/john/files/patch-john.c b/security/john/files/patch-john.c
new file mode 100644
index 000000000000..115436c6e86d
--- /dev/null
+++ b/security/john/files/patch-john.c
@@ -0,0 +1,22 @@
+--- john.c.orig	2014-12-18 07:59:02 UTC
++++ john.c
+@@ -153,7 +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 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);
+ 		return unique(argc, argv);
+-	}
+-
+-	if (!strcmp(name, "ssh2john")) {
+-		CPU_detect_or_fallback(argv, 0);
+-		return ssh2john(argc, argv);
+ 	}
+ 
+ 	if (!strcmp(name, "putty2john")) {
diff --git a/security/john/pkg-plist b/security/john/pkg-plist
index 4db9f4213dfa..afad3ed561d9 100644
--- a/security/john/pkg-plist
+++ b/security/john/pkg-plist
@@ -20,7 +20,6 @@ bin/pwsafe2john
 bin/racf2john
 bin/rar2john
 bin/raw2dyna
-bin/ssh2john
 bin/tgtsnarf
 bin/truecrypt_volume2john
 bin/uaf2john