Change X509_VAL in X509 structure to embedded.

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

diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index 6ddbabf62a25dfb19f7f26285fafd9a962bec0ba..0b0d4f5ab8876a1c42b46ddc9376fd5aaab81bbb 100644 (file)
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -57,7 +57,7 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
@@ -114,14 +114,14 @@ int X509_set_notBefore(X509 *x, const ASN1_TIME *tm)
 {
     ASN1_TIME *in;
 
-    if ((x == NULL) || (x->cert_info->validity == NULL))
+    if (x == NULL)
         return (0);
-    in = x->cert_info->validity->notBefore;
+    in = x->cert_info->validity.notBefore;
     if (in != tm) {
         in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            ASN1_TIME_free(x->cert_info->validity->notBefore);
-            x->cert_info->validity->notBefore = in;
+            ASN1_TIME_free(x->cert_info->validity.notBefore);
+            x->cert_info->validity.notBefore = in;
         }
     }
     return (in != NULL);
@@ -131,14 +131,14 @@ int X509_set_notAfter(X509 *x, const ASN1_TIME *tm)
 {
     ASN1_TIME *in;
 
-    if ((x == NULL) || (x->cert_info->validity == NULL))
+    if (x == NULL)
         return (0);
-    in = x->cert_info->validity->notAfter;
+    in = x->cert_info->validity.notAfter;
     if (in != tm) {
         in = ASN1_STRING_dup(tm);
         if (in != NULL) {
-            ASN1_TIME_free(x->cert_info->validity->notAfter);
-            x->cert_info->validity->notAfter = in;
+            ASN1_TIME_free(x->cert_info->validity.notAfter);
+            x->cert_info->validity.notAfter = in;
         }
     }
     return (in != NULL);
@@ -150,3 +150,33 @@ int X509_set_pubkey(X509 *x, EVP_PKEY *pkey)
         return (0);
     return (X509_PUBKEY_set(&(x->cert_info->key), pkey));
 }
+
+void X509_up_ref(X509 *x)
+{
+    CRYPTO_add(&x->references, 1, CRYPTO_LOCK_X509);
+}
+
+long X509_get_version(X509 *x)
+{
+    return ASN1_INTEGER_get(x->cert_info->version);
+}
+
+ASN1_TIME * X509_get_notBefore(X509 *x)
+{
+    return x->cert_info->validity.notBefore;
+}
+
+ASN1_TIME *X509_get_notAfter(X509 *x)
+{
+    return x->cert_info->validity.notAfter;
+}
+
+int X509_get_signature_type(const X509 *x)
+{
+    return EVP_PKEY_type(OBJ_obj2nid(x->sig_alg->algorithm));
+}
+
+X509_PUBKEY *X509_get_X509_PUBKEY(const X509 *x)
+{
+    return x->cert_info->key;
+}