Skip to content

Commit 366530e

Browse files
authored
Improve CMS/Kerberos support of other hashes (#4974)
1 parent f6793df commit 366530e

14 files changed

Lines changed: 367 additions & 168 deletions

File tree

scapy/asn1/mib.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,7 @@ def load_mib(filenames):
807807
# of some algorithms from pkcs1_oids and x962Signature_oids.
808808

809809
hash_by_oid = {
810+
"1.2.840.113549.1.1.1": "sha1",
810811
"1.2.840.113549.1.1.2": "md2",
811812
"1.2.840.113549.1.1.3": "md4",
812813
"1.2.840.113549.1.1.4": "md5",

scapy/layers/gssapi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ def fromssl(
342342
log_runtime.warning("Failed to parse the SSL Certificate. CBT not used")
343343
return GSS_C_NO_CHANNEL_BINDINGS
344344
try:
345-
h = cert.getSignatureHash()
345+
h = cert.getCertSignatureHash()
346346
except Exception:
347347
# We failed to get the signature algorithm.
348348
log_runtime.warning(

0 commit comments

Comments
 (0)