This commit was generated by cvs2git to track changes on a CVS vendor

branch.

2 files changed, 22 insertions, 1 deletions

diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c
index 5a581b90ea..a19e058fca 100644
--- a/src/lib/libcrypto/asn1/ameth_lib.c
+++ b/src/lib/libcrypto/asn1/ameth_lib.c
@@ -69,6 +69,7 @@ extern const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[];
 extern const EVP_PKEY_ASN1_METHOD dh_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD eckey_asn1_meth;
 extern const EVP_PKEY_ASN1_METHOD hmac_asn1_meth;
+extern const EVP_PKEY_ASN1_METHOD cmac_asn1_meth;
 
 /* Keep this sorted in type order !! */
 static const EVP_PKEY_ASN1_METHOD *standard_methods[] = 
@@ -90,7 +91,8 @@ static const EVP_PKEY_ASN1_METHOD *standard_methods[] =
 #ifndef OPENSSL_NO_EC
         &eckey_asn1_meth,
 #endif
-        &hmac_asn1_meth
+        &hmac_asn1_meth,
+        &cmac_asn1_meth
         };
 
 typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
@@ -291,6 +293,8 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
         if (!ameth)
                 return NULL;
 
+        memset(ameth, 0, sizeof(EVP_PKEY_ASN1_METHOD));
+
         ameth->pkey_id = id;
         ameth->pkey_base_id = id;
         ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC;
@@ -325,6 +329,9 @@ EVP_PKEY_ASN1_METHOD* EVP_PKEY_asn1_new(int id, int flags,
         ameth->old_priv_encode = 0;
         ameth->old_priv_decode = 0;
 
+        ameth->item_verify = 0;
+        ameth->item_sign = 0;
+
         ameth->pkey_size = 0;
         ameth->pkey_bits = 0;
 
@@ -376,6 +383,9 @@ void EVP_PKEY_asn1_copy(EVP_PKEY_ASN1_METHOD *dst,
         dst->pkey_free = src->pkey_free;
         dst->pkey_ctrl = src->pkey_ctrl;
 
+        dst->item_sign = src->item_sign;
+        dst->item_verify = src->item_verify;
+
         }
 
 void EVP_PKEY_asn1_free(EVP_PKEY_ASN1_METHOD *ameth)
diff --git a/src/lib/libcrypto/asn1/asn1_locl.h b/src/lib/libcrypto/asn1/asn1_locl.h
index 5aa65e28f5..9fcf0d9530 100644
--- a/src/lib/libcrypto/asn1/asn1_locl.h
+++ b/src/lib/libcrypto/asn1/asn1_locl.h
@@ -102,6 +102,10 @@ struct evp_pkey_asn1_method_st
         int (*param_cmp)(const EVP_PKEY *a, const EVP_PKEY *b);
         int (*param_print)(BIO *out, const EVP_PKEY *pkey, int indent,
                                                         ASN1_PCTX *pctx);
+        int (*sig_print)(BIO *out,
+                         const X509_ALGOR *sigalg, const ASN1_STRING *sig,
+                                         int indent, ASN1_PCTX *pctx);
+
 
         void (*pkey_free)(EVP_PKEY *pkey);
         int (*pkey_ctrl)(EVP_PKEY *pkey, int op, long arg1, void *arg2);
@@ -111,6 +115,13 @@ struct evp_pkey_asn1_method_st
         int (*old_priv_decode)(EVP_PKEY *pkey,
                                 const unsigned char **pder, int derlen);
         int (*old_priv_encode)(const EVP_PKEY *pkey, unsigned char **pder);
+        /* Custom ASN1 signature verification */
+        int (*item_verify)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
+                                X509_ALGOR *a, ASN1_BIT_STRING *sig,
+                                EVP_PKEY *pkey);
+        int (*item_sign)(EVP_MD_CTX *ctx, const ASN1_ITEM *it, void *asn,
+                                X509_ALGOR *alg1, X509_ALGOR *alg2, 
+                                ASN1_BIT_STRING *sig);
 
         } /* EVP_PKEY_ASN1_METHOD */;