git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2to3 -f raise
[sfa.git]
/
sfa
/
trust
/
certificate.py
diff --git
a/sfa/trust/certificate.py
b/sfa/trust/certificate.py
index
6082d92
..
6f3ecc6
100644
(file)
--- a/
sfa/trust/certificate.py
+++ b/
sfa/trust/certificate.py
@@
-35,6
+35,8
@@
##
#
##
#
+from __future__ import print_function
+
import functools
import os
import tempfile
import functools
import os
import tempfile
@@
-88,11
+90,11
@@
def test_passphrase(string, passphrase):
def convert_public_key(key):
keyconvert_path = "/usr/bin/keyconvert.py"
if not os.path.isfile(keyconvert_path):
def convert_public_key(key):
keyconvert_path = "/usr/bin/keyconvert.py"
if not os.path.isfile(keyconvert_path):
- raise IOError
, "Could not find keyconvert in %s" % keyconvert_path
+ raise IOError
("Could not find keyconvert in %s" % keyconvert_path)
# we can only convert rsa keys
if "ssh-dss" in key:
# we can only convert rsa keys
if "ssh-dss" in key:
- raise Exception
, "keyconvert: dss keys are not supported"
+ raise Exception
("keyconvert: dss keys are not supported")
(ssh_f, ssh_fn) = tempfile.mkstemp()
ssl_fn = tempfile.mktemp()
(ssh_f, ssh_fn) = tempfile.mkstemp()
ssl_fn = tempfile.mktemp()
@@
-106,7
+108,7
@@
def convert_public_key(key):
# that it can be expected to see why it failed.
# TODO: for production, cleanup the temporary files
if not os.path.exists(ssl_fn):
# that it can be expected to see why it failed.
# TODO: for production, cleanup the temporary files
if not os.path.exists(ssl_fn):
- raise Exception
, "keyconvert: generated certificate not found. keyconvert may have failed."
+ raise Exception
("keyconvert: generated certificate not found. keyconvert may have failed.")
k = Keypair()
try:
k = Keypair()
try:
@@
-280,7
+282,7
@@
class Keypair:
return getattr(self,'filename',None)
def dump (self, *args, **kwargs):
return getattr(self,'filename',None)
def dump (self, *args, **kwargs):
- print
self.dump_string(*args, **kwargs
)
+ print
(self.dump_string(*args, **kwargs)
)
def dump_string (self):
result=""
def dump_string (self):
result=""
@@
-568,7
+570,7
@@
class Certificate:
if self.isCA != None:
# Can't double set properties
if self.isCA != None:
# Can't double set properties
- raise Exception
, "Cannot set basicConstraints CA:?? more than once. Was %s, trying to set as %s" % (self.isCA, val
)
+ raise Exception
("Cannot set basicConstraints CA:?? more than once. Was %s, trying to set as %s" % (self.isCA, val)
)
self.isCA = val
if val:
self.isCA = val
if val:
@@
-680,7
+682,9
@@
class Certificate:
m2x509 = X509.load_cert_string(self.save_to_string())
m2pubkey = pubkey.get_m2_pubkey()
# verify it
m2x509 = X509.load_cert_string(self.save_to_string())
m2pubkey = pubkey.get_m2_pubkey()
# verify it
- return m2x509.verify(m2pubkey)
+ # verify returns -1 or 0 on failure depending on how serious the
+ # error conditions are
+ return m2x509.verify(m2pubkey) == 1
# XXX alternatively, if openssl has been patched, do the much simpler:
# try:
# XXX alternatively, if openssl has been patched, do the much simpler:
# try:
@@
-835,7
+839,7
@@
class Certificate:
return getattr(self,'filename',None)
def dump (self, *args, **kwargs):
return getattr(self,'filename',None)
def dump (self, *args, **kwargs):
- print
self.dump_string(*args, **kwargs
)
+ print
(self.dump_string(*args, **kwargs)
)
def dump_string (self,show_extensions=False):
result = ""
def dump_string (self,show_extensions=False):
result = ""