summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffWDH <JeffWDH@users.noreply.github.com>2023-11-16 08:18:34 -0500
committerGitHub <noreply@github.com>2023-11-16 08:18:34 -0500
commit36de14913e0f4370d7c4e2828032a5378d3bba77 (patch)
tree581e014427261161e43893bcc87bf4d090f3b5f2
parent181c8d5c5715567486d7e9bfc71b0b7c1af71f37 (diff)
downloadvyos-1x-36de14913e0f4370d7c4e2828032a5378d3bba77.tar.gz
vyos-1x-36de14913e0f4370d7c4e2828032a5378d3bba77.zip
T3983: show pki certificate Doesnt show x509 certificates
-rwxr-xr-xsrc/op_mode/pki.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/op_mode/pki.py b/src/op_mode/pki.py
index 35c7ce0e2..6c854afb5 100755
--- a/src/op_mode/pki.py
+++ b/src/op_mode/pki.py
@@ -896,11 +896,15 @@ def show_certificate(name=None, pem=False):
cert_subject_cn = cert.subject.rfc4514_string().split(",")[0]
cert_issuer_cn = cert.issuer.rfc4514_string().split(",")[0]
cert_type = 'Unknown'
- ext = cert.extensions.get_extension_for_class(x509.ExtendedKeyUsage)
- if ext and ExtendedKeyUsageOID.SERVER_AUTH in ext.value:
- cert_type = 'Server'
- elif ext and ExtendedKeyUsageOID.CLIENT_AUTH in ext.value:
- cert_type = 'Client'
+
+ try:
+ ext = cert.extensions.get_extension_for_class(x509.ExtendedKeyUsage)
+ if ext and ExtendedKeyUsageOID.SERVER_AUTH in ext.value:
+ cert_type = 'Server'
+ elif ext and ExtendedKeyUsageOID.CLIENT_AUTH in ext.value:
+ cert_type = 'Client'
+ except:
+ pass
revoked = 'Yes' if 'revoke' in cert_dict else 'No'
have_private = 'Yes' if 'private' in cert_dict and 'key' in cert_dict['private'] else 'No'