Fix missing generators.

3 files changed, 38 insertions, 118 deletions

diff --git a/nums/curves.json b/nums/curves.json
index 6cf39fc..623ba3b 100644
--- a/nums/curves.json
+++ b/nums/curves.json
@@ -179,8 +179,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-256-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xffa7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -200,8 +200,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-254-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3f80ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -221,8 +221,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-255-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd03",
@@ -242,8 +242,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-384-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xb0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -263,8 +263,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-382-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3ffaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -284,8 +284,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-383-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5b",
@@ -305,8 +305,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-512-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xfe14ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -326,8 +326,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-510-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3eddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -347,8 +347,8 @@
     {
       "form": "TwistedEdwards",
       "name": "ed-511-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1f",
@@ -368,8 +368,8 @@
     {
       "form": "Weierstrass",
       "name": "w-256-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xffa7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -389,8 +389,8 @@
     {
       "form": "Weierstrass",
       "name": "w-254-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3f80ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -410,8 +410,8 @@
     {
       "form": "Weierstrass",
       "name": "w-255-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd03",
@@ -431,8 +431,8 @@
     {
       "form": "Weierstrass",
       "name": "w-384-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xb0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -452,8 +452,8 @@
     {
       "form": "Weierstrass",
       "name": "w-382-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3ffaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -473,8 +473,8 @@
     {
       "form": "Weierstrass",
       "name": "w-383-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe5b",
@@ -494,8 +494,8 @@
     {
       "form": "Weierstrass",
       "name": "w-512-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0xfe14ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -515,8 +515,8 @@
     {
       "form": "Weierstrass",
       "name": "w-510-mont",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x3eddffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
@@ -536,8 +536,8 @@
     {
       "form": "Weierstrass",
       "name": "w-511-mers",
-      "category": "nums-original",
-      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf",
+      "category": "nums",
+      "desc": "Curve from https://eprint.iacr.org/2014/130.pdf. No generator present.",
       "field": {
         "type": "Prime",
         "p": "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe1f",
diff --git a/oakley/curves.json b/oakley/curves.json
index ea35b10..e8474d0 100644
--- a/oakley/curves.json
+++ b/oakley/curves.json
@@ -5,7 +5,7 @@
     {
       "name": "Oakley Group 3",
       "category": "oakley",
-      "desc": "Defined in IETF in RFC2409",
+      "desc": "Defined in IETF in RFC2409, no generator present.",
       "field": {
         "type": "Binary",
         "poly": [
@@ -35,21 +35,13 @@
           "raw": "0x07338f"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0x0800000000000000000057db5698537193aef944",
       "cofactor": "0x01"
     },
     {
       "name": "Oakley Group 4",
       "category": "oakley",
-      "desc": "Defined in IETF in RFC2409",
+      "desc": "Defined in IETF in RFC2409, no generator present.",
       "field": {
         "type": "Binary",
         "poly": [
@@ -79,14 +71,6 @@
           "raw": "0x1ee9"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0x01ffffffffffffffffffffffdbf2f889b73e484175f94ebc",
       "cofactor": "0x01"
     },
diff --git a/other/curves.json b/other/curves.json
index 5600f82..de00e42 100644
--- a/other/curves.json
+++ b/other/curves.json
@@ -856,14 +856,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c841"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c5d89f4f2dd72349ee61f7",
       "cofactor": "0x01"
     },
@@ -885,14 +877,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d36a6"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628c5dca19490dd3e6fd7979a7a3",
       "cofactor": "0x01"
     },
@@ -914,14 +898,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13a03"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dd2439be5b2b827a9ffbea7240e5cd",
       "cofactor": "0x01"
     },
@@ -943,14 +919,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13641146434e1"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dc1cd0fbec42e940b37a88d9caeca198a64437",
       "cofactor": "0x01"
     },
@@ -972,14 +940,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13641146433fbcc939f36"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dc1cd12903ba214366757b7a5240b2a637e2065a850855",
       "cofactor": "0x01"
     },
@@ -1001,14 +961,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13641146433fbcc939dce249b40a4"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dc1cd129024e09489bd44fda941042cccc7286009777663bb29671",
       "cofactor": "0x01"
     },
@@ -1030,14 +982,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13641146433fbcc939dce249b3ef97d2fe363630c7791"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc73b7669162524b60c73ee73e6dfe7059f510370fe7870d8599",
       "cofactor": "0x01"
     },
@@ -1059,14 +1003,6 @@
           "raw": "0xadf85458a2bb4a9aafdc5620273d3cf1d8b9c583ce2d3695a9e13641146433fbcc939dce249b3ef97d2fe363630c75d8f681b202aec4617ad3df1ed5d5fd6a8d"
         }
       },
-      "generator": {
-        "x": {
-          "raw": ""
-        },
-        "y": {
-          "raw": ""
-        }
-      },
       "order": "0xc90fdaa22168c234c4c6628b80dc1cd129024e088a67cc74020bbea63b139b235a2359c4afbc9eb7987f1c9ab37e42599188c4b7dc6269b830d80897f57a5f71",
       "cofactor": "0x01"
     },