Update IKEv2 tests with new X509_AlgorithmIdentifier

Author: gpotter2

scapy/asn1fields.py

@@ -31,7 +31,6 @@
     BER_tagging_enc,
 )
 from scapy.base_classes import BasePacket
-from scapy.compat import raw
 from scapy.volatile import (
     GeneralizedTime,
     RandChoice,
@@ -489,6 +488,7 @@ def m2i(self, pkt, s):
                 obj.set_val(pkt, None)
         else:
             for obj in self.seq:
+                # DEBUG: print(repr(obj), repr)
                 try:
                     s = obj.dissect(pkt, s)
                 except ASN1F_badsequence:
@@ -599,7 +599,7 @@ def build(self, pkt):
         elif val is None:
             s = b""
         else:
-            s = b"".join(raw(i) for i in val)
+            s = b"".join(bytes(i) for i in val)
         return self.i2m(pkt, s)
 
     def i2repr(self, pkt, x):
@@ -769,7 +769,7 @@ def i2m(self, pkt, x):
         if x is None:
             s = b""
         else:
-            s = raw(x)
+            s = bytes(x)
             if hash(type(x)) in self.pktchoices:
                 imp, exp = self.pktchoices[hash(type(x))]
                 s = BER_tagging_enc(s,
@@ -852,11 +852,11 @@ def i2m(self,
             s = x
         elif isinstance(x, ASN1_Object):
             if x.val:
-                s = raw(x.val)
+                s = bytes(x.val)
             else:
                 s = b""
         else:
-            s = raw(x)
+            s = bytes(x)
             if not hasattr(x, "ASN1_root"):
                 # A normal Packet (!= ASN1)
                 return s
@@ -897,7 +897,7 @@ def __init__(self,
         self.cls = cls
         super(ASN1F_BIT_STRING_ENCAPS, self).__init__(  # type: ignore
             name,
-            default and raw(default),
+            default and bytes(default),
             context=context,
             implicit_tag=implicit_tag,
             explicit_tag=explicit_tag

scapy/layers/smb.py

@@ -1003,9 +1003,9 @@ class NETLOGON_SAM_LOGON_RESPONSE_NT40(NETLOGON):
     0x00002000: "WS",
     0x00004000: "DS_8",  # >=2008R2
     0x00008000: "DS_9",  # >=2012
-    0x00010000: "DS_10", # >=2016
-    0x00020000: "DS_11", # >=2019
-    0x00040000: "DS_12", # >=2025
+    0x00010000: "DS_10",  # >=2016
+    0x00020000: "DS_11",  # >=2019
+    0x00040000: "DS_12",  # >=2025
     0x20000000: "DNS_CONTROLLER",
     0x40000000: "DNS_DOMAIN",
     0x80000000: "DNS_FOREST",

scapy/layers/spnego.py

@@ -39,7 +39,6 @@
     ASN1F_optional,
 )
 from scapy.asn1packet import ASN1_Packet
-from scapy.base_classes import Net
 from scapy.fields import (
     FieldListField,
     LEIntEnumField,
@@ -63,7 +62,6 @@
     valid_ip6,
 )
 
-from scapy.layers.inet6 import Net6
 from scapy.layers.gssapi import (
     GSSAPI_BLOB,
     GSSAPI_BLOB_SIGNATURE,

scapy/layers/x509.py

@@ -893,8 +893,10 @@ class X509_AlgorithmIdentifier(ASN1_Packet):
                     ),
                     lambda pkt: pkt.algorithm.val == "1.2.840.113549.1.3.1",
                 ),
+
             ],
-            ASN1F_optional(ASN1F_NULL("parameters", None)),
+            # RFC4055 (=1.2.840.113549.1.1.11) / Default
+            ASN1F_optional(ASN1F_NULL("parameters", 0)),
         )
     )
 

test/contrib/ikev2.uts

@@ -781,7 +781,7 @@ frames = [
                     subjectPublicKeyInfo=X509_SubjectPublicKeyInfo(
                         signatureAlgorithm=X509_AlgorithmIdentifier(
                             algorithm=ASN1_OID('ecPublicKey'),
-                            parameters=ASN1_OID('prime256v1')),
+                            parameters=ECParameters(curve=ASN1_OID('prime256v1'))),
                         subjectPublicKey=ECDSAPublicKey(
                             ecPoint=ASN1_BIT_STRING(
                                 '000001001011011101000101011100101010000110110101110111010001110'
@@ -1125,7 +1125,7 @@ frames = [
                     subjectPublicKeyInfo=X509_SubjectPublicKeyInfo(
                         signatureAlgorithm=X509_AlgorithmIdentifier(
                             algorithm=ASN1_OID('ecPublicKey'),
-                            parameters=ASN1_OID('prime256v1')
+                            parameters=ECParameters(curve=ASN1_OID('prime256v1')),
                         ),
                         subjectPublicKey=ECDSAPublicKey(
                             ecPoint=ASN1_BIT_STRING(