Added POWER8 implementation for AES/CTR+CBC-MAC (for CCM and EAX modes).

[BearSSL] / tools / names.c

diff --git a/tools/names.c b/tools/names.c
index 3ea7f1b..6d6fec0 100644 (file)
--- a/tools/names.c
+++ b/tools/names.c
@@ -322,68 +322,99 @@ const cipher_suite cipher_suites[] = {
 static const struct {
        int id;
        const char *name;
 static const struct {
        int id;
        const char *name;

+       const char *sid[4];

 } curves[] = {
        { BR_EC_sect163k1,
 } curves[] = {
        { BR_EC_sect163k1,

-         "sect163k1" },
+         "sect163k1",
+         { "sect163k1", "K-163", NULL, NULL } },

        { BR_EC_sect163r1,
        { BR_EC_sect163r1,

-         "sect163r1" },
+         "sect163r1",
+         { "sect163r1", NULL, NULL, NULL } },

        { BR_EC_sect163r2,
        { BR_EC_sect163r2,

-         "sect163r2" },
+         "sect163r2",
+         { "sect163r2", "B-163", NULL, NULL } },

        { BR_EC_sect193r1,
        { BR_EC_sect193r1,

-         "sect193r1" },
+         "sect193r1",
+         { "sect193r1", NULL, NULL, NULL } },

        { BR_EC_sect193r2,
        { BR_EC_sect193r2,

-         "sect193r2" },
+         "sect193r2",
+         { "sect193r2", NULL, NULL, NULL } },

        { BR_EC_sect233k1,
        { BR_EC_sect233k1,

-         "sect233k1" },
+         "sect233k1",
+         { "sect233k1", "K-233", NULL, NULL } },

        { BR_EC_sect233r1,
        { BR_EC_sect233r1,

-         "sect233r1" },
+         "sect233r1",
+         { "sect233r1", "B-233", NULL, NULL } },

        { BR_EC_sect239k1,
        { BR_EC_sect239k1,

-         "sect239k1" },
+         "sect239k1",
+         { "sect239k1", NULL, NULL, NULL } },

        { BR_EC_sect283k1,
        { BR_EC_sect283k1,

-         "sect283k1" },
+         "sect283k1",
+         { "sect283k1", "K-283", NULL, NULL } },

        { BR_EC_sect283r1,
        { BR_EC_sect283r1,

-         "sect283r1" },
+         "sect283r1",
+         { "sect283r1", "B-283", NULL, NULL } },

        { BR_EC_sect409k1,
        { BR_EC_sect409k1,

-         "sect409k1" },
+         "sect409k1",
+         { "sect409k1", "K-409", NULL, NULL } },

        { BR_EC_sect409r1,
        { BR_EC_sect409r1,

-         "sect409r1" },
+         "sect409r1",
+         { "sect409r1", "B-409", NULL, NULL } },

        { BR_EC_sect571k1,
        { BR_EC_sect571k1,

-         "sect571k1" },
+         "sect571k1",
+         { "sect571k1", "K-571", NULL, NULL } },

        { BR_EC_sect571r1,
        { BR_EC_sect571r1,

-         "sect571r1" },
+         "sect571r1",
+         { "sect571r1", "B-571", NULL, NULL } },

        { BR_EC_secp160k1,
        { BR_EC_secp160k1,

-         "secp160k1" },
+         "secp160k1",
+         { "secp160k1", NULL, NULL, NULL } },

        { BR_EC_secp160r1,
        { BR_EC_secp160r1,

-         "secp160r1" },
+         "secp160r1",
+         { "secp160r1", NULL, NULL, NULL } },

        { BR_EC_secp160r2,
        { BR_EC_secp160r2,

-         "secp160r2" },
+         "secp160r2",
+         { "secp160r2", NULL, NULL, NULL } },

        { BR_EC_secp192k1,
        { BR_EC_secp192k1,

-         "secp192k1" },
+         "secp192k1",
+         { "secp192k1", NULL, NULL, NULL } },

        { BR_EC_secp192r1,
        { BR_EC_secp192r1,

-         "secp192r1" },
+         "secp192r1",
+         { "secp192r1", "P-192", NULL, NULL } },

        { BR_EC_secp224k1,
        { BR_EC_secp224k1,

-         "secp224k1" },
+         "secp224k1",
+         { "secp224k1", NULL, NULL, NULL } },

        { BR_EC_secp224r1,
        { BR_EC_secp224r1,

-         "secp224r1" },
+         "secp224r1",
+         { "secp224r1", "P-224", NULL, NULL } },

        { BR_EC_secp256k1,
        { BR_EC_secp256k1,

-         "secp256k1" },
+         "secp256k1",
+         { "secp256k1", NULL, NULL, NULL } },

        { BR_EC_secp256r1,
        { BR_EC_secp256r1,

-         "secp256r1 (P-256)" },
+         "secp256r1 (P-256)",
+         { "secp256r1", "P-256", "prime256v1", NULL } },

        { BR_EC_secp384r1,
        { BR_EC_secp384r1,

-         "secp384r1 (P-384)" },
+         "secp384r1 (P-384)",
+         { "secp384r1", "P-384", NULL, NULL } },

        { BR_EC_secp521r1,
        { BR_EC_secp521r1,

-         "secp521r1 (P-521)" },
+         "secp521r1 (P-521)",
+         { "secp521r1", "P-521", NULL, NULL } },

        { BR_EC_brainpoolP256r1,
        { BR_EC_brainpoolP256r1,

-         "brainpoolP256r1" },
+         "brainpoolP256r1",
+         { "brainpoolP256r1", NULL, NULL, NULL } },

        { BR_EC_brainpoolP384r1,
        { BR_EC_brainpoolP384r1,

-         "brainpoolP384r1" },
+         "brainpoolP384r1",
+         { "brainpoolP384r1", NULL, NULL, NULL } },

        { BR_EC_brainpoolP512r1,
        { BR_EC_brainpoolP512r1,

-         "brainpoolP512r1" },
+         "brainpoolP512r1",
+         { "brainpoolP512r1", NULL, NULL, NULL } },

        { BR_EC_curve25519,
        { BR_EC_curve25519,

-         "Curve25519" },
+         "Curve25519",
+         { "curve25519", "c25519", NULL, NULL } },

        { BR_EC_curve448,
        { BR_EC_curve448,

-         "Curve448" },
-       { 0, 0 }
+         "Curve448",
+         { "curve448", "c448", NULL, NULL } },
+       { 0, 0, { 0, 0, 0, 0 } }

 };
 
 static const struct {
 };
 
 static const struct {


@@ -464,6 +495,8 @@ static const struct {
                (const void *(*)(void))&br_aes_pwr8_cbcdec_get_vtable },
        { "aes_pwr8_ctr",         "pwr8",
                (const void *(*)(void))&br_aes_pwr8_ctr_get_vtable },
                (const void *(*)(void))&br_aes_pwr8_cbcdec_get_vtable },
        { "aes_pwr8_ctr",         "pwr8",
                (const void *(*)(void))&br_aes_pwr8_ctr_get_vtable },

+       { "aes_pwr8_ctrcbc",      "pwr8",
+               (const void *(*)(void))&br_aes_pwr8_ctrcbc_get_vtable },

        { "aes_x86ni_cbcenc",     "x86ni",
                (const void *(*)(void))&br_aes_x86ni_cbcenc_get_vtable },
        { "aes_x86ni_cbcdec",     "x86ni",
        { "aes_x86ni_cbcenc",     "x86ni",
                (const void *(*)(void))&br_aes_x86ni_cbcenc_get_vtable },
        { "aes_x86ni_cbcdec",     "x86ni",


@@ -627,6 +660,31 @@ list_names(void)
        }
 }
 
        }
 }
 

