X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fasn1%2Fameth_lib.c;h=6b4690e5b7680240db24e3868081bd3b8ac54e04;hp=c95ccf0831ce826eab8ae152e464f62b5c118c5d;hb=863779065e65d353d4dde6f428a594e427774ce2;hpb=e42633140e98c7c07a5bc013127e1e6a251995ed

diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index c95ccf0831..6b4690e5b7 100644
--- 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);
@@ -131,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);
 		}
@@ -178,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)
 	{
@@ -209,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;
@@ -225,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;
 
@@ -279,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),