'EC' vs. 'ECDSA'

[openssl.git] / crypto / evp / p_lib.c

diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c
index 215b94292aae4428aeb3cda5a97c7aaa59aecf1a..c7a3dee108141fe81d3a9616da053f5b097e1eac 100644 (file)
--- a/crypto/evp/p_lib.c
+++ b/crypto/evp/p_lib.c
@@ -58,6 +58,8 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
+#include <openssl/bn.h>
+#include <openssl/err.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/asn1_mac.h>
@@ -67,14 +69,37 @@ static void EVP_PKEY_free_it(EVP_PKEY *x);
 
 int EVP_PKEY_bits(EVP_PKEY *pkey)
        {
+       if (0)
+               return 0;
 #ifndef OPENSSL_NO_RSA
-       if (pkey->type == EVP_PKEY_RSA)
+       else if (pkey->type == EVP_PKEY_RSA)
                return(BN_num_bits(pkey->pkey.rsa->n));
-       else
 #endif
 #ifndef OPENSSL_NO_DSA
-               if (pkey->type == EVP_PKEY_DSA)
+       else if (pkey->type == EVP_PKEY_DSA)
                return(BN_num_bits(pkey->pkey.dsa->p));
+#endif
+#ifndef OPENSSL_NO_EC
+       else if (pkey->type == EVP_PKEY_EC)
+               {
+               BIGNUM *order = BN_new();
+               int ret;
+
+               if (!order)
+                       {
+                       ERR_clear_error();
+                       return 0;
+                       }
+               if (!EC_GROUP_get_order(pkey->pkey.eckey->group, order, NULL))
+                       {
+                       ERR_clear_error();
+                       return 0;
+                       }
+
+               ret = BN_num_bits(order);
+               BN_free(order);
+               return ret;
+               }
 #endif
        return(0);
        }
@@ -92,6 +117,11 @@ int EVP_PKEY_size(EVP_PKEY *pkey)
                if (pkey->type == EVP_PKEY_DSA)
                return(DSA_size(pkey->pkey.dsa));
 #endif
+#ifndef OPENSSL_NO_ECDSA
+               if (pkey->type == EVP_PKEY_EC)
+               return(ECDSA_size(pkey->pkey.eckey));
+#endif
+
        return(0);
        }
 
@@ -106,6 +136,16 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
                        pkey->save_parameters=mode;
                return(ret);
                }
+#endif
+#ifndef OPENSSL_NO_EC
+       if (pkey->type == EVP_PKEY_EC)
+               {
+               int ret = pkey->save_parameters;
+
+               if (mode >= 0)
+                       pkey->save_parameters = mode;
+               return(ret);
+               }
 #endif
        return(0);
        }
@@ -140,6 +180,18 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, EVP_PKEY *from)
                if (to->pkey.dsa->g != NULL) BN_free(to->pkey.dsa->g);
                to->pkey.dsa->g=a;
                }
+#endif
+#ifndef OPENSSL_NO_EC
+       if (to->type == EVP_PKEY_EC)
+               {
+               if (to->pkey.eckey->group != NULL)
+                       EC_GROUP_free(to->pkey.eckey->group);
+               if ((to->pkey.eckey->group = EC_GROUP_new(
+                       EC_GROUP_method_of(from->pkey.eckey->group))) == NULL) 
+                       goto err;
+               if (!EC_GROUP_copy(to->pkey.eckey->group,
+                       from->pkey.eckey->group)) goto err;
+               }
 #endif
        return(1);
 err:
@@ -158,6 +210,14 @@ int EVP_PKEY_missing_parameters(EVP_PKEY *pkey)
                        return(1);
                }
 #endif
+#ifndef OPENSSL_NO_EC
+       if (pkey->type == EVP_PKEY_EC)
+               {
+               if (pkey->pkey.eckey->group == NULL)
+                       return(1);
+               }
+#endif
+
        return(0);
        }
 
@@ -246,6 +306,28 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
 }
 #endif
 
+#ifndef OPENSSL_NO_EC
+
+int EVP_PKEY_set1_EC_KEY(EVP_PKEY *pkey, EC_KEY *key)
+{
+       int ret = EVP_PKEY_assign_EC_KEY(pkey,key);
+       if (ret) CRYPTO_add(&key->references, 1, CRYPTO_LOCK_EC);
+               return ret;
+}
+
+EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
+{
+       if (pkey->type != EVP_PKEY_EC)
+       {
+               EVPerr(EVP_F_EVP_PKEY_GET1_EC_KEY, EVP_R_EXPECTING_A_EC_KEY);
+               return NULL;
+       }
+       CRYPTO_add(&pkey->pkey.eckey->references, 1, CRYPTO_LOCK_EC);
+       return pkey->pkey.eckey;
+}
+#endif
+
+
 #ifndef OPENSSL_NO_DH
 
 int EVP_PKEY_set1_DH(EVP_PKEY *pkey, DH *key)
@@ -282,6 +364,8 @@ int EVP_PKEY_type(int type)
                return(EVP_PKEY_DSA);
        case EVP_PKEY_DH:
                return(EVP_PKEY_DH);
+       case EVP_PKEY_EC:
+               return(EVP_PKEY_EC);
        default:
                return(NID_undef);
                }
@@ -327,6 +411,11 @@ static void EVP_PKEY_free_it(EVP_PKEY *x)
                DSA_free(x->pkey.dsa);
                break;
 #endif
+#ifndef OPENSSL_NO_EC
+       case EVP_PKEY_EC:
+               EC_KEY_free(x->pkey.eckey);
+               break;
+#endif
 #ifndef OPENSSL_NO_DH
        case EVP_PKEY_DH:
                DH_free(x->pkey.dh);