This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 79bacefdb5c26261b92581ced42b4c3b1121b809 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Apr 30 14:48:11 2018 +0200 x2gobroker-keygen: Use new fingerprint formatting functions. --- sbin/x2gobroker-keygen | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sbin/x2gobroker-keygen b/sbin/x2gobroker-keygen index 6872ecc..ca98b49 100755 --- a/sbin/x2gobroker-keygen +++ b/sbin/x2gobroker-keygen @@ -24,7 +24,6 @@ import sys import setproctitle import argparse import logging -import binascii import paramiko import x2gobroker._paramiko @@ -39,6 +38,11 @@ except ImportError: sys.path.insert(0, os.path.join(os.getcwd(), '..')) import x2gobroker.defaults +import x2gobroker._paramiko +x2gobroker._paramiko.monkey_patch_paramiko() + +import x2gobroker.utils + supported_key_types = ('RSA', 'DSA') PROG_NAME = os.path.basename(sys.argv[0]) @@ -119,7 +123,7 @@ if __name__ == '__main__': key = paramiko.DSSKey.generate(1024) id_file = 'id_dsa' - logger_broker.info(' The {key_type} key has been generated, fingerprint: {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=binascii.hexlify(key.get_fingerprint()))) + logger_broker.info(' The {key_type} key has been generated, fingerprint: {fingerprint}'.format(key_type=cmdline_args.key_type.upper(), fingerprint=x2gobroker.utils.get_fingerprint_with_colons(key))) if os.path.exists('{home}/.ssh/{id_file}'.format(home=broker_home, id_file=id_file)) and not cmdline_args.force: logger_broker.error(' Private key {home}/.ssh/{id_file} exists. Use --force to overwrite'.format(home=broker_home, id_file=id_file)) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git