ACR: Remove unimplemented features

Remove elliptic curves, ECDH and DH.

Change-Id: Ib61efb39e07cfe81a27f265a76103b7347397e8c

diff --git a/api/yaca/yaca_types.h b/api/yaca/yaca_types.h
index 810b877..933e584 100644 (file)
--- a/api/yaca/yaca_types.h
+++ b/api/yaca/yaca_types.h
@@ -89,12 +89,6 @@ typedef enum {
 
        YACA_KEY_TYPE_DSA_PUB,     /**< Digital Signature Algorithm public key */
        YACA_KEY_TYPE_DSA_PRIV,    /**< Digital Signature Algorithm private key */
-
-       YACA_KEY_TYPE_DH_PUB,      /**< Diffie-Hellman public key */
-       YACA_KEY_TYPE_DH_PRIV,     /**< Diffie-Hellman private key */
-
-       YACA_KEY_TYPE_EC_PUB,      /**< Elliptic Curve public key (for DSA and DH) */
-       YACA_KEY_TYPE_EC_PRIV,     /**< Elliptic Curve private key (for DSA and DH) */
 } yaca_key_type_e;
 
 /**
@@ -109,9 +103,6 @@ typedef enum {
        YACA_KEY_IV_64BIT = 64,           /**< 64-bit IV */
        YACA_KEY_IV_128BIT = 128,         /**< 128-bit IV */
        YACA_KEY_IV_256BIT = 256,         /**< 256-bit IV */
-       YACA_KEY_CURVE_P192 = 192,        /**< ECC: P192 curve */
-       YACA_KEY_CURVE_P256 = 256,        /**< ECC: P-256 curve */
-       YACA_KEY_CURVE_P384 = 384,        /**< ECC: SECP-384 curve */
        YACA_KEY_UNSAFE_8BIT = 8,
        YACA_KEY_UNSAFE_40BIT = 40,
        YACA_KEY_UNSAFE_64BIT = 64,

diff --git a/examples/key_exchange.c b/examples/key_exchange.c
index 4432859..6a51e34 100644 (file)
--- a/examples/key_exchange.c
+++ b/examples/key_exchange.c
@@ -32,6 +32,8 @@
 
 void key_exchange_dh(void)
 {
+// TODO DH is not supported yet
+#if 0
        int ret;
 
        yaca_key_h private_key = YACA_KEY_NULL;
@@ -88,10 +90,13 @@ clean:
        if (fp != NULL)
                fclose(fp);
        yaca_free(buffer);
+#endif
 }
 
 void key_exchange_ecdh(void)
 {
+// TODO ECDH is not supported yet
+#if 0
        int ret;
 
        yaca_key_h private_key = YACA_KEY_NULL;
@@ -147,6 +152,7 @@ clean:
        if (fp != NULL)
                fclose(fp);
        yaca_free(buffer);
+#endif
 }
 
 int main()

