зеркало из https://github.com/github/putty.git
kh2reg.py: work with Python 3.
This commit is contained in:
Simon Tatham
Родитель
5a508a84a2
Коммит
33d4d223a5
|
|
@ -8,8 +8,7 @@
|
|||
# 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.
|
||||
# Originally developed for Python 1.5.2, but probably won't run on that
|
||||
# any more.
|
||||
# Should run under either Python 2 or 3.
|
||||
|
||||
import fileinput
|
||||
import base64
|
||||
|
|
@ -20,6 +19,7 @@ import sys
|
|||
import getopt
|
||||
import itertools
|
||||
import collections
|
||||
from functools import reduce
|
||||
|
||||
def winmungestr(s):
|
||||
"Duplicate of PuTTY's mungestr() in winstore.c:1.10 for Registry keys"
|
||||
|
|
@ -33,26 +33,19 @@ def winmungestr(s):
|
|||
candot = 1
|
||||
return r
|
||||
|
||||
def strtolong(s):
|
||||
"Convert arbitrary-length big-endian binary data to a Python long"
|
||||
bytes = struct.unpack(">%luB" % len(s), s)
|
||||
return reduce ((lambda a, b: (long(a) << 8) + long(b)), bytes)
|
||||
def strtoint(s):
|
||||
"Convert arbitrary-length big-endian binary data to a Python int"
|
||||
bytes = struct.unpack(">{:d}B".format(len(s)), s)
|
||||
return reduce ((lambda a, b: (int(a) << 8) + int(b)), bytes)
|
||||
|
||||
def strtolong_le(s):
|
||||
"Convert arbitrary-length little-endian binary data to a Python long"
|
||||
bytes = reversed(struct.unpack(">%luB" % len(s), s))
|
||||
return reduce ((lambda a, b: (long(a) << 8) + long(b)), bytes)
|
||||
def strtoint_le(s):
|
||||
"Convert arbitrary-length little-endian binary data to a Python int"
|
||||
bytes = reversed(struct.unpack(">{:d}B".format(len(s)), s))
|
||||
return reduce ((lambda a, b: (int(a) << 8) + int(b)), bytes)
|
||||
|
||||
def longtohex(n):
|
||||
"""Convert long int to lower-case hex.
|
||||
|
||||
Ick, Python (at least in 1.5.2) doesn't appear to have a way to
|
||||
turn a long int into an unadorned hex string -- % gets upset if the
|
||||
number is too big, and raw hex() uses uppercase (sometimes), and
|
||||
adds unwanted "0x...L" around it."""
|
||||
|
||||
plain=string.lower(re.match(r"0x([0-9A-Fa-f]*)l?$", hex(n), re.I).group(1))
|
||||
return "0x" + plain
|
||||
def inttohex(n):
|
||||
"Convert int to lower-case hex."
|
||||
return "0x{:x}".format(n)
|
||||
|
||||
def warn(s):
|
||||
"Warning with file/line number"
|
||||
|
|
@ -172,9 +165,9 @@ nist_curves = {
|
|||
|
||||
try:
|
||||
optlist, args = getopt.getopt(sys.argv[1:], '', [ 'win', 'unix' ])
|
||||
if filter(lambda x: x[0] == '--unix', optlist):
|
||||
if any(x[0] == '--unix' for x in optlist):
|
||||
output_type = 'unix'
|
||||
except getopt.error, e:
|
||||
except getopt.error as e:
|
||||
sys.stderr.write(str(e) + "\n")
|
||||
sys.exit(1)
|
||||
|
||||
|
|
@ -201,14 +194,14 @@ for line in fileinput.input(args):
|
|||
|
||||
try:
|
||||
# Remove leading/trailing whitespace (should zap CR and LF)
|
||||
line = string.strip (line)
|
||||
line = line.strip()
|
||||
|
||||
# Skip blanks and comments
|
||||
if line == '' or line[0] == '#':
|
||||
raise BlankInputLine
|
||||
|
||||
# Split line on spaces.
|
||||
fields = string.split (line, ' ')
|
||||
fields = line.split(' ')
|
||||
|
||||
# Common fields
|
||||
hostpat = fields[0]
|
||||
|
|
@ -222,14 +215,15 @@ for line in fileinput.input(args):
|
|||
# Treat as SSH-1-type host key.
|
||||
# Format: hostpat bits10 exp10 mod10 comment...
|
||||
# (PuTTY doesn't store the number of bits.)
|
||||
keyparams = map (long, fields[2:4])
|
||||
keyparams = map (int, fields[2:4])
|
||||
keytype = "rsa"
|
||||
|
||||
else:
|
||||
|
||||
# Treat as SSH-2-type host key.
|
||||
# Format: hostpat keytype keyblob64 comment...
|
||||
sshkeytype, blob = fields[1], base64.decodestring (fields[2])
|
||||
sshkeytype, blob = fields[1], base64.decodestring(
|
||||
fields[2].encode("ASCII"))
|
||||
|
||||
# 'blob' consists of a number of
|
||||
# uint32 N (big-endian)
|
||||
|
|
@ -244,7 +238,7 @@ for line in fileinput.input(args):
|
|||
blob = blob [struct.calcsize(sizefmt) + size : ]
|
||||
|
||||
# The first field is keytype again.
|
||||
if subfields[0] != sshkeytype:
|
||||
if subfields[0].decode("ASCII") != sshkeytype:
|
||||
raise KeyFormatError("""
|
||||
outer and embedded key types do not match: '%s', '%s'
|
||||
""" % (sshkeytype, subfields[1]))
|
||||
|
|
@ -255,12 +249,12 @@ for line in fileinput.input(args):
|
|||
keytype = "rsa2"
|
||||
# The rest of the subfields we can treat as an opaque list
|
||||
# of bignums (same numbers and order as stored by PuTTY).
|
||||
keyparams = map (strtolong, subfields[1:])
|
||||
keyparams = map (strtoint, subfields[1:])
|
||||
|
||||
elif sshkeytype == "ssh-dss":
|
||||
keytype = "dss"
|
||||
# Same again.
|
||||
keyparams = map (strtolong, subfields[1:])
|
||||
keyparams = map (strtoint, subfields[1:])
|
||||
|
||||
elif sshkeytype in nist_curves:
|
||||
keytype = sshkeytype
|
||||
|
|
@ -269,13 +263,13 @@ for line in fileinput.input(args):
|
|||
raise KeyFormatError("too many subfields in blob")
|
||||
(curvename, Q) = subfields[1:]
|
||||
# First is yet another copy of the key name.
|
||||
if not re.match("ecdsa-sha2-" + re.escape(curvename),
|
||||
sshkeytype):
|
||||
if not re.match("ecdsa-sha2-" + re.escape(
|
||||
curvename.decode("ASCII")), sshkeytype):
|
||||
raise KeyFormatError("key type mismatch ('%s' vs '%s')"
|
||||
% (sshkeytype, curvename))
|
||||
# Second contains key material X and Y (hopefully).
|
||||
# First a magic octet indicating point compression.
|
||||
point_type = struct.unpack("B", Q[0])[0]
|
||||
point_type = struct.unpack_from("B", Q, 0)[0]
|
||||
Qrest = Q[1:]
|
||||
if point_type == 4:
|
||||
# Then two equal-length bignums (X and Y).
|
||||
|
|
@ -283,14 +277,14 @@ for line in fileinput.input(args):
|
|||
if (bnlen % 1) != 0:
|
||||
raise KeyFormatError("odd-length X+Y")
|
||||
bnlen = bnlen // 2
|
||||
x = strtolong(Qrest[:bnlen])
|
||||
y = strtolong(Qrest[bnlen:])
|
||||
x = strtoint(Qrest[:bnlen])
|
||||
y = strtoint(Qrest[bnlen:])
|
||||
elif 2 <= point_type <= 3:
|
||||
# A compressed point just specifies X, and leaves
|
||||
# Y implicit except for parity, so we have to
|
||||
# recover it from the curve equation.
|
||||
curve = nist_curves[sshkeytype]
|
||||
x = strtolong(Qrest)
|
||||
x = strtoint(Qrest)
|
||||
yy = (x*x*x + curve.a*x + curve.b) % curve.p
|
||||
y = SqrtModP.root(yy, curve.p)
|
||||
if y % 2 != point_type % 2:
|
||||
|
|
@ -303,13 +297,10 @@ for line in fileinput.input(args):
|
|||
|
||||
if len(subfields) != 2:
|
||||
raise KeyFormatError("wrong number of subfields in blob")
|
||||
if subfields[0] != sshkeytype:
|
||||
raise KeyFormatError("key type mismatch ('%s' vs '%s')"
|
||||
% (sshkeytype, subfields[0]))
|
||||
# Key material y, with the top bit being repurposed as
|
||||
# the expected parity of the associated x (point
|
||||
# compression).
|
||||
y = strtolong_le(subfields[1])
|
||||
y = strtoint_le(subfields[1])
|
||||
x_parity = y >> 255
|
||||
y &= ~(1 << 255)
|
||||
|
||||
|
|
@ -332,7 +323,7 @@ for line in fileinput.input(args):
|
|||
raise UnknownKeyType(sshkeytype)
|
||||
|
||||
# Now print out one line per host pattern, discarding wildcards.
|
||||
for host in string.split (hostpat, ','):
|
||||
for host in hostpat.split(','):
|
||||
if re.search (r"[*?!]", host):
|
||||
warn("skipping wildcard host pattern '%s'" % host)
|
||||
continue
|
||||
|
|
@ -351,9 +342,10 @@ for line in fileinput.input(args):
|
|||
key = keytype + ("@%d:%s" % (port, host))
|
||||
# Most of these are numbers, but there's the occasional
|
||||
# string that needs passing through
|
||||
value = string.join (map (
|
||||
lambda x: x if isinstance(x, basestring) else longtohex(x),
|
||||
keyparams), ',')
|
||||
value = ",".join(map(
|
||||
lambda x: x if isinstance(x, str)
|
||||
else x.decode('ASCII') if isinstance(x, bytes)
|
||||
else inttohex(x), keyparams))
|
||||
if output_type == 'unix':
|
||||
# Unix format.
|
||||
sys.stdout.write('%s %s\n' % (key, value))
|
||||
|
|
@ -363,9 +355,9 @@ for line in fileinput.input(args):
|
|||
sys.stdout.write("\"%s\"=\"%s\"\n"
|
||||
% (winmungestr(key), value))
|
||||
|
||||
except UnknownKeyType, k:
|
||||
except UnknownKeyType as k:
|
||||
warn("unknown SSH key type '%s', skipping" % k.keytype)
|
||||
except KeyFormatError, k:
|
||||
except KeyFormatError as k:
|
||||
warn("trouble parsing key (%s), skipping" % k.msg)
|
||||
except BlankInputLine:
|
||||
pass
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче