summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJeffWDH <JeffWDH@users.noreply.github.com>2023-11-16 08:18:34 -0500
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2023-11-16 14:47:07 +0000
commit2d02c347a848275b75ae8784575d64e4d5c27bea (patch)
treeb78bd82f1e539ec75d18b58df805ef89cb4971c0 /src
parent71823db0fceee36f631484d3ff6767569e1ca825 (diff)
downloadvyos-1x-2d02c347a848275b75ae8784575d64e4d5c27bea.tar.gz
vyos-1x-2d02c347a848275b75ae8784575d64e4d5c27bea.zip
T3983: show pki certificate Doesnt show x509 certificates
(cherry picked from commit 36de14913e0f4370d7c4e2828032a5378d3bba77)
Diffstat (limited to 'src')
-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'