Merge pull request #8 from vruello/fix_salt_aes128

Fix salt retrival with aes128-cts-hmac-sha1-96
cea-sec · Jul 30, 2024 · 0440a37 · 0440a37
2 parents a49e13c + a5201a8
commit 0440a37
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/gmsad/salt.py b/gmsad/salt.py
@@ -349,7 +349,8 @@ def get_salt_from_rep(kdc_rep: bytes) -> str:
                 if padata['padata-type'].native == PA_ETYPE_INFO2:
                     etype = ETYPE_INFO2()
                     for pa_etype_info2_value in etype.load(padata['padata-value'].native):
-                        if pa_etype_info2_value['etype'].native == AES256_CTS_HMAC_SHA1h96_ENC_TYPE:
+                        if (pa_etype_info2_value['etype'].native == AES256_CTS_HMAC_SHA1h96_ENC_TYPE
+                            or pa_etype_info2_value['etype'].native == AES128_CTS_HMAC_SHA1_96_ENC_TYPE):
                             # XXX: Adding str just for mypy
                             return str(pa_etype_info2_value['salt'].native)
         else:
@@ -362,8 +363,8 @@ def get_salt_from_rep(kdc_rep: bytes) -> str:
             if padata['padata-type'] == PA_ETYPE_INFO2:
                 etype = ETYPE_INFO2()
                 for pa_etype_info2_value in etype.load(padata['padata-value']):
-                    if pa_etype_info2_value['etype'].native == AES256_CTS_HMAC_SHA1h96_ENC_TYPE \
-                        or pa_etype_info2_value['etype'].native == AES128_CTS_HMAC_SHA1_96_ENC_TYPE:
+                    if (pa_etype_info2_value['etype'].native == AES256_CTS_HMAC_SHA1h96_ENC_TYPE
+                        or pa_etype_info2_value['etype'].native == AES128_CTS_HMAC_SHA1_96_ENC_TYPE):
                         # XXX: Adding str just for mypy
                         return str(pa_etype_info2_value['salt'])
     raise Exception("Could not retrieve salt from AS_REP (tag number %d)" % tag)