From 0d5bbaaae2c65ddf7a30596b61617304e0950d9c Mon Sep 17 00:00:00 2001
From: Matt Caswell <matt@openssl.org>
Date: Mon, 12 Apr 2021 15:52:05 +0100
Subject: [PATCH] Remove a TODO(3.0) from X509_PUBKEY_set
The comment talks about the EVP_PKEY that is contained within an
X509_PUBKEY object and whether it has to be exactly the same as the one
passed by the caller in X509_PUBKEY_set(). IMO it does, so the TODO should
be dropped.
Fixes #14378
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14845)
---
crypto/x509/x_pubkey.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/crypto/x509/x_pubkey.c b/crypto/x509/x_pubkey.c
index 5099f9618a..9b846a8bc2 100644
--- a/crypto/x509/x_pubkey.c
+++ b/crypto/x509/x_pubkey.c
@@ -282,14 +282,12 @@ int X509_PUBKEY_set(X509_PUBKEY **x, EVP_PKEY *pkey)
/*
* pk->pkey is NULL when using the legacy routine, but is non-NULL when
* going through the encoder, and for all intents and purposes, it's
- * a perfect copy of |pkey|, just not the same instance. In that case,
- * we could simply return early, right here.
- * However, in the interest of being cautious leaning on paranoia, some
- * application might very well depend on the passed |pkey| being used
- * and none other, so we spend a few more cycles throwing away the newly
- * created |pk->pkey| and replace it with |pkey|.
- * TODO(3.0) Investigate if it's safe to change to simply return here
- * if |pk->pkey != NULL|.
+ * a perfect copy of the public key portions of |pkey|, just not the same
+ * instance. If that's all there was to pkey then we could simply return
+ * early, right here. However, some application might very well depend on
+ * the passed |pkey| being used and none other, so we spend a few more
+ * cycles throwing away the newly created |pk->pkey| and replace it with
+ * |pkey|.
*/
if (pk->pkey != NULL)
EVP_PKEY_free(pk->pkey);