Add support for default public key digest type ctrl.
[openssl.git] / crypto / evp / p_lib.c
index 74a007e..730520f 100644 (file)
 #include <openssl/evp.h>
 #include <openssl/asn1_mac.h>
 #include <openssl/x509.h>
-
-static void EVP_PKEY_free_it(EVP_PKEY *x);
-
-int EVP_PKEY_bits(EVP_PKEY *pkey)
-       {
-       if (0)
-               return 0;
 #ifndef OPENSSL_NO_RSA
-       else if (pkey->type == EVP_PKEY_RSA)
-               return(BN_num_bits(pkey->pkey.rsa->n));
+#include <openssl/rsa.h>
 #endif
 #ifndef OPENSSL_NO_DSA
-       else if (pkey->type == EVP_PKEY_DSA)
-               return(BN_num_bits(pkey->pkey.dsa->p));
+#include <openssl/dsa.h>
 #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;
-               }
+#ifndef OPENSSL_NO_DH
+#include <openssl/dh.h>
 #endif
-       return(0);
+
+#include "asn1_locl.h"
+
+static void EVP_PKEY_free_it(EVP_PKEY *x);
+
+int EVP_PKEY_bits(EVP_PKEY *pkey)
+       {
+       if (pkey && pkey->ameth && pkey->ameth->pkey_bits)
+               return pkey->ameth->pkey_bits(pkey);
+       return 0;
        }
 
 int EVP_PKEY_size(EVP_PKEY *pkey)
        {
-       if (pkey == NULL)
-               return(0);
-#ifndef OPENSSL_NO_RSA
-       if (pkey->type == EVP_PKEY_RSA)
-               return(RSA_size(pkey->pkey.rsa));
-       else
-#endif
-#ifndef OPENSSL_NO_DSA
-               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);
+       if (pkey && pkey->ameth && pkey->ameth->pkey_size)
+               return pkey->ameth->pkey_size(pkey);
+       return 0;
        }
 
 int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
@@ -150,7 +117,7 @@ int EVP_PKEY_save_parameters(EVP_PKEY *pkey, int mode)
        return(0);
        }
 
-int EVP_PKEY_copy_parameters(EVP_PKEY *to, cpnst EVP_PKEY *from)
+int EVP_PKEY_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from)
        {
        if (to->type != from->type)
                {
@@ -163,78 +130,26 @@ int EVP_PKEY_copy_parameters(EVP_PKEY *to, cpnst EVP_PKEY *from)
                EVPerr(EVP_F_EVP_PKEY_COPY_PARAMETERS,EVP_R_MISSING_PARAMETERS);
                goto err;
                }
-#ifndef OPENSSL_NO_DSA
-       if (to->type == EVP_PKEY_DSA)
-               {
-               BIGNUM *a;
-
-               if ((a=BN_dup(from->pkey.dsa->p)) == NULL) goto err;
-               if (to->pkey.dsa->p != NULL) BN_free(to->pkey.dsa->p);
-               to->pkey.dsa->p=a;
-
-               if ((a=BN_dup(from->pkey.dsa->q)) == NULL) goto err;
-               if (to->pkey.dsa->q != NULL) BN_free(to->pkey.dsa->q);
-               to->pkey.dsa->q=a;
-
-               if ((a=BN_dup(from->pkey.dsa->g)) == NULL) goto err;
-               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);
+       if (from->ameth && from->ameth->param_copy)
+               return from->ameth->param_copy(to, from);
 err:
-       return(0);
+       return 0;
        }
 
 int EVP_PKEY_missing_parameters(const EVP_PKEY *pkey)
        {
-#ifndef OPENSSL_NO_DSA
-       if (pkey->type == EVP_PKEY_DSA)
-               {
-               DSA *dsa;
-
-               dsa=pkey->pkey.dsa;
-               if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
-                       return(1);
-               }
-#endif
-#ifndef OPENSSL_NO_EC
-       if (pkey->type == EVP_PKEY_EC)
-               {
-               if (pkey->pkey.eckey->group == NULL)
-                       return(1);
-               }
-#endif
-
-       return(0);
+       if (pkey->ameth && pkey->ameth->param_missing)
+               return pkey->ameth->param_missing(pkey);
+       return 0;
        }
 
 int EVP_PKEY_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b)
        {
-#ifndef OPENSSL_NO_DSA
-       if ((a->type == EVP_PKEY_DSA) && (b->type == EVP_PKEY_DSA))
-               {
-               if (    BN_cmp(a->pkey.dsa->p,b->pkey.dsa->p) ||
-                       BN_cmp(a->pkey.dsa->q,b->pkey.dsa->q) ||
-                       BN_cmp(a->pkey.dsa->g,b->pkey.dsa->g))
-                       return(0);
-               else
-                       return(1);
-               }
-#endif
-       return(-1);
+       if (a->type != b->type)
+               return -1;
+       if (a->ameth && a->ameth->param_cmp)
+               return a->ameth->param_cmp(a, b);
+       return -2;
        }
 
 int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
