Revert "EVP_PKEY_asn1_add0(): Check that this method isn't already registered"
authorRichard Levitte <levitte@openssl.org>
Mon, 22 Jan 2018 17:24:55 +0000 (18:24 +0100)
committerRichard Levitte <levitte@openssl.org>
Tue, 23 Jan 2018 19:28:18 +0000 (20:28 +0100)
This reverts commit d85722d31ac9ff0dc54c06cdc8d125acf56ca27a.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/5137)

(cherry picked from commit 7203c94e98c9fa76b0859c25b723b2bde4a9059b)

crypto/asn1/ameth_lib.c

index dca5affc902a88cbe2379b9b44087e189797866e..cfde49ab02125b7e7d443f2dafc05e7ed8e6c9a5 100644 (file)
@@ -176,11 +176,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)