tests/krb5: Remove redundant definitions

These items are already defined elsewhere.

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 4f51619d9f18733e9758f990e7bb0e4a8b9c4f3f..90d286a66bec8394b1af2582c425dfe878348d9b 100644 (file)
--- a/python/samba/tests/krb5/raw_testcase.py
+++ b/python/samba/tests/krb5/raw_testcase.py
@@ -3717,8 +3717,8 @@ class RawKerberosTest(TestCase):
 
             signed_attr0 = signed_attrs[0]
             self.assertEqual(str(krb5_asn1.id_contentType),
-                             signed_attr0['attrType'])
-            signed_attr0_values = signed_attr0['attrValues']
+                             signed_attr0['type'])
+            signed_attr0_values = signed_attr0['values']
             self.assertEqual(1, len(signed_attr0_values))
             signed_attr0_value = self.der_decode(
                 signed_attr0_values[0],
@@ -3732,8 +3732,8 @@ class RawKerberosTest(TestCase):
 
             signed_attr1 = signed_attrs[1]
             self.assertEqual(str(krb5_asn1.id_messageDigest),
-                             signed_attr1['attrType'])
-            signed_attr1_values = signed_attr1['attrValues']
+                             signed_attr1['type'])
+            signed_attr1_values = signed_attr1['values']
             self.assertEqual(1, len(signed_attr1_values))
             message_digest = self.der_decode(signed_attr1_values[0],
                                              krb5_asn1.MessageDigest())

diff --git a/python/samba/tests/krb5/rfc4120.asn1 b/python/samba/tests/krb5/rfc4120.asn1
index 1b2c7cc06dc2a7f1604baa1fa878dec185d459d0..79449d877add9ec078febe92d34a0ec754fa5a41 100644 (file)
--- a/python/samba/tests/krb5/rfc4120.asn1
+++ b/python/samba/tests/krb5/rfc4120.asn1
@@ -1225,13 +1225,6 @@ SignedAttributes ::= SET SIZE (1..256) OF Attribute
 -- UnsignedAttributes ::= SET SIZE (1..MAX) OF Attribute
 UnsignedAttributes ::= SET SIZE (1..256) OF Attribute
 
-Attribute ::= SEQUENCE {
-  attrType OBJECT IDENTIFIER,
-  attrValues SET OF AttributeValue
-}
-
-AttributeValue ::= ANY
-
 SignatureValue ::= OCTET STRING
 
 SignedData ::= SEQUENCE {
@@ -1344,8 +1337,6 @@ RecipientKeyIdentifier ::= SEQUENCE {
   other OtherKeyAttribute OPTIONAL
 }
 
-SubjectKeyIdentifier ::= OCTET STRING
-
 KEKRecipientInfo ::= SEQUENCE {
   version CMSVersion,  -- always set to 4
   kekid KEKIdentifier,

diff --git a/python/samba/tests/krb5/rfc4120_pyasn1_generated.py b/python/samba/tests/krb5/rfc4120_pyasn1_generated.py
index 8bf7e3fb66a1c69c786d136f24fab51b6b695e15..6949737bc158181de8ff81fadd193e63e9f8c9d8 100644 (file)
--- a/python/samba/tests/krb5/rfc4120_pyasn1_generated.py
+++ b/python/samba/tests/krb5/rfc4120_pyasn1_generated.py
@@ -1,5 +1,5 @@
 # Auto-generated by asn1ate v.0.6.1.dev0 from rfc4120.asn1
-# (last modified on 2023-07-04 13:41:26.112349)
+# (last modified on 2023-12-15 11:13:21.627710)
 
 # KerberosV5Spec2
 from pyasn1.type import univ, char, namedtype, namedval, tag, constraint, useful
@@ -719,16 +719,6 @@ Attribute.componentType = namedtype.NamedTypes(
 )
 
 
-class Attribute(univ.Sequence):
-    pass
-
-
-Attribute.componentType = namedtype.NamedTypes(
-    namedtype.NamedType('attrType', univ.ObjectIdentifier()),
-    namedtype.NamedType('attrValues', univ.SetOf(componentType=AttributeValue()))
-)
-
-
 class Extension(univ.Sequence):
     pass
 
@@ -823,10 +813,6 @@ class AttributeCertificateV2(AttributeCertificate):
     pass
 
 
-class AttributeValue(univ.Any):
-    pass
-
-
 class AuthDataTypeValues(univ.Integer):
     pass
 
@@ -2470,10 +2456,6 @@ class SubjectAltName(GeneralNames):
     pass
 
 
-class SubjectKeyIdentifier(univ.OctetString):
-    pass
-
-
 class TD_DH_PARAMETERS(univ.SequenceOf):
     pass