Skip to content
Open
Changes from all commits
Commits
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
11 changes: 10 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@

import logbook
import json
import OpenSSL.crypto as crypto
from future.utils import bytes_to_native_str as n
from logbook import Logger, StreamHandler

Expand Down Expand Up @@ -118,6 +117,16 @@


def print_certificate_info(buff, sock, cert):
try:
import OpenSSL.crypto as crypto
except:
message = (
"{prefix}matrix: printing certificate info is not supported after reload, "
+ "see https://github.com/poljar/weechat-matrix/issues/357"
).format(prefix=W.prefix("network"))
W.prnt(buff, message)
return

cert_pem = ssl.DER_cert_to_PEM_cert(sock.getpeercert(True))

x509 = crypto.load_certificate(crypto.FILETYPE_PEM, cert_pem)
Expand Down