Add indirection to field elements (for GraphQL type bs).

1 files changed, 220 insertions, 66 deletions

diff --git a/wtls/curves.json b/wtls/curves.json
index 3b3ef17..f77c497 100644
--- a/wtls/curves.json
+++ b/wtls/curves.json
@@ -8,23 +8,40 @@
         "bits": 113,
         "degree": 113,
         "poly": [
-          {"power": 113, "coeff": "0x01"},
-          {"power": 9, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 113,
+            "coeff": "0x01"
+          },
+          {
+            "power": 9,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ],
         "type": "Binary"
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x01667979a40ba497e5d5c270780617",
-        "y": "0x00f44b4af1ecc2630e08785cebcc15"
+        "x": {
+          "value": "0x01667979a40ba497e5d5c270780617"
+        },
+        "y": {
+          "value": "0x00f44b4af1ecc2630e08785cebcc15"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls1",
       "oid": "2.23.43.1.4.1",
       "order": "0x00fffffffffffffffdbf91af6dea73",
       "params": {
-        "a": "0x1",
-        "b": "0x1"
+        "a": {
+          "value": "0x1"
+        },
+        "b": {
+          "value": "0x1"
+        }
       }
     },
     {
@@ -34,26 +51,49 @@
       "field": {
         "type": "Binary",
         "poly": [
-          {"power": 163, "coeff": "0x01"},
-          {"power": 7, "coeff": "0x01"},
-          {"power": 6, "coeff": "0x01"},
-          {"power": 3, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 163,
+            "coeff": "0x01"
+          },
+          {
+            "power": 7,
+            "coeff": "0x01"
+          },
+          {
+            "power": 6,
+            "coeff": "0x01"
+          },
+          {
+            "power": 3,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ],
         "bits": 163,
         "degree": 163
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x02fe13c0537bbc11acaa07d793de4e6d5e5c94eee8",
-        "y": "0x0289070fb05d38ff58321f2e800536d538ccdaa3d9"
+        "x": {
+          "value": "0x02fe13c0537bbc11acaa07d793de4e6d5e5c94eee8"
+        },
+        "y": {
+          "value": "0x0289070fb05d38ff58321f2e800536d538ccdaa3d9"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls3",
       "oid": "2.23.43.1.4.3",
       "order": "0x04000000000000000000020108a2e0cc0d99f8a5ef",
       "params": {
-        "a": "0x1",
-        "b": "0x1"
+        "a": {
+          "value": "0x1"
+        },
+        "b": {
+          "value": "0x1"
+        }
       },
       "aliases": [
         "nist/K-163",
@@ -69,23 +109,40 @@
         "bits": 113,
         "degree": 113,
         "poly": [
-          {"power": 113, "coeff": "0x01"},
-          {"power": 9, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 113,
+            "coeff": "0x01"
+          },
+          {
+            "power": 9,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ],
         "type": "Binary"
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x009d73616f35f4ab1407d73562c10f",
-        "y": "0x00a52830277958ee84d1315ed31886"
+        "x": {
+          "value": "0x009d73616f35f4ab1407d73562c10f"
+        },
+        "y": {
+          "value": "0x00a52830277958ee84d1315ed31886"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls4",
       "oid": "2.23.43.1.4.4",
       "order": "0x0100000000000000d9ccec8a39e56f",
       "params": {
-        "a": "0x003088250ca6e7c7fe649ce85820f7",
-        "b": "0x00e8bee4d3e2260744188be0e9c723"
+        "a": {
+          "value": "0x003088250ca6e7c7fe649ce85820f7"
+        },
+        "b": {
+          "value": "0x00e8bee4d3e2260744188be0e9c723"
+        }
       },
       "aliases": [
         "secg/sect113r1"
@@ -102,22 +159,45 @@
         "bits": 163,
         "degree": 163,
         "poly": [
-          {"power": 163, "coeff": "0x01"},
-          {"power": 8, "coeff": "0x01"},
-          {"power": 2, "coeff": "0x01"},
-          {"power": 1, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 163,
+            "coeff": "0x01"
+          },
+          {
+            "power": 8,
+            "coeff": "0x01"
+          },
+          {
+            "power": 2,
+            "coeff": "0x01"
+          },
+          {
+            "power": 1,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ]
       },
       "params": {
-        "a": "0x072546b5435234a422e0789675f432c89435de5242",
-        "b": "0x00c9517d06d5240d3cff38c74b20b6cd4d6f9dd4d9"
+        "a": {
+          "value": "0x072546b5435234a422e0789675f432c89435de5242"
+        },
+        "b": {
+          "value": "0x00c9517d06d5240d3cff38c74b20b6cd4d6f9dd4d9"
+        }
       },
       "order": "0x0400000000000000000001e60fc8821cc74daeafc1",
       "cofactor": "0x2",
       "generator": {
-        "x": "0x07af69989546103d79329fcc3d74880f33bbe803cb",
-        "y": "0x01ec23211b5966adea1d3f87f7ea5848aef0b7ca9f"
+        "x": {
+          "value": "0x07af69989546103d79329fcc3d74880f33bbe803cb"
+        },
+        "y": {
+          "value": "0x01ec23211b5966adea1d3f87f7ea5848aef0b7ca9f"
+        }
       },
       "aliases": [
         "x962/c2pnb163v1"
@@ -134,15 +214,23 @@
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x09487239995a5ee76b55f9c2f098",
-        "y": "0xa89ce5af8724c0a23e0e0ff77500"
+        "x": {
+          "value": "0x09487239995a5ee76b55f9c2f098"
+        },
+        "y": {
+          "value": "0xa89ce5af8724c0a23e0e0ff77500"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls6",
       "oid": "2.23.43.1.4.6",
       "order": "0xdb7c2abf62e35e7628dfac6561c5",
       "params": {
-        "a": "0xdb7c2abf62e35e668076bead2088",
-        "b": "0x659ef8ba043916eede8911702b22"
+        "a": {
+          "value": "0xdb7c2abf62e35e668076bead2088"
+        },
+        "b": {
+          "value": "0x659ef8ba043916eede8911702b22"
+        }
       },
       "aliases": [
         "secg/secp112r1"
@@ -159,15 +247,23 @@
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x4a96b5688ef573284664698968c38bb913cbfc82",
-        "y": "0x23a628553168947d59dcc912042351377ac5fb32"
+        "x": {
+          "value": "0x4a96b5688ef573284664698968c38bb913cbfc82"
+        },
+        "y": {
+          "value": "0x23a628553168947d59dcc912042351377ac5fb32"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls7",
       "oid": "2.23.43.1.4.7",
       "order": "0x0100000000000000000001f4c8f927aed3ca752257",
       "params": {
-        "a": "0xffffffffffffffffffffffffffffffff7ffffffc",
-        "b": "0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45"
+        "a": {
+          "value": "0xffffffffffffffffffffffffffffffff7ffffffc"
+        },
+        "b": {
+          "value": "0x1c97befc54bd7a8b65acf89f81d4d4adc565fa45"
+        }
       },
       "aliases": [
         "secg/secp160r1",
@@ -185,15 +281,23 @@
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x1",
-        "y": "0x2"
+        "x": {
+          "value": "0x1"
+        },
+        "y": {
+          "value": "0x2"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls8",
       "oid": "2.23.43.1.4.8",
       "order": "0x0100000000000001ecea551ad837e9",
       "params": {
-        "a": "0x0",
-        "b": "0x3"
+        "a": {
+          "value": "0x0"
+        },
+        "b": {
+          "value": "0x3"
+        }
       }
     },
     {
@@ -207,15 +311,23 @@
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x1",
-        "y": "0x2"
+        "x": {
+          "value": "0x1"
+        },
+        "y": {
+          "value": "0x2"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls9",
       "oid": "2.23.43.1.4.9",
       "order": "0x0100000000000000000001cdc98ae0e2de574abf33",
       "params": {
-        "a": "0x0",
-        "b": "0x3"
+        "a": {
+          "value": "0x0"
+        },
+        "b": {
+          "value": "0x3"
+        }
       }
     },
     {
@@ -225,24 +337,41 @@
       "field": {
         "type": "Binary",
         "poly": [
-          {"power": 233, "coeff": "0x01"},
-          {"power": 74, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 233,
+            "coeff": "0x01"
+          },
+          {
+            "power": 74,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ],
         "bits": 233,
         "degree": 233
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x017232ba853a7e731af129f22ff4149563a419c26bf50a4c9d6eefad6126",
-        "y": "0x01db537dece819b7f70f555a67c427a8cd9bf18aeb9b56e0c11056fae6a3"
+        "x": {
+          "value": "0x017232ba853a7e731af129f22ff4149563a419c26bf50a4c9d6eefad6126"
+        },
+        "y": {
+          "value": "0x01db537dece819b7f70f555a67c427a8cd9bf18aeb9b56e0c11056fae6a3"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls10",
       "oid": "2.23.43.1.4.10",
       "order": "0x8000000000000000000000000000069d5bb915bcd46efb1ad5f173abdf",
       "params": {
-        "a": "0x0",
-        "b": "0x1"
+        "a": {
+          "value": "0x0"
+        },
+        "b": {
+          "value": "0x1"
+        }
       },
       "aliases": [
         "secg/sect233k1",
@@ -257,24 +386,41 @@
       "field": {
         "type": "Binary",
         "poly": [
-          {"power": 233, "coeff": "0x01"},
-          {"power": 74, "coeff": "0x01"},
-          {"power": 0, "coeff": "0x01"}
+          {
+            "power": 233,
+            "coeff": "0x01"
+          },
+          {
+            "power": 74,
+            "coeff": "0x01"
+          },
+          {
+            "power": 0,
+            "coeff": "0x01"
+          }
         ],
         "bits": 233,
         "degree": 233
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0x00fac9dfcbac8313bb2139f1bb755fef65bc391f8b36f8f8eb7371fd558b",
-        "y": "0x01006a08a41903350678e58528bebf8a0beff867a7ca36716f7e01f81052"
+        "x": {
+          "value": "0x00fac9dfcbac8313bb2139f1bb755fef65bc391f8b36f8f8eb7371fd558b"
+        },
+        "y": {
+          "value": "0x01006a08a41903350678e58528bebf8a0beff867a7ca36716f7e01f81052"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls11",
       "oid": "2.23.43.1.4.11",
       "order": "0x01000000000000000000000000000013e974e72f8a6922031d2603cfe0d7",
       "params": {
-        "a": "0x1",
-        "b": "0x0066647ede6c332c7f8c0923bb58213b333b20e9ce4281fe115f7d8f90ad"
+        "a": {
+          "value": "0x1"
+        },
+        "b": {
+          "value": "0x0066647ede6c332c7f8c0923bb58213b333b20e9ce4281fe115f7d8f90ad"
+        }
       },
       "aliases": [
         "secg/sect233r1",
@@ -293,15 +439,23 @@
       },
       "form": "Weierstrass",
       "generator": {
-        "x": "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
-        "y": "0xbd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34"
+        "x": {
+          "value": "0xb70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21"
+        },
+        "y": {
+          "value": "0xbd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34"
+        }
       },
       "name": "wap-wsg-idm-ecid-wtls12",
       "oid": "2.23.43.1.4.12",
       "order": "0xffffffffffffffffffffffffffff16a2e0b8f03e13dd29455c5c2a3d",
       "params": {
-        "a": "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe",
-        "b": "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4"
+        "a": {
+          "value": "0xfffffffffffffffffffffffffffffffefffffffffffffffffffffffe"
+        },
+        "b": {
+          "value": "0xb4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4"
+        }
       },
       "aliases": [
         "secg/secp224r1",