summaryrefslogtreecommitdiffstats
path: root/crypto/x509/x509_set.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-09-15 17:10:51 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-09-16 22:17:39 +0100
commit2869e79f421bb8d350500cddfd87fdf5d40cd4ba (patch)
tree72f072843eb2afcaae558e5746bda53121c560c2 /crypto/x509/x509_set.c
parentde17bd5d7f8286d8b1f0a04a3f8f5782033f5ebd (diff)
Change X509_VAL in X509 structure to embedded.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/x509/x509_set.c')
-rw-r--r--crypto/x509/x509_set.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c
index cfff563ef4..0b0d4f5ab8 100644
--- a/crypto/x509/x509_set.c
+++ b/crypto/x509/x509_set.c
@@ -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);
@@ -163,12 +163,12 @@ long X509_get_version(X509 *x)
ASN1_TIME * X509_get_notBefore(X509 *x)
{
- return x->cert_info->validity->notBefore;
+ return x->cert_info->validity.notBefore;
}
ASN1_TIME *X509_get_notAfter(X509 *x)
{
- return x->cert_info->validity->notAfter;
+ return x->cert_info->validity.notAfter;
}
int X509_get_signature_type(const X509 *x)