diff --git a/src/internal.h b/src/internal.h
index 1b5901b..2b437cf 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -78,10 +78,6 @@ struct yaca_key_simple_s {
  * - YACA_KEY_TYPE_RSA_PRIV
  * - YACA_KEY_TYPE_DSA_PUB
  * - YACA_KEY_TYPE_DSA_PRIV
- * - YACA_KEY_TYPE_DH_PUB
- * - YACA_KEY_TYPE_DH_PRIV
- * - YACA_KEY_TYPE_EC_PUB
- * - YACA_KEY_TYPE_EC_PRIV
  *
  */
 struct yaca_key_evp_s {

diff --git a/src/key.c b/src/key.c
index 3f3e037..be62b4a 100644 (file)
--- a/src/key.c
+++ b/src/key.c
@@ -365,9 +365,9 @@ int import_evp(yaca_key_h *key,
                type = private ? YACA_KEY_TYPE_DSA_PRIV : YACA_KEY_TYPE_DSA_PUB;
                break;
 
-       case EVP_PKEY_EC:
-               type = private ? YACA_KEY_TYPE_EC_PRIV : YACA_KEY_TYPE_EC_PUB;
-               break;
+//     case EVP_PKEY_EC:
+//             type = private ? YACA_KEY_TYPE_EC_PRIV : YACA_KEY_TYPE_EC_PUB;
+//             break;
 
        default:
                ret = YACA_ERROR_INVALID_ARGUMENT;
@@ -523,11 +523,11 @@ int export_evp_default_bio(struct yaca_key_evp_s *evp_key,
                        ret = PEM_write_bio_PUBKEY(mem, evp_key->evp);
                        break;
 
-               case YACA_KEY_TYPE_DH_PRIV:
-               case YACA_KEY_TYPE_DH_PUB:
-               case YACA_KEY_TYPE_EC_PRIV:
-               case YACA_KEY_TYPE_EC_PUB:
-                       //TODO NOT_IMPLEMENTED
+//             case YACA_KEY_TYPE_DH_PRIV:
+//             case YACA_KEY_TYPE_DH_PUB:
+//             case YACA_KEY_TYPE_EC_PRIV:
+//             case YACA_KEY_TYPE_EC_PUB:
+//                     TODO NOT_IMPLEMENTED
                default:
                        return YACA_ERROR_INVALID_ARGUMENT;
                }
@@ -550,11 +550,11 @@ int export_evp_default_bio(struct yaca_key_evp_s *evp_key,
                        ret = i2d_PUBKEY_bio(mem, evp_key->evp);
                        break;
 
-               case YACA_KEY_TYPE_DH_PRIV:
-               case YACA_KEY_TYPE_DH_PUB:
-               case YACA_KEY_TYPE_EC_PRIV:
-               case YACA_KEY_TYPE_EC_PUB:
-                       //TODO NOT_IMPLEMENTED
+//             case YACA_KEY_TYPE_DH_PRIV:
+//             case YACA_KEY_TYPE_DH_PUB:
+//             case YACA_KEY_TYPE_EC_PRIV:
+//             case YACA_KEY_TYPE_EC_PUB:
+//                     TODO NOT_IMPLEMENTED
                default:
                        return YACA_ERROR_INVALID_ARGUMENT;
                }
@@ -599,9 +599,9 @@ int export_evp_pkcs8_bio(struct yaca_key_evp_s *evp_key,
                        ret = PEM_write_bio_PKCS8PrivateKey_nid(mem, evp_key->evp, nid,
                                                                NULL, 0, NULL, (void*)password);
                        break;
-               case YACA_KEY_TYPE_DH_PRIV:
-               case YACA_KEY_TYPE_EC_PRIV:
-                       //TODO NOT_IMPLEMENTED ?
+//             case YACA_KEY_TYPE_DH_PRIV:
+//             case YACA_KEY_TYPE_EC_PRIV:
+//                     TODO NOT_IMPLEMENTED
                default:
                        /* Public keys are not supported by PKCS8 */
                        return YACA_ERROR_INVALID_ARGUMENT;
@@ -618,9 +618,9 @@ int export_evp_pkcs8_bio(struct yaca_key_evp_s *evp_key,
                                                          NULL, 0, NULL, (void*)password);
                        break;
 
-               case YACA_KEY_TYPE_DH_PRIV:
-               case YACA_KEY_TYPE_EC_PRIV:
-                       //TODO NOT_IMPLEMENTED ?
+//             case YACA_KEY_TYPE_DH_PRIV:
+//             case YACA_KEY_TYPE_EC_PRIV:
+//                     TODO NOT_IMPLEMENTED
                default:
                        /* Public keys are not supported by PKCS8 */
                        return YACA_ERROR_INVALID_ARGUMENT;
@@ -1038,12 +1038,11 @@ API int yaca_key_import(yaca_key_type_e key_type,
        case YACA_KEY_TYPE_DSA_PUB:
        case YACA_KEY_TYPE_DSA_PRIV:
                return import_evp(key, key_type, password, data, data_len);
-       case YACA_KEY_TYPE_DH_PUB:
-       case YACA_KEY_TYPE_DH_PRIV:
-       case YACA_KEY_TYPE_EC_PUB:
-       case YACA_KEY_TYPE_EC_PRIV:
-               //TODO NOT_IMPLEMENTED
-               return YACA_ERROR_INVALID_ARGUMENT;
+//     case YACA_KEY_TYPE_DH_PUB:
+//     case YACA_KEY_TYPE_DH_PRIV:
+//     case YACA_KEY_TYPE_EC_PUB:
+//     case YACA_KEY_TYPE_EC_PRIV:
+//             TODO NOT_IMPLEMENTED
        default:
                return YACA_ERROR_INVALID_ARGUMENT;
        }
@@ -1139,10 +1138,9 @@ API int yaca_key_gen(yaca_key_type_e key_type,
                *key = (yaca_key_h)nk_evp;
                return YACA_ERROR_NONE;
 
-       case YACA_KEY_TYPE_DH_PRIV:
-       case YACA_KEY_TYPE_EC_PRIV:
-               //TODO NOT_IMPLEMENTED
-               return YACA_ERROR_INVALID_ARGUMENT;
+//     case YACA_KEY_TYPE_DH_PRIV:
+//     case YACA_KEY_TYPE_EC_PRIV:
+//             TODO NOT_IMPLEMENTED
        default:
                return YACA_ERROR_INVALID_ARGUMENT;
        }
@@ -1197,9 +1195,9 @@ API int yaca_key_extract_public(const yaca_key_h prv_key, yaca_key_h *pub_key)
        case YACA_KEY_TYPE_DSA_PRIV:
                (*pub_key)->type = YACA_KEY_TYPE_DSA_PUB;
                break;
-       case YACA_KEY_TYPE_EC_PRIV:
-               (*pub_key)->type = YACA_KEY_TYPE_EC_PUB;
-               break;
+//     case YACA_KEY_TYPE_EC_PRIV:
+//             (*pub_key)->type = YACA_KEY_TYPE_EC_PUB;
+//             break;
        default:
                ret = YACA_ERROR_INVALID_ARGUMENT;
                goto free_pkey;

diff --git a/src/sign.c b/src/sign.c
index 938cf11..e7dedc4 100644 (file)
--- a/src/sign.c
+++ b/src/sign.c
@@ -249,9 +249,8 @@ API int yaca_sign_init(yaca_ctx_h *ctx,
        case YACA_KEY_TYPE_RSA_PRIV:
        case YACA_KEY_TYPE_DSA_PRIV:
                break;
-       case YACA_KEY_TYPE_EC_PRIV:
-               //TODO NOT_IMPLEMENTED
-               return YACA_ERROR_INVALID_ARGUMENT;
+//     case YACA_KEY_TYPE_EC_PRIV:
+//             TODO NOT_IMPLEMENTED
        default:
                return YACA_ERROR_INVALID_ARGUMENT;
        }
@@ -500,9 +499,8 @@ API int yaca_verify_init(yaca_ctx_h *ctx,
        case YACA_KEY_TYPE_RSA_PUB:
        case YACA_KEY_TYPE_DSA_PUB:
                break;
-       case YACA_KEY_TYPE_EC_PUB:
-               //TODO NOT_IMPLEMENTED
-               return YACA_ERROR_INVALID_ARGUMENT;
+//     case YACA_KEY_TYPE_EC_PUB:
+//             TODO NOT_IMPLEMENTED
        default:
                return YACA_ERROR_INVALID_ARGUMENT;
        }