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
disambiguate get_subject and pretty_subject
[sfa.git]
/
sfa
/
trust
/
certificate.py
diff --git
a/sfa/trust/certificate.py
b/sfa/trust/certificate.py
index
dc2672f
..
c3f3790
100644
(file)
--- a/
sfa/trust/certificate.py
+++ b/
sfa/trust/certificate.py
@@
-505,13
+505,13
@@
class Certificate:
return " "+chunk
def pretty_cert(self):
return " "+chunk
def pretty_cert(self):
+ message = "[Cert."
x = self.x509.get_subject()
ou = getattr(x, "OU")
x = self.x509.get_subject()
ou = getattr(x, "OU")
- cn = getattr(x, "CN")
- data = self.get_data(field='subjectAltName')
- message = "[Cert."
if ou: message += " OU: {}".format(ou)
if ou: message += " OU: {}".format(ou)
+ cn = getattr(x, "CN")
if cn: message += " CN: {}".format(cn)
if cn: message += " CN: {}".format(cn)
+ data = self.get_data(field='subjectAltName')
if data:
message += " SubjectAltName:"
counter = 0
if data:
message += " SubjectAltName:"
counter = 0