#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/asn1/ameth_lib.c b/jni/openssl/crypto/asn1/ameth_lib.c
index a19e058..5a581b9 100644
--- a/jni/openssl/crypto/asn1/ameth_lib.c
+++ b/jni/openssl/crypto/asn1/ameth_lib.c
@@ -69,7 +69,6 @@
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[] =
@@ -91,8 +90,7 @@
#ifndef OPENSSL_NO_EC
&eckey_asn1_meth,
#endif
- &hmac_asn1_meth,
- &cmac_asn1_meth
+ &hmac_asn1_meth
};
typedef int sk_cmp_fn_type(const char * const *a, const char * const *b);
@@ -293,8 +291,6 @@
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;
@@ -329,9 +325,6 @@
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;
@@ -383,9 +376,6 @@
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)