commit ec43173804b076e1f76d1a7173a55688003390d6
author Shawn Willden <swillden@google.com> Tue Feb 23 14:44:39 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 23 14:44:39 2016 +0000
tree 2f685a754f0fb3b707ef17359d272138364a075e
parent a1433ee2f85ae9d2db4e9eb996b6b23af1542247
parent 44ee6263b8eef8b65cb985ed88e1b413b0f25a12

Merge "system/security/softkeymaster: don't pass a structure into |d2i_PrivateKey|."

softkeymaster/keymaster_openssl.cpp

diff --git a/softkeymaster/keymaster_openssl.cpp b/softkeymaster/keymaster_openssl.cpp
index 6f31195..927b4a6 100644
--- a/softkeymaster/keymaster_openssl.cpp
+++ b/softkeymaster/keymaster_openssl.cpp
@@ -208,17 +208,11 @@
         return NULL;
     }
 
-    Unique_EVP_PKEY pkey(EVP_PKEY_new());
+    Unique_EVP_PKEY pkey(d2i_PrivateKey(type, nullptr, &p, privateLen));
     if (pkey.get() == NULL) {
         logOpenSSLError("unwrap_key");
         return NULL;
     }
-    EVP_PKEY* tmp = pkey.get();
-
-    if (d2i_PrivateKey(type, &tmp, &p, privateLen) == NULL) {
-        logOpenSSLError("unwrap_key");
-        return NULL;
-    }
 
     return pkey.release();
 }