Revert r1.46. Causes fireworks in regress.

diff --git a/lib/libssl/ssl_rsa.c b/lib/libssl/ssl_rsa.c
index 98c1e1b..28a24f8 100644 (file)
--- a/lib/libssl/ssl_rsa.c
+++ b/lib/libssl/ssl_rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_rsa.c,v 1.46 2022/08/31 06:51:36 tb Exp $ */
+/* $OpenBSD: ssl_rsa.c,v 1.47 2022/08/31 20:20:53 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -184,13 +184,9 @@ ssl_set_pkey(SSL_CTX *ctx, SSL *ssl, EVP_PKEY *pkey)
 
        if (c->pkeys[i].x509 != NULL) {
                EVP_PKEY *pktmp;
-
-               if ((pktmp = X509_get0_pubkey(c->pkeys[i].x509)) == NULL)
-                       return 0;
-
-               if (!EVP_PKEY_copy_parameters(pktmp, pkey))
-                       return 0;
-
+               pktmp = X509_get_pubkey(c->pkeys[i].x509);
+               EVP_PKEY_copy_parameters(pktmp, pkey);
+               EVP_PKEY_free(pktmp);
                ERR_clear_error();
 
                /*
@@ -213,7 +209,7 @@ ssl_set_pkey(SSL_CTX *ctx, SSL *ssl, EVP_PKEY *pkey)
        c->key = &(c->pkeys[i]);
 
        c->valid = 0;
-       return 1;
+       return (1);
 }
 
 int