Separate out AES KW / KWP

Also add some missing standards to AES

Signed-off-by: Joachim Vandersmissen <git@jvdsn.com>

Author: jvdsn

schema/cryptography-defs.json

@@ -368,9 +368,13 @@
           "url": "https://doi.org/10.6028/NIST.FIPS.197-upd1"
         },
         {
-          "name": "SP800-38{A-G}",
+          "name": "SP800-38A",
           "url": "https://doi.org/10.6028/NIST.SP.800-38A"
         },
+        {
+          "name": "SP800-38E",
+          "url": "https://doi.org/10.6028/NIST.SP.800-38E"
+        },
         {
           "name": "RFC5116",
           "url": "https://doi.org/10.17487/RFC5116"
@@ -383,6 +387,10 @@
         },
         {
           "standard": [
+            {
+              "name": "SP800-38C",
+              "url": "https://doi.org/10.6028/NIST.SP.800-38C"
+            },
             {
               "name": "SP800-38D",
               "url": "https://doi.org/10.6028/NIST.SP.800-38D"
@@ -425,17 +433,37 @@
           "pattern": "AES[-(128|192|256)]-SIV",
           "primitive": "ae"
         },
+        {
+          "standard": [
+            {
+              "name": "SP800-38F",
+              "url": "https://doi.org/10.6028/NIST.SP.800-38F"
+            }
+          ],
+          "pattern": "AES[-(128|192|256)][-(KW|KWP)]",
+          "primitive": "key-wrap"
+        },
         {
           "standard": [
             {
               "name": "RFC5649",
               "url": "https://doi.org/10.17487/RFC5649"
             }
           ],
-          "pattern": "AES[-(128|192|256)]-Wrap[-(PAD|KWP|PKCS7)]",
+          "pattern": "AES[-(128|192|256)]-Wrap[-PKCS7]",
           "primitive": "key-wrap"
         },
         {
+          "standard": [
+            {
+              "name": "SP800-38B",
+              "url": "https://doi.org/10.6028/NIST.SP.800-38B"
+            },
+            {
+              "name": "SP800-38D",
+              "url": "https://doi.org/10.6028/NIST.SP.800-38D"
+            }
+          ],
           "pattern": "AES[-(128|192|256)][-(GMAC|CMAC)]",
           "primitive": "mac"
         },