projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Assing check_{cert,crl}_time to 'ok' variable so it returns errors on
[oweals/openssl.git]
/
crypto
/
x509
/
x509_set.c
diff --git
a/crypto/x509/x509_set.c
b/crypto/x509/x509_set.c
index 5a6f7b414f448f7cdd2e99ba0421e91681e0eea2..aaf61ca062b9c9f321972ae2d5ea26a51861e197 100644
(file)
--- a/
crypto/x509/x509_set.c
+++ b/
crypto/x509/x509_set.c
@@
-68,7
+68,7
@@
int X509_set_version(X509 *x, long version)
if (x == NULL) return(0);
if (x->cert_info->version == NULL)
{
if (x == NULL) return(0);
if (x->cert_info->version == NULL)
{
- if ((x->cert_info->version=ASN1_INTEGER_new()) == NULL)
+ if ((x->cert_info->version=
M_
ASN1_INTEGER_new()) == NULL)
return(0);
}
return(ASN1_INTEGER_set(x->cert_info->version,version));
return(0);
}
return(ASN1_INTEGER_set(x->cert_info->version,version));
@@
-82,10
+82,10
@@
int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial)
in=x->cert_info->serialNumber;
if (in != serial)
{
in=x->cert_info->serialNumber;
if (in != serial)
{
- in=ASN1_INTEGER_dup(serial);
+ in=
M_
ASN1_INTEGER_dup(serial);
if (in != NULL)
{
if (in != NULL)
{
- ASN1_INTEGER_free(x->cert_info->serialNumber);
+
M_
ASN1_INTEGER_free(x->cert_info->serialNumber);
x->cert_info->serialNumber=in;
}
}
x->cert_info->serialNumber=in;
}
}
@@
-104,36
+104,36
@@
int X509_set_subject_name(X509 *x, X509_NAME *name)
return(X509_NAME_set(&x->cert_info->subject,name));
}
return(X509_NAME_set(&x->cert_info->subject,name));
}
-int X509_set_notBefore(X509 *x, ASN1_
UTC
TIME *tm)
+int X509_set_notBefore(X509 *x, ASN1_TIME *tm)
{
{
- ASN1_
UTC
TIME *in;
+ ASN1_TIME *in;
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notBefore;
if (in != tm)
{
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notBefore;
if (in != tm)
{
- in=
ASN1_UTC
TIME_dup(tm);
+ in=
M_ASN1_
TIME_dup(tm);
if (in != NULL)
{
if (in != NULL)
{
-
ASN1_UTC
TIME_free(x->cert_info->validity->notBefore);
+
M_ASN1_
TIME_free(x->cert_info->validity->notBefore);
x->cert_info->validity->notBefore=in;
}
}
return(in != NULL);
}
x->cert_info->validity->notBefore=in;
}
}
return(in != NULL);
}
-int X509_set_notAfter(X509 *x, ASN1_
UTC
TIME *tm)
+int X509_set_notAfter(X509 *x, ASN1_TIME *tm)
{
{
- ASN1_
UTC
TIME *in;
+ ASN1_TIME *in;
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notAfter;
if (in != tm)
{
if ((x == NULL) || (x->cert_info->validity == NULL)) return(0);
in=x->cert_info->validity->notAfter;
if (in != tm)
{
- in=
ASN1_UTC
TIME_dup(tm);
+ in=
M_ASN1_
TIME_dup(tm);
if (in != NULL)
{
if (in != NULL)
{
-
ASN1_UTC
TIME_free(x->cert_info->validity->notAfter);
+
M_ASN1_
TIME_free(x->cert_info->validity->notAfter);
x->cert_info->validity->notAfter=in;
}
}
x->cert_info->validity->notAfter=in;
}
}