mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-30 21:44:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove a TODO(3.0) from X509_PUBKEY_set

Browse Source 
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)
This commit is contained in:
Matt Caswell 2021-04-12 15:52:05 +01:00 committed by Pauli
parent 89947af2c5
commit 0d5bbaaae2
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/x509/x_pubkey.c
View File

@ -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);