Embed X509_CINF

[openssl.git] / crypto / x509 / x509_r2x.c

diff --git a/crypto/x509/x509_r2x.c b/crypto/x509/x509_r2x.c
index d9c3cfd42b54c10345814ac8c1711e2fbfaf47de..00f772a3733c952fb5ff5a2a04d963222ffa8efe 100644 (file)
--- a/crypto/x509/x509_r2x.c
+++ b/crypto/x509/x509_r2x.c
@@ -62,6 +62,7 @@
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>
 #include <openssl/evp.h>
 #include <openssl/asn1.h>
 #include <openssl/x509.h>

+#include "internal/x509_int.h"

 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 
 #include <openssl/objects.h>
 #include <openssl/buffer.h>
 


@@ -77,7 +78,7 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
     }
 
     /* duplicate the request */
     }
 
     /* duplicate the request */

-    xi = ret->cert_info;
+    xi = &ret->cert_info;

 
     if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) {
         if ((xi->version = ASN1_INTEGER_new()) == NULL)
 
     if (sk_X509_ATTRIBUTE_num(r->req_info->attributes) != 0) {
         if ((xi->version = ASN1_INTEGER_new()) == NULL)


@@ -94,9 +95,9 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
     if (X509_set_issuer_name(ret, X509_NAME_dup(xn)) == 0)
         goto err;
 
     if (X509_set_issuer_name(ret, X509_NAME_dup(xn)) == 0)
         goto err;
 

-    if (X509_gmtime_adj(xi->validity->notBefore, 0) == NULL)
+    if (X509_gmtime_adj(xi->validity.notBefore, 0) == NULL)

         goto err;
         goto err;

-    if (X509_gmtime_adj(xi->validity->notAfter, (long)60 * 60 * 24 * days) ==
+    if (X509_gmtime_adj(xi->validity.notAfter, (long)60 * 60 * 24 * days) ==

         NULL)
         goto err;
 
         NULL)
         goto err;