commit 124055a96e8533735b32e6af0fa7913c100ffad2
author Dr. Stephen Henson <steve@openssl.org> Mon Aug 31 12:58:07 2015 +0100
committer Dr. Stephen Henson <steve@openssl.org> Mon Aug 31 20:58:33 2015 +0100
tree 1ba18c2a6162f80c8eb8514ffc3f005da879ec8d
parent bc3686dfb031445c5af9a256a46a57dc1277a190

make X509_REQ opaque

Reviewed-by: Rich Salz <rsalz@openssl.org>

apps/ca.c

diff --git a/apps/ca.c b/apps/ca.c
index 0a8d7b7..b93cff5 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1479,7 +1479,6 @@
             goto end;
         }
         X509_REQ_set_subject_name(req, n);
-        req->req_info->enc.modified = 1;
         X509_NAME_free(n);
     }
 
@@ -1993,7 +1992,6 @@
     X509_REQ *req = NULL;
     CONF_VALUE *cv = NULL;
     NETSCAPE_SPKI *spki = NULL;
-    X509_REQ_INFO *ri;
     char *type, *buf;
     EVP_PKEY *pktmp = NULL;
     X509_NAME *n = NULL;
@@ -2037,8 +2035,7 @@
     /*
      * Build up the subject name set.
      */
-    ri = req->req_info;
-    n = ri->subject;
+    n = X509_REQ_get_subject_name(req);
 
     for (i = 0;; i++) {
         if (sk_CONF_VALUE_num(sk) <= i)

apps/req.c

diff --git a/apps/req.c b/apps/req.c
index 9b017aa..59cc6b4 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -726,8 +726,6 @@
             goto end;
         }
 
-        req->req_info->enc.modified = 1;
-
         if (verbose) {
             print_name(bio_err, "new subject=",
                        X509_REQ_get_subject_name(req), nmflag);

apps/x509.c

diff --git a/apps/x509.c b/apps/x509.c
index 2fd92f4..6b41a75 100644
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -567,15 +567,6 @@
             goto end;
         }
 
-        if ((req->req_info == NULL) ||
-            (req->req_info->pubkey == NULL) ||
-            (req->req_info->pubkey->public_key == NULL) ||
-            (req->req_info->pubkey->public_key->data == NULL)) {
-            BIO_printf(bio_err,
-                       "The certificate request appears to corrupted\n");
-            BIO_printf(bio_err, "It does not contain a public key\n");
-            goto end;
-        }
         if ((pkey = X509_REQ_get_pubkey(req)) == NULL) {
             BIO_printf(bio_err, "error unpacking public key\n");
             goto end;
@@ -611,9 +602,9 @@
         } else if (!X509_set_serialNumber(x, sno))
             goto end;
 
-        if (!X509_set_issuer_name(x, req->req_info->subject))
+        if (!X509_set_issuer_name(x, X509_REQ_get_subject_name(req)))
             goto end;
-        if (!X509_set_subject_name(x, req->req_info->subject))
+        if (!X509_set_subject_name(x, X509_REQ_get_subject_name(req)))
             goto end;
 
         X509_gmtime_adj(X509_get_notBefore(x), 0);