tests/krb5: Allow additional unexpected padata types

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/krb5/raw_testcase.py b/python/samba/tests/krb5/raw_testcase.py
index 76fc995ce9519d4d24ebd2880b056bdc2aaf98a6..c04f87ed559e1f6ca39a4886eae12d337ac723a7 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -81,9 +81,11 @@ from samba.tests.krb5.rfc4120_constants import (
     PADATA_FX_COOKIE,
     PADATA_FX_ERROR,
     PADATA_FX_FAST,
+    PADATA_GSS,
     PADATA_KDC_REQ,
     PADATA_PAC_OPTIONS,
     PADATA_PAC_REQUEST,
+    PADATA_PKINIT_KX,
     PADATA_PK_AS_REQ,
     PADATA_PK_AS_REP_19,
     PADATA_SUPPORTED_ETYPES
@@ -2956,7 +2958,9 @@ class RawKerberosTest(TestCaseInTempDir):
                           PADATA_FX_FAST,
                           PADATA_PAC_OPTIONS,
                           PADATA_PK_AS_REP_19,
-                          PADATA_PK_AS_REQ}
+                          PADATA_PK_AS_REQ,
+                          PADATA_PKINIT_KX,
+                          PADATA_GSS}
         strict_edata_checking = kdc_exchange_dict['strict_edata_checking']
         if not strict_edata_checking:
             require_strict.add(PADATA_ETYPE_INFO2)

diff --git a/python/samba/tests/krb5/rfc4120.asn1 b/python/samba/tests/krb5/rfc4120.asn1
index e0831e1f86fc0e3a8c60d9dec048d961173d39a1..e5c0e77150c147dd3f1ad5526b6b318abc9b7073 100644 (file)
--- a/python/samba/tests/krb5/rfc4120.asn1
+++ b/python/samba/tests/krb5/rfc4120.asn1
@@ -736,7 +736,8 @@ PADataTypeValues ::= INTEGER {
        kRB5-PADATA-PKU2U-NAME(148),            -- zhu-pku2u
        kRB5-PADATA-REQ-ENC-PA-REP(149),        --
        kRB5-PADATA-SUPPORTED-ETYPES(165),      -- MS-KILE
-       kRB5-PADATA-PAC-OPTIONS(167)            -- MS-KILE
+       kRB5-PADATA-PAC-OPTIONS(167),           -- MS-KILE
+       kRB5-PADATA-GSS(655)                    -- gss-preauth
 }
 PADataTypeSequence ::= SEQUENCE {
         dummy [0] PADataTypeValues

diff --git a/python/samba/tests/krb5/rfc4120_constants.py b/python/samba/tests/krb5/rfc4120_constants.py
index a9fdc5735ddc80dfc30a3f5b167765f93c696415..f582960494a35b287a39bc30393b12f5b58b240f 100644 (file)
--- a/python/samba/tests/krb5/rfc4120_constants.py
+++ b/python/samba/tests/krb5/rfc4120_constants.py
@@ -64,6 +64,10 @@ PADATA_PW_SALT = int(
     krb5_asn1.PADataTypeValues('kRB5-PADATA-PW-SALT'))
 PADATA_SUPPORTED_ETYPES = int(
     krb5_asn1.PADataTypeValues('kRB5-PADATA-SUPPORTED-ETYPES'))
+PADATA_PKINIT_KX = int(
+    krb5_asn1.PADataTypeValues('kRB5-PADATA-PKINIT-KX'))
+PADATA_GSS = int(
+    krb5_asn1.PADataTypeValues('kRB5-PADATA-GSS'))
 
 # Error codes
 KDC_ERR_C_PRINCIPAL_UNKNOWN = 6

diff --git a/python/samba/tests/krb5/rfc4120_pyasn1.py b/python/samba/tests/krb5/rfc4120_pyasn1.py
index 348dd8c63fb5d7ac1f65de512dfa6e677c47e1b8..b406267301cf0ef6e79699b1ed9e4e9060abf3e5 100644 (file)
--- a/python/samba/tests/krb5/rfc4120_pyasn1.py
+++ b/python/samba/tests/krb5/rfc4120_pyasn1.py
@@ -1077,7 +1077,8 @@ PADataTypeValues.namedValues = namedval.NamedValues(
     ('kRB5-PADATA-PKU2U-NAME', 148),
     ('kRB5-PADATA-REQ-ENC-PA-REP', 149),
     ('kRB5-PADATA-SUPPORTED-ETYPES', 165),
-    ('kRB5-PADATA-PAC-OPTIONS', 167)
+    ('kRB5-PADATA-PAC-OPTIONS', 167),
+    ('kRB5-PADATA-GSS', 655)
 )