ecc_get_set_by_name

Author: karel-m

src/headers/tomcrypt_pk.h

@@ -339,7 +339,7 @@ int  ecc_test(void);
 void ecc_sizes(int *low, int *high);
 int  ecc_get_size(ecc_key *key);
 
-const ltc_ecc_set_type *ecc_get_set(const char *curve_name);
+int  ecc_get_set_by_name(const char* name, const ltc_ecc_set_type** dp);
 int  ecc_set_dp(const ltc_ecc_set_type *set, ecc_key *key);
 int  ecc_generate_key(prng_state *prng, int wprng, ecc_key *key);
 int  ecc_set_key(const unsigned char *in, unsigned long inlen, int type, ecc_key *key);

src/pk/ecc/ecc_set_dp.c

@@ -51,32 +51,44 @@ int ecc_set_dp(const ltc_ecc_set_type *set, ecc_key *key)
 
 int ecc_set_dp_size(int size, ecc_key *key)
 {
+   const ltc_ecc_set_type *dp = NULL;
+   int err;
+
    /* for compatibility with libtomcrypt-1.17 the sizes below must match the specific curves */
    if (size <= 14) {
-      return ecc_set_dp(ecc_get_set("SECP112R1"), key);
+      if ((err = ecc_get_set_by_name("SECP112R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 16) {
-      return ecc_set_dp(ecc_get_set("SECP128R1"), key);
+      if ((err = ecc_get_set_by_name("SECP128R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 20) {
-      return ecc_set_dp(ecc_get_set("SECP160R1"), key);
+      if ((err = ecc_get_set_by_name("SECP160R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 24) {
-      return ecc_set_dp(ecc_get_set("SECP192R1"), key);
+      if ((err = ecc_get_set_by_name("SECP192R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 28) {
-      return ecc_set_dp(ecc_get_set("SECP224R1"), key);
+      if ((err = ecc_get_set_by_name("SECP224R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 32) {
-      return ecc_set_dp(ecc_get_set("SECP256R1"), key);
+      if ((err = ecc_get_set_by_name("SECP256R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 48) {
-      return ecc_set_dp(ecc_get_set("SECP384R1"), key);
+      if ((err = ecc_get_set_by_name("SECP384R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
    else if (size <= 66) {
-      return ecc_set_dp(ecc_get_set("SECP521R1"), key);
+      if ((err = ecc_get_set_by_name("SECP521R1", &dp)) != CRYPT_OK) return err;
+      return ecc_set_dp(dp, key);
    }
-   return CRYPT_INVALID_KEYSIZE;
+
+   return CRYPT_INVALID_ARG;
 }
 
 #endif