Move EDDSA to another branch.

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>

src/openpgp/cmd_import_data.c

@@ -177,15 +177,7 @@ int cmd_import_data() {
             mbedtls_ecp_keypair_free(&ecdsa);
             return SW_EXEC_ERROR();
         }
-#ifdef MBEDTLS_EDDSA_C
+        r = mbedtls_ecp_mul(&ecdsa.grp, &ecdsa.Q, &ecdsa.d, &ecdsa.grp.G, random_gen, NULL);
-        if (ecdsa.grp.id == MBEDTLS_ECP_DP_ED25519) {
-            r = mbedtls_ecp_point_edwards(&ecdsa.grp, &ecdsa.Q, &ecdsa.d, random_gen, NULL);
-        }
-        else
-#endif
-        {
-            r = mbedtls_ecp_mul(&ecdsa.grp, &ecdsa.Q, &ecdsa.d, &ecdsa.grp.G, random_gen, NULL);
-        }
         if (r != 0) {
             mbedtls_ecp_keypair_free(&ecdsa);
             return SW_EXEC_ERROR();

src/openpgp/do.c

@@ -256,20 +256,6 @@ const uint8_t algorithm_attr_cv25519[] = {
     0x2b, 0x06, 0x01, 0x04, 0x01, 0x97, 0x55, 0x01, 0x05, 0x01
 };
 
-#ifdef MBEDTLS_EDDSA_C
-const uint8_t algorithm_attr_ed25519[] = {
-    10,
-    ALGO_EDDSA,
-    0x2b, 0x06, 0x01, 0x04, 0x01, 0xda, 0x47, 0x0f, 0x01
-};
-
-const uint8_t algorithm_attr_ed448[] = {
-    4,
-    ALGO_EDDSA,
-    0x2b, 0x65, 0x71
-};
-#endif
-
 int parse_algo(const uint8_t *algo, uint16_t tag) {
     res_APDU[res_APDU_size++] = tag & 0xff;
     memcpy(res_APDU + res_APDU_size, algo, algo[0] + 1);
@@ -295,10 +281,6 @@ int parse_algoinfo(const file_t *f, int mode) {
         datalen += parse_algo(algorithm_attr_bp256r1, EF_ALGO_SIG);
         datalen += parse_algo(algorithm_attr_bp384r1, EF_ALGO_SIG);
         datalen += parse_algo(algorithm_attr_bp512r1, EF_ALGO_SIG);
-#ifdef MBEDTLS_EDDSA_C
-        datalen += parse_algo(algorithm_attr_ed25519, EF_ALGO_SIG);
-        datalen += parse_algo(algorithm_attr_ed448, EF_ALGO_SIG);
-#endif
 
         datalen += parse_algo(algorithm_attr_rsa1k, EF_ALGO_DEC);
         datalen += parse_algo(algorithm_attr_rsa2k, EF_ALGO_DEC);
@@ -325,10 +307,7 @@ int parse_algoinfo(const file_t *f, int mode) {
         datalen += parse_algo(algorithm_attr_bp256r1, EF_ALGO_AUT);
         datalen += parse_algo(algorithm_attr_bp384r1, EF_ALGO_AUT);
         datalen += parse_algo(algorithm_attr_bp512r1, EF_ALGO_AUT);
-#ifdef MBEDTLS_EDDSA_C
+
-        datalen += parse_algo(algorithm_attr_ed25519, EF_ALGO_AUT);
-        datalen += parse_algo(algorithm_attr_ed448, EF_ALGO_AUT);
-#endif
         uint16_t lpdif = res_APDU + res_APDU_size - lp - 2;
         *lp++ = lpdif >> 8;
         *lp++ = lpdif & 0xff;

src/openpgp/do.h

@@ -26,7 +26,3 @@ extern const uint8_t algorithm_attr_cv25519[];
 extern const uint8_t algorithm_attr_x448[];
 extern const uint8_t algorithm_attr_rsa2k[];
 extern const uint8_t algorithm_attr_rsa4096[];
-#ifdef MBEDTLS_EDDSA_C
-extern const uint8_t algorithm_attr_ed25519[];
-extern const uint8_t algorithm_attr_ed448[];
-#endif

src/openpgp/openpgp.c

@@ -30,9 +30,6 @@
 #include "ccid/ccid.h"
 #include "otp.h"
 #include "do.h"
-#ifdef MBEDTLS_EDDSA_C
-#include "mbedtls/eddsa.h"
-#endif
 
 bool has_pw1 = false;
 bool has_pw2 = false;
@@ -573,15 +570,7 @@ int load_private_key_ecdsa(mbedtls_ecp_keypair *ctx, file_t *fkey, bool use_dek)
         return PICOKEY_EXEC_ERROR;
     }
     mbedtls_platform_zeroize(kdata, sizeof(kdata));
-#ifdef MBEDTLS_EDDSA_C
+    r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
-    if (ctx->grp.id == MBEDTLS_ECP_DP_ED25519 || ctx->grp.id == MBEDTLS_ECP_DP_ED448) {
-        r = mbedtls_ecp_point_edwards(&ctx->grp, &ctx->Q, &ctx->d, random_gen, NULL);
-    }
-    else
-#endif
-    {
-        r = mbedtls_ecp_mul(&ctx->grp, &ctx->Q, &ctx->d, &ctx->grp.G, random_gen, NULL);
-    }
     if (r != 0) {
         mbedtls_ecdsa_free(ctx);
         return PICOKEY_EXEC_ERROR;
@@ -626,14 +615,6 @@ mbedtls_ecp_group_id get_ec_group_id_from_attr(const uint8_t *algo, size_t algo_
     else if (memcmp(algorithm_attr_x448 + 2, algo, algo_len) == 0) {
         return MBEDTLS_ECP_DP_CURVE448;
     }
-#ifdef MBEDTLS_EDDSA_C
-    else if (memcmp(algorithm_attr_ed25519 + 2, algo, algo_len) == 0) {
-        return MBEDTLS_ECP_DP_ED25519;
-    }
-    else if (memcmp(algorithm_attr_ed448 + 2, algo, algo_len) == 0) {
-        return MBEDTLS_ECP_DP_ED448;
-    }
-#endif
     return MBEDTLS_ECP_DP_NONE;
 }
 
@@ -752,26 +733,18 @@ int ecdsa_sign(mbedtls_ecp_keypair *ctx,
                size_t *out_len) {
 
     int r = 0;
-#ifdef MBEDTLS_EDDSA_C
+    mbedtls_mpi ri, si;
-    if (ctx->grp.id == MBEDTLS_ECP_DP_ED25519 || ctx->grp.id == MBEDTLS_ECP_DP_ED448) {
+    mbedtls_mpi_init(&ri);
-           r = mbedtls_eddsa_write_signature(ctx, data, data_len, out, 114, out_len, MBEDTLS_EDDSA_PURE, NULL, 0, random_gen, NULL);
+    mbedtls_mpi_init(&si);
-    }
+    r = mbedtls_ecdsa_sign(&ctx->grp, &ri, &si, &ctx->d, data, data_len, random_gen, NULL);
-    else
+    if (r == 0) {
-#endif
+        size_t plen = (ctx->grp.nbits + 7) / 8;
-    {
+        mbedtls_mpi_write_binary(&ri, out, plen);
-        mbedtls_mpi ri, si;
+        mbedtls_mpi_write_binary(&si, out + plen, plen);
-        mbedtls_mpi_init(&ri);
+        *out_len = 2 * plen;
-        mbedtls_mpi_init(&si);
-        r = mbedtls_ecdsa_sign(&ctx->grp, &ri, &si, &ctx->d, data, data_len, random_gen, NULL);
-        if (r == 0) {
-            size_t plen = (ctx->grp.nbits + 7) / 8;
-            mbedtls_mpi_write_binary(&ri, out, plen);
-            mbedtls_mpi_write_binary(&si, out + plen, plen);
-            *out_len = 2 * plen;
-        }
-        mbedtls_mpi_free(&ri);
-        mbedtls_mpi_free(&si);
     }
+    mbedtls_mpi_free(&ri);
+    mbedtls_mpi_free(&si);
     return r;
 }