X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/2d51c14ff4bc8b00f53b29cd0b39197c2c676ec8..c16e353eb95120407b78602f0bbaedac57eccf44:/contrib/kh2reg.py

diff --git a/contrib/kh2reg.py b/contrib/kh2reg.py
index ea6baac5..4872aec8 100755
--- a/contrib/kh2reg.py
+++ b/contrib/kh2reg.py
@@ -1,9 +1,13 @@
 #! /usr/bin/env python
 
-# $Id: kh2reg.py,v 1.1 2002/03/10 22:00:06 jacob Exp $
+# $Id$
 # Convert OpenSSH known_hosts and known_hosts2 files to "new format" PuTTY
-# host keys in a Windows .REG file (double-click to install).
-#   usage: hosts2reg.py known_hosts1 2 3 4 ... > hosts.reg
+# host keys.
+#   usage:
+#     kh2reg.py [ --win ] known_hosts1 2 3 4 ... > hosts.reg
+#       Creates a Windows .REG file (double-click to install).
+#     kh2reg.py --unix    known_hosts1 2 3 4 ... > sshhostkeys
+#       Creates data suitable for storing in ~/.putty/sshhostkeys (Unix).
 # Line endings are someone else's problem as is traditional.
 # Developed for Python 1.5.2.
 
@@ -13,8 +17,9 @@ import struct
 import string
 import re
 import sys
+import getopt
 
-def mungestr(s):
+def winmungestr(s):
     "Duplicate of PuTTY's mungestr() in winstore.c:1.10 for Registry keys"
     candot = 0
     r = ""
@@ -42,14 +47,25 @@ def longtohex(n):
     plain=string.lower(re.match(r"0x([0-9A-Fa-f]*)l?$", hex(n), re.I).group(1))
     return "0x" + plain
 
-# Output REG file header.
-sys.stdout.write("""REGEDIT4
+output_type = 'windows'
+
+try:
+    optlist, args = getopt.getopt(sys.argv[1:], '', [ 'win', 'unix' ])
+    if filter(lambda x: x[0] == '--unix', optlist):
+        output_type = 'unix'
+except getopt.error, e:
+    sys.stderr.write(str(e) + "\n")
+    sys.exit(1)
+
+if output_type == 'windows':
+    # Output REG file header.
+    sys.stdout.write("""REGEDIT4
 
 [HKEY_CURRENT_USER\Software\SimonTatham\PuTTY\SshHostKeys]
 """)
 
 # Now process all known_hosts input.
-for line in fileinput.input():
+for line in fileinput.input(args):
 
     try:
         # Remove leading/trailing whitespace (should zap CR and LF)
@@ -71,7 +87,7 @@ for line in fileinput.input():
         # is second field entirely decimal digits?
         if re.match (r"\d*$", fields[1]):
 
-            # Treat as SSH1-type host key.
+            # Treat as SSH-1-type host key.
             # Format: hostpat bits10 exp10 mod10 comment...
             # (PuTTY doesn't store the number of bits.)
             magicnumbers = map (long, fields[2:4])
@@ -79,7 +95,7 @@ for line in fileinput.input():
 
         else:
 
-            # Treat as SSH2-type host key.
+            # Treat as SSH-2-type host key.
             # Format: hostpat keytype keyblob64 comment...
             sshkeytype, blob = fields[1], base64.decodestring (fields[2])
 
@@ -112,15 +128,28 @@ for line in fileinput.input():
                 sys.stderr.write("Skipping wildcard host pattern '%s'\n"
                                  % host)
                 continue
+            elif re.match (r"\|", host):
+                sys.stderr.write("Skipping hashed hostname '%s'\n" % host)
+                continue
             else:
-                # Slightly bizarre registry key format: 'type@port:hostname'
-                # As far as I know, the input never specifies a port.
-                port = 22
+                m = re.match (r"\[([^]]*)\]:(\d*)$", host)
+                if m:
+                    (host, port) = m.group(1,2)
+                    port = int(port)
+                else:
+                    port = 22
+                # Slightly bizarre output key format: 'type@port:hostname'
                 # XXX: does PuTTY do anything useful with literal IP[v4]s?
                 key = keytype + ("@%d:%s" % (port, host))
                 value = string.join (map (longtohex, magicnumbers), ',')
-                # XXX: worry about double quotes?
-                sys.stdout.write("\"%s\"=\"%s\"\n" % (mungestr(key), value))
+                if output_type == 'unix':
+                    # Unix format.
+                    sys.stdout.write('%s %s\n' % (key, value))
+                else:
+                    # Windows format.
+                    # XXX: worry about double quotes?
+                    sys.stdout.write("\"%s\"=\"%s\"\n"
+                                     % (winmungestr(key), value))
 
     except "Unknown SSH key type", k:
         sys.stderr.write("Unknown SSH key type '%s', skipping\n" % k)