mirror of
https://github.com/samba-team/samba.git
synced 2025-08-26 01:49:31 +03:00
tests/krb5: Allow additional unexpected padata types
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
committed by
Andrew Bartlett
parent
6bf3610c5d
commit
45d81d56ab
@ -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)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user