commit d75c869d07a31626fe876c244ec978662326245b
author Patrick Williams <patrick@stwcx.xyz> Tue Dec 07 16:25:10 2021 -0600
committer Patrick Williams <patrick@stwcx.xyz> Tue Dec 07 16:25:13 2021 -0600
tree 4c797cfd4dc9d91b74b29308d96d15d90d399eb3
parent 58e18979f54272cea7af1834011cd249902665c5

openssl: stop using deprecated read_RSAPublicKey

Starting with openssl 3, the PEM_read_bio_RSAPublicKey function is
deprecated.  There is an existing API, PEM_read_PUBKEY which gives a
nicer EVP_PKEY object instead.  Switch to use this.

Tested: Unit tests pass, which call 'verify' and use this code path.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I45a935173f2d4d29660ef38f8e1ebcfa13c043d1

image_verify.cpp

diff --git a/image_verify.cpp b/image_verify.cpp
index b7654aa..d67cfac 100644
--- a/image_verify.cpp
+++ b/image_verify.cpp
@@ -294,16 +294,12 @@
 
     // Create RSA.
     auto publicRSA = createPublicRSA(publicKey);
-    if (publicRSA == nullptr)
+    if (!publicRSA)
     {
         error("Failed to create RSA from {PATH}", "PATH", publicKey);
         elog<InternalFailure>();
     }
 
-    // Assign key to RSA.
-    EVP_PKEY_Ptr pKeyPtr(EVP_PKEY_new(), ::EVP_PKEY_free);
-    EVP_PKEY_assign_RSA(pKeyPtr.get(), publicRSA);
-
     // Initializes a digest context.
     EVP_MD_CTX_Ptr rsaVerifyCtx(EVP_MD_CTX_new(), ::EVP_MD_CTX_free);
 
@@ -320,7 +316,7 @@
     }
 
     auto result = EVP_DigestVerifyInit(rsaVerifyCtx.get(), nullptr, hashStruct,
-                                       nullptr, pKeyPtr.get());
+                                       nullptr, publicRSA.get());
 
     if (result <= 0)
     {
@@ -366,9 +362,8 @@
     return true;
 }
 
-inline RSA* Signature::createPublicRSA(const fs::path& publicKey)
+inline EVP_PKEY_Ptr Signature::createPublicRSA(const fs::path& publicKey)
 {
-    RSA* rsa = nullptr;
     auto size = fs::file_size(publicKey);
 
     // Read public key file
@@ -381,9 +376,8 @@
         elog<InternalFailure>();
     }
 
-    rsa = PEM_read_bio_RSA_PUBKEY(keyBio.get(), &rsa, nullptr, nullptr);
-
-    return rsa;
+    return {PEM_read_bio_PUBKEY(keyBio.get(), nullptr, nullptr, nullptr),
+            &::EVP_PKEY_free};
 }
 
 CustomMap Signature::mapFile(const fs::path& path, size_t size)

image_verify.hpp

diff --git a/image_verify.hpp b/image_verify.hpp
index 5426c6d..88762e1 100644
--- a/image_verify.hpp
+++ b/image_verify.hpp
@@ -189,7 +189,7 @@
      * @param[in]  - publickey
      * @param[out] - RSA Object.
      */
-    inline RSA* createPublicRSA(const fs::path& publicKey);
+    inline EVP_PKEY_Ptr createPublicRSA(const fs::path& publicKey);
 
     /**
      * @brief Memory map the  file