Merge remote-tracking branch 'retspen/master'

Conflicts:
	conf/requirements.txt
This commit is contained in:
Jan Krcmar
2016-04-21 13:34:27 +02:00
11 changed files with 456 additions and 415 deletions

View File

@@ -9,4 +9,4 @@ register = template.Library()
def ssh_to_fingerprint(line):
key = base64.b64decode(line.strip().split()[1].encode('ascii'))
fp_plain = hashlib.md5(key).hexdigest()
return ':'.join(a+b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
return ':'.join(a + b for a, b in zip(fp_plain[::2], fp_plain[1::2]))