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
apply Loic's changes only in python3 for extra safety
[sfa.git]
/
sfa
/
trust
/
certificate.py
diff --git
a/sfa/trust/certificate.py
b/sfa/trust/certificate.py
index
5782910
..
a30d73a
100644
(file)
--- a/
sfa/trust/certificate.py
+++ b/
sfa/trust/certificate.py
@@
-47,6
+47,8
@@
import OpenSSL
# M2Crypto is imported on the fly to minimize crashes
#import M2Crypto
# M2Crypto is imported on the fly to minimize crashes
#import M2Crypto
+from sfa.util.py23 import PY3
+
from sfa.util.faults import CertExpired, CertMissingParent, CertNotSignedByParent
from sfa.util.sfalogging import logger
from sfa.util.faults import CertExpired, CertMissingParent, CertNotSignedByParent
from sfa.util.sfalogging import logger
@@
-432,7
+434,7
@@
class Certificate:
logger.warn("None cert in certificate.save_to_string")
return ""
string = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, self.x509)
logger.warn("None cert in certificate.save_to_string")
return ""
string = OpenSSL.crypto.dump_certificate(OpenSSL.crypto.FILETYPE_PEM, self.x509)
- if isinstance(string, bytes):
+ if
PY3 and
isinstance(string, bytes):
string = string.decode()
if save_parents and self.parent:
string = string + self.parent.save_to_string(save_parents)
string = string.decode()
if save_parents and self.parent:
string = string + self.parent.save_to_string(save_parents)
@@
-448,7
+450,7
@@
class Certificate:
f = filep
else:
f = open(filename, 'w')
f = filep
else:
f = open(filename, 'w')
- if isinstance(string, bytes):
+ if
PY3 and
isinstance(string, bytes):
string = string.decode()
f.write(string)
f.close()
string = string.decode()
f.write(string)
f.close()