Skip to content

Fixed an unhandled OpenSSL exception when called from command/sendas2message.py #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed an unhandled OpenSSL exception when called from command/sendas2message.py #30

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
602bdee
Caught unhandled Openssl exception
elasticdotventures Mar 4, 2021
39214ec
fixed typo in code
elasticdotventures Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions pyas2lib/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,10 @@ def split_pem(pem_bytes: bytes):


def verify_certificate_chain(cert_bytes, trusted_certs, ignore_self_signed=True):
"""Verify a given certificate against a trust store."""
"""
Verify a given certificate against a trust store.
:return: True; or None if certificate is invalid or cannot be loaded by OpenSSL.
"""

# Load the certificate
certificate = crypto.load_certificate(crypto.FILETYPE_ASN1, cert_bytes)
Expand All @@ -194,8 +197,11 @@ def verify_certificate_chain(cert_bytes, trusted_certs, ignore_self_signed=True)
store_ctx = crypto.X509StoreContext(store, certificate)

# Verify the certificate, returns None if certificate is not valid
store_ctx.verify_certificate()

try:
store_ctx.verify_certificate()
except Exception as e:
return None

return True

except crypto.X509StoreContextError as e:
Expand Down