summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-01-22 18:24:55 +0100
committerRichard Levitte <levitte@openssl.org>2018-01-23 20:27:32 +0100
commit7203c94e98c9fa76b0859c25b723b2bde4a9059b (patch)
tree3cca74d412aef4e669c95d348bfdc3d891e75a97
parent371a2d439bb4ebb2c6c7359031b92a4ce6777de7 (diff)
Revert "EVP_PKEY_asn1_add0(): Check that this method isn't already registered"
This reverts commit d85722d31ac9ff0dc54c06cdc8d125acf56ca27a. Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de> (Merged from https://github.com/openssl/openssl/pull/5137)
-rw-r--r--crypto/asn1/ameth_lib.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c
index 5662e17688..a40e20ed33 100644
--- a/crypto/asn1/ameth_lib.c
+++ b/crypto/asn1/ameth_lib.c
@@ -137,11 +137,6 @@ const EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_find_str(ENGINE **pe,
int EVP_PKEY_asn1_add0(const EVP_PKEY_ASN1_METHOD *ameth)
{
- if (pkey_asn1_find(ameth->pkey_id) != NULL) {
- EVPerr(EVP_F_EVP_PKEY_ASN1_ADD0,
- EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED);
- return 0;
- }
if (app_methods == NULL) {
app_methods = sk_EVP_PKEY_ASN1_METHOD_new(ameth_cmp);
if (app_methods == NULL)