Update IKEv2 tests with new X509_AlgorithmIdentifier

Author: gpotter2

scapy/asn1fields.py

@@ -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,12 @@ def i2m(self,
             s = x
         elif isinstance(x, ASN1_Object):
             if x.val:
-                s = raw(x.val)
+                print(repr(x), repr(x.val), self.name)
+                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 +898,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/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_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(