Use more X509_REQ_get0_pubkey & X509_get0_pubkey

[openssl.git] / apps / req.c

diff --git a/apps/req.c b/apps/req.c
index d1f5dcb3450309e754c5944bd8cc16b19709cb7d..e459a712135a7538bc9ad6dbd496b0c02ffa5e62 100644 (file)
--- a/apps/req.c
+++ b/apps/req.c
@@ -327,7 +327,7 @@ int req_main(int argc, char **argv)
     if (!nmflag_set)
         nmflag = XN_FLAG_ONELINE;
 
-    /* TODO: simplify this as pkey is still always NULL here */ 
+    /* TODO: simplify this as pkey is still always NULL here */
     private = newreq && (pkey == NULL) ? 1 : 0;
 
     if (!app_passwd(passargin, passargout, &passin, &passout)) {
@@ -727,15 +727,14 @@ int req_main(int argc, char **argv)
         goto end;
 
     if (pubkey) {
-        EVP_PKEY *tpubkey;
-        tpubkey = X509_REQ_get_pubkey(req);
+        EVP_PKEY *tpubkey = X509_REQ_get0_pubkey(req);
+
         if (tpubkey == NULL) {
             BIO_printf(bio_err, "Error getting public key\n");
             ERR_print_errors(bio_err);
             goto end;
         }
         PEM_write_bio_PUBKEY(out, tpubkey);
-        EVP_PKEY_free(tpubkey);
     }
 
     if (text) {
@@ -758,9 +757,9 @@ int req_main(int argc, char **argv)
         EVP_PKEY *tpubkey;
 
         if (x509)
-            tpubkey = X509_get_pubkey(x509ss);
+            tpubkey = X509_get0_pubkey(x509ss);
         else
-            tpubkey = X509_REQ_get_pubkey(req);
+            tpubkey = X509_REQ_get0_pubkey(req);
         if (tpubkey == NULL) {
             fprintf(stdout, "Modulus=unavailable\n");
             goto end;
@@ -774,7 +773,6 @@ int req_main(int argc, char **argv)
         } else
 #endif
             fprintf(stdout, "Wrong Algorithm type");
-        EVP_PKEY_free(tpubkey);
         fprintf(stdout, "\n");
     }
 
@@ -1109,12 +1107,12 @@ static int auto_info(X509_REQ *req, STACK_OF(CONF_VALUE) *dn_sk,
             }
         }
 #ifndef CHARSET_EBCDIC
-        plus_char = (*p == '+');
+        plus_char = (*type == '+');
 #else
-        plus_char = (*p == os_toascii['+']);
+        plus_char = (*type == os_toascii['+']);
 #endif
         if (plus_char) {
-            p++;
+            type++;
             mval = -1;
         } else
             mval = 0;