OpenSSL 1.1.1-pre2

crypto/pem/pvkfmt.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2005-2018 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2005-2016 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -285,17 +285,14 @@ static EVP_PKEY *b2i_dss(const unsigned char **in,
             goto memerr;
 
         BN_CTX_free(ctx);
-        ctx = NULL;
     }
     if (!DSA_set0_pqg(dsa, pbn, qbn, gbn))
         goto memerr;
     pbn = qbn = gbn = NULL;
     if (!DSA_set0_key(dsa, pub_key, priv_key))
         goto memerr;
-    pub_key = priv_key = NULL;
 
-    if (!EVP_PKEY_set1_DSA(ret, dsa))
-        goto memerr;
+    EVP_PKEY_set1_DSA(ret, dsa);
     DSA_free(dsa);
     *in = p;
     return ret;
@@ -348,19 +345,12 @@ static EVP_PKEY *b2i_rsa(const unsigned char **in,
             goto memerr;
         if (!read_lebn(&pin, nbyte, &d))
             goto memerr;
-        if (!RSA_set0_factors(rsa, p, q))
-            goto memerr;
-        p = q = NULL;
-        if (!RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp))
-            goto memerr;
-        dmp1 = dmq1 = iqmp = NULL;
+        RSA_set0_factors(rsa, p, q);
+        RSA_set0_crt_params(rsa, dmp1, dmq1, iqmp);
     }
-    if (!RSA_set0_key(rsa, n, e, d))
-        goto memerr;
-    n = e = d = NULL;
+    RSA_set0_key(rsa, n, e, d);
 
-    if (!EVP_PKEY_set1_RSA(ret, rsa))
-        goto memerr;
+    EVP_PKEY_set1_RSA(ret, rsa);
     RSA_free(rsa);
     *in = pin;
     return ret;