X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=crypto%2Fx509%2Fx509_set.c;h=4b94fc58477f68af554a0698f685ec99fc434bb9;hp=5a6f7b414f448f7cdd2e99ba0421e91681e0eea2;hb=06ddf8eb08af58e00032a5f8d381d837b82fa644;hpb=ec577822f95a8bca0023c5c77cef1a4916822d4a diff --git a/crypto/x509/x509_set.c b/crypto/x509/x509_set.c index 5a6f7b414f..4b94fc5847 100644 --- 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->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)); @@ -82,10 +82,10 @@ int X509_set_serialNumber(X509 *x, ASN1_INTEGER *serial) in=x->cert_info->serialNumber; if (in != serial) { - in=ASN1_INTEGER_dup(serial); + in=M_ASN1_INTEGER_dup(serial); if (in != NULL) { - ASN1_INTEGER_free(x->cert_info->serialNumber); + M_ASN1_INTEGER_free(x->cert_info->serialNumber); 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)); } -int X509_set_notBefore(X509 *x, ASN1_UTCTIME *tm) +int X509_set_notBefore(X509 *x, const ASN1_TIME *tm) { - ASN1_UTCTIME *in; + ASN1_TIME *in; if ((x == NULL) || (x->cert_info->validity == NULL)) return(0); in=x->cert_info->validity->notBefore; if (in != tm) { - in=ASN1_UTCTIME_dup(tm); + in=M_ASN1_TIME_dup(tm); if (in != NULL) { - ASN1_UTCTIME_free(x->cert_info->validity->notBefore); + M_ASN1_TIME_free(x->cert_info->validity->notBefore); x->cert_info->validity->notBefore=in; } } return(in != NULL); } -int X509_set_notAfter(X509 *x, ASN1_UTCTIME *tm) +int X509_set_notAfter(X509 *x, const ASN1_TIME *tm) { - ASN1_UTCTIME *in; + ASN1_TIME *in; if ((x == NULL) || (x->cert_info->validity == NULL)) return(0); in=x->cert_info->validity->notAfter; if (in != tm) { - in=ASN1_UTCTIME_dup(tm); + in=M_ASN1_TIME_dup(tm); if (in != NULL) { - ASN1_UTCTIME_free(x->cert_info->validity->notAfter); + M_ASN1_TIME_free(x->cert_info->validity->notAfter); x->cert_info->validity->notAfter=in; } }