Fix dynamic public key method lookup.

[openssl.git] / crypto / asn1 / ameth_lib.c

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index d7537202de2885fbb50dc962c3ff8bb169ad0f32..6b4690e5b7680240db24e3868081bd3b8ac54e04 100644 (file)
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -70,15 +70,23 @@ extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
 /* Keep this sorted in type order !! */
 const EVP_PKEY_ASN1_METHOD *standard_methods[] = 
        {
+#ifndef OPENSSL_NO_RSA
        &rsa_asn1_meths[0],
        &rsa_asn1_meths[1],
+#endif
+#ifndef OPENSSL_NO_DH
        &dh_asn1_meth,
+#endif
+#ifndef OPENSSL_NO_DSA
        &dsa_asn1_meths[0],
        &dsa_asn1_meths[1],
        &dsa_asn1_meths[2],
        &dsa_asn1_meths[3],
        &dsa_asn1_meths[4],
+#endif
+#ifndef OPENSSL_NO_EC
        &eckey_asn1_meth
+#endif
        };
 
 typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
@@ -105,6 +113,25 @@ static int ameth_cmp(const EVP_PKEY_ASN1_METHOD * const *a,
         return ((*a)->pkey_id - (*b)->pkey_id);
        }
 
+int EVP_PKEY_asn1_get_count(void)
+       {
+       int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+       if (app_methods)
+               num += sk_num(app_methods);
+       return num;
+       }
+
+const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_get0(int idx)
+       {
+       int num = sizeof(standard_methods)/sizeof(EVP_PKEY_ASN1_METHOD *);
+       if (idx < 0)
+               return NULL; 
+       if (idx < num)
+               return standard_methods[idx];
+       idx -= num;
+       return (const EVP_PKEY_ASN1_METHOD *)sk_value(app_methods, idx);
+       }
+
 const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(int type)
        {
        EVP_PKEY_ASN1_METHOD tmp, *t = &tmp, **ret;
@@ -112,8 +139,8 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(int type)
        if (app_methods)
                {
                int idx;
-               idx = sk_find(app_methods, (char *)&t);
-               if (idx > 0)
+               idx = sk_find(app_methods, (char *)&tmp);
+               if (idx >= 0)
                        return (EVP_PKEY_ASN1_METHOD *)
                                sk_value(app_methods, idx);
                }
@@ -129,6 +156,22 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find(int type)
        return *ret;
        }
 
+const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(const char *str, int len)
+       {
+       int i;
+       const EVP_PKEY_ASN1_METHOD *ameth;
+       for (i = 0; i < EVP_PKEY_asn1_get_count(); i++)
+               {
+               ameth = EVP_PKEY_asn1_get0(i);
+               if (ameth->pkey_flags & ASN1_PKEY_ALIAS)
+                       continue;
+               if ((strlen(ameth->pem_str) == len) && 
+                       !strncasecmp(ameth->pem_str, str, len))
+                       return ameth;
+               }
+       return NULL;
+       }
+
 int EVP_PKEY_asn1_add(const EVP_PKEY_ASN1_METHOD *ameth)
        {
        if (app_methods == NULL)
@@ -143,6 +186,25 @@ int EVP_PKEY_asn1_add(const EVP_PKEY_ASN1_METHOD *ameth)
        return 1;
        }
 
+int EVP_PKEY_asn1_get0_info(int *ppkey_id, int *ppkey_base_id, int *ppkey_flags,
+                               const char **pinfo, const char **ppem_str,
+                                       const EVP_PKEY_ASN1_METHOD *ameth)
+       {
+       if (!ameth)
+               return 0;
+       if (ppkey_id)
+               *ppkey_id = ameth->pkey_id;
+       if (ppkey_base_id)
+               *ppkey_base_id = ameth->pkey_base_id;
+       if (ppkey_flags)
+               *ppkey_flags = ameth->pkey_flags;
+       if (pinfo)
+               *pinfo = ameth->info;
+       if (ppem_str)
+               *ppem_str = ameth->pem_str;
+       return 1;
+       }
+
 EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
                                        const char *pem_str, const char *info)
        {
@@ -174,11 +236,9 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
        ameth->pub_cmp = 0;
        ameth->pub_print = 0;
 
-
        ameth->priv_decode = 0;
        ameth->priv_encode = 0;
        ameth->priv_print = 0;
-       
 
        ameth->pkey_size = 0;
        ameth->pkey_bits = 0;
@@ -190,7 +250,6 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id,
        ameth->param_cmp = 0;
        ameth->param_print = 0;
 
-
        ameth->pkey_free = 0;
        ameth->pkey_ctrl = 0;
 
@@ -244,8 +303,9 @@ void EVP_PKEY_asn1_set_private(EVP_PKEY_ASN1_METHOD *ameth,
        }
 
 void EVP_PKEY_asn1_set_param(EVP_PKEY_ASN1_METHOD *ameth,
-               int (*param_decode)(const EVP_PKEY *pk, X509_PUBKEY *pub),
-               int (*param_encode)(X509_PUBKEY *pub, const EVP_PKEY *pk),
+               int (*param_decode)(EVP_PKEY *pkey,
+                               const unsigned char **pder, int derlen),
+               int (*param_encode)(const EVP_PKEY *pkey, unsigned char **pder),
                int (*param_missing)(const EVP_PKEY *pk),
                int (*param_copy)(EVP_PKEY *to, const EVP_PKEY *from),
                int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b),