X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Ftrust%2Fcertificate.py;h=b34e5cdef133c2575b4b6a4acb1e3b59d70b5bf1;hb=9e6709319b71780b561046d5162271fdaa940cd6;hp=54d98eb1828cd78d0d5a3f73f081b2c7b774b090;hpb=1d3e7f7fb06b8549a6929638f8953c6c89657d4e;p=sfa.git diff --git a/sfa/trust/certificate.py b/sfa/trust/certificate.py index 54d98eb1..b34e5cde 100644 --- a/sfa/trust/certificate.py +++ b/sfa/trust/certificate.py @@ -33,7 +33,6 @@ def convert_public_key(key): # we can only convert rsa keys if "ssh-dss" in key: - print "XXX: DSA key encountered, ignoring" return None (ssh_f, ssh_fn) = tempfile.mkstemp() @@ -43,19 +42,17 @@ def convert_public_key(key): cmd = keyconvert_path + " " + ssh_fn + " " + ssl_fn os.system(cmd) - + # this check leaves the temporary file containing the public key so # that it can be expected to see why it failed. # TODO: for production, cleanup the temporary files if not os.path.exists(ssl_fn): - report.trace(" failed to convert key from " + ssh_fn + " to " + ssl_fn) return None - + k = Keypair() try: k.load_pubkey_from_file(ssl_fn) except: - print "XXX: Error while converting key: ", key traceback.print_exc() k = None