@@ -242,45 +157,13 @@ int EVP_PKEY_cmp(const EVP_PKEY *a, const EVP_PKEY *b)
        if (a->type != b->type)
                return -1;
 
-       switch (a->type)
-               {
-#ifndef OPENSSL_NO_RSA
-       case EVP_PKEY_RSA:
-               if (BN_cmp(b->pkey.rsa->n,a->pkey.rsa->n) != 0
-                       || BN_cmp(b->pkey.rsa->e,a->pkey.rsa->e) != 0)
-                       return 0;
-               break;
-#endif
-#ifndef OPENSSL_NO_DSA
-       case EVP_PKEY_DSA:
-               if (BN_cmp(b->pkey.dsa->pub_key,a->pkey.dsa->pub_key) != 0)
-                       return 0;
-               break;
-#endif
-#ifndef OPENSSL_NO_EC
-       case EVP_PKEY_EC:
-               {
-               int  r = EC_POINT_cmp(b->pkey.eckey->group, 
-                       b->pkey.eckey->pub_key,a->pkey.eckey->pub_key,NULL);
-               if (r != 0)
-                       {
-                       if (r == 1)
-                               return 0;
-                       else
-                               return -2;
-                       }
-               }
-               break;
-#endif
-#ifndef OPENSSL_NO_DH
-       case EVP_PKEY_DH:
-               return -2;
-#endif
-       default:
-               return -2;
-               }
+       if (EVP_PKEY_cmp_parameters(a, b) == 0)
+               return 0;
 
-       return 1;
+       if (a->ameth && a->ameth->pub_cmp)
+               return a->ameth->pub_cmp(a, b);
+
+       return -2;
        }
 
 EVP_PKEY *EVP_PKEY_new(void)
@@ -295,23 +178,32 @@ EVP_PKEY *EVP_PKEY_new(void)
                }
        ret->type=EVP_PKEY_NONE;
        ret->references=1;
+       ret->ameth=NULL;
        ret->pkey.ptr=NULL;
        ret->attributes=NULL;
        ret->save_parameters=1;
        return(ret);
        }
 
-int EVP_PKEY_assign(EVP_PKEY *pkey, int type, char *key)
+int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key)
        {
+       const EVP_PKEY_ASN1_METHOD *ameth;
        if (pkey == NULL) return(0);
        if (pkey->pkey.ptr != NULL)
                EVP_PKEY_free_it(pkey);
-       pkey->type=EVP_PKEY_type(type);
+       ameth = EVP_PKEY_asn1_find(type);
+       pkey->ameth = ameth;
+       pkey->type = ameth->pkey_id;
        pkey->save_type=type;
        pkey->pkey.ptr=key;
        return(key != NULL);
        }
 
+void *EVP_PKEY_get0(EVP_PKEY *pkey)
+       {
+       return pkey->pkey.ptr;
+       }
+
 #ifndef OPENSSL_NO_RSA
 int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key)
 {
@@ -357,8 +249,9 @@ DSA *EVP_PKEY_get1_DSA(EVP_PKEY *pkey)
 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;
+       if (ret)
+               EC_KEY_up_ref(key);
+       return ret;
 }
 
 EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
@@ -368,8 +261,8 @@ EC_KEY *EVP_PKEY_get1_EC_KEY(EVP_PKEY *pkey)
                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;
