Remove remaining traces of ssh2john

doc/FAQ

@@ -87,13 +87,13 @@ A: John only loads properly formatted text files directly.  It can load
 can also load text files containing one password hash per line (and
 nothing else on that line).  Some other file formats are supported via
 extra tools (supplied with John): unafs (Kerberos AFS database files),
-undrop (Eggdrop IRC bot userfiles), ssh2john (OpenSSH private keys),
+undrop (Eggdrop IRC bot userfiles), ssh2sshng.py (OpenSSH private keys),
 pdf2john (some password-protected PDF files), rar2john (some
 password-protected RAR archives), zip2john (some password-protected
 PKZIP and WinZip archives).  You need -jumbo for most of these.  To use
 the proper one of these (for your file format), run it on your file(s)
 and redirect the output to a new file (using your shell's output
-redirection feature - e.g., "./ssh2john ~/.ssh/id_rsa > sshpasswd").
+redirection feature - e.g., "./ssh2sshng.py ~/.ssh/id_rsa > sshpasswd").
 Then run John on the resulting file (e.g., "./john sshpasswd").
 A: The file you're trying to run John on might in fact not be a password
 file at all.

doc/README.ssh

@@ -1,18 +1,8 @@
 Cracking password protected ssh private keys
 ============================================
 
-JtR-jumbo has two formats (plug-ins) which support cracking
-password protected ssh private keys, "ssh" and "ssh-ng".
-
-ssh-ng is newer, faster but highly experimental format which
-can generate false positives. Use it at your own risk.
-
 1. Build JtR-jumbo
 
-2. Run either of the following steps,
-
-   a. Run ssh2john on SSH private key file(s) *OR*
-
-   b. Run sshng2john.py on SSH private key file(s)
+2. Run sshng2john.py on SSH private key file(s)
 
 3. Run john on the output of step 2.

run/pem2john.py

@@ -95,7 +95,7 @@ def unwrap_pkcs8(blob):
         blob = open(filename, "rb").read()
         if b'-----BEGIN ENCRYPTED PRIVATE KEY-----' not in blob:
             if b'PRIVATE KEY-----' in blob:
-                sys.stderr.write("[%s] try using sshng2john.py or ssh2john on this file instead!\n" % sys.argv[0])
+                sys.stderr.write("[%s] try using sshng2john.py on this file instead!\n" % sys.argv[0])
             else:
                 sys.stderr.write("[%s] is this really a private key in PKCS #8 format?\n" % sys.argv[0])