+/* see brssl.h */
+void
+list_curves(void)
+{
+       size_t u;
+       for (u = 0; curves[u].name; u ++) {
+               size_t v;
+
+               for (v = 0; curves[u].sid[v]; v ++) {
+                       if (v == 0) {
+                               printf("   ");
+                       } else if (v == 1) {
+                               printf(" (");
+                       } else {
+                               printf(", ");
+                       }
+                       printf("%s", curves[u].sid[v]);
+               }
+               if (v > 1) {
+                       printf(")");
+               }
+               printf("\n");
+       }
+}
+

 static int
 is_ign(int c)
 {
 static int
 is_ign(int c)
 {


@@ -956,6 +1014,22 @@ ec_curve_name(int curve)
        }
 }
 
        }
 }
 

+/* see brssl.h */
+int
+get_curve_by_name(const char *str)
+{
+       size_t u, v;
+
+       for (u = 0; curves[u].name; u ++) {
+               for (v = 0; curves[u].sid[v]; v ++) {
+                       if (eqstr(curves[u].sid[v], str)) {
+                               return curves[u].id;
+                       }
+               }
+       }
+       return -1;
+}
+

 /* see brssl.h */
 const char *
 hash_function_name(int id)
 /* see brssl.h */
 const char *
 hash_function_name(int id)