+       EC_KEY_up_ref(pkey->pkey.ec);
+       return pkey->pkey.ec;
 }
 #endif
 
@@ -397,24 +290,11 @@ DH *EVP_PKEY_get1_DH(EVP_PKEY *pkey)
 
 int EVP_PKEY_type(int type)
        {
-       switch (type)
-               {
-       case EVP_PKEY_RSA:
-       case EVP_PKEY_RSA2:
-               return(EVP_PKEY_RSA);
-       case EVP_PKEY_DSA:
-       case EVP_PKEY_DSA1:
-       case EVP_PKEY_DSA2:
-       case EVP_PKEY_DSA3:
-       case EVP_PKEY_DSA4:
-               return(EVP_PKEY_DSA);
-       case EVP_PKEY_DH:
-               return(EVP_PKEY_DH);
-       case EVP_PKEY_EC:
-               return(EVP_PKEY_EC);
-       default:
-               return(NID_undef);
-               }
+       const EVP_PKEY_ASN1_METHOD *ameth;
+       ameth = EVP_PKEY_asn1_find(type);
+       if (ameth)
+               return ameth->pkey_id;
+       return NID_undef;
        }
 
 void EVP_PKEY_free(EVP_PKEY *x)
@@ -436,37 +316,57 @@ void EVP_PKEY_free(EVP_PKEY *x)
                }
 #endif
        EVP_PKEY_free_it(x);
+       if (x->attributes)
+               sk_X509_ATTRIBUTE_pop_free(x->attributes, X509_ATTRIBUTE_free);
        OPENSSL_free(x);
        }
 
 static void EVP_PKEY_free_it(EVP_PKEY *x)
        {
-       switch (x->type)
-               {
-#ifndef OPENSSL_NO_RSA
-       case EVP_PKEY_RSA:
-       case EVP_PKEY_RSA2:
-               RSA_free(x->pkey.rsa);
-               break;
-#endif
-#ifndef OPENSSL_NO_DSA
-       case EVP_PKEY_DSA:
-       case EVP_PKEY_DSA2:
-       case EVP_PKEY_DSA3:
-       case EVP_PKEY_DSA4:
-               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);
-               break;
-#endif
-               }
+       if (x->ameth && x->ameth->pkey_free)
+               x->ameth->pkey_free(x);
+       }
+
+static int unsup_alg(BIO *out, const EVP_PKEY *pkey, int indent,
+                               const char *kstr)
+       {
+       BIO_indent(out, indent, 128);
+       BIO_printf(out, "%s %s, algorithm, unsupported\n",
+                                               OBJ_nid2ln(pkey->type), kstr);
+       return 1;
+       }
+
+int EVP_PKEY_print_public(BIO *out, const EVP_PKEY *pkey,
+                               int indent, ASN1_PCTX *pctx)
+       {
+       if (pkey->ameth && pkey->ameth->pub_print)
+               return pkey->ameth->pub_print(out, pkey, indent, pctx);
+       
+       return unsup_alg(out, pkey, indent, "Public Key");
+       }
+
+int EVP_PKEY_print_private(BIO *out, const EVP_PKEY *pkey,
+                               int indent, ASN1_PCTX *pctx)
+       {
+       if (pkey->ameth && pkey->ameth->priv_print)
+               return pkey->ameth->priv_print(out, pkey, indent, pctx);
+       
+       return unsup_alg(out, pkey, indent, "Private Key");
+       }
+
+int EVP_PKEY_print_params(BIO *out, const EVP_PKEY *pkey,
+                               int indent, ASN1_PCTX *pctx)
+       {
+       if (pkey->ameth && pkey->ameth->param_print)
+               return pkey->ameth->param_print(out, pkey, indent, pctx);
+       return unsup_alg(out, pkey, indent, "Parameters");
+       }
+
+int EVP_PKEY_get_default_digest_nid(EVP_PKEY *pkey, int *pnid)
+       {
+       if (!pkey->ameth || !pkey->ameth->pkey_ctrl)
+               return -2;
+       return pkey->ameth->pkey_ctrl(pkey, ASN1_PKEY_CTRL_DEFAULT_MD_NID,
+                                               0, pnid);
        }