From: Matt Caswell Date: Tue, 2 May 2017 10:08:33 +0000 (+0100) Subject: Fix ASN1_TIME_to_generalizedtime to take a const ASN1_TIME X-Git-Tag: OpenSSL_1_1_0f~11 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c231202e10a078fc52cd51301553a1a09a957f8f;p=oweals%2Fopenssl.git Fix ASN1_TIME_to_generalizedtime to take a const ASN1_TIME Fixes #1526 Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/3360) (cherry picked from commit 9bfeeef8ee2220339e601a028fa991c30d296ed4) --- diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index db82d297d2..46f539cb8d 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -59,7 +59,7 @@ int ASN1_TIME_check(const ASN1_TIME *t) } /* Convert an ASN1_TIME structure to GeneralizedTime */ -ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, +ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t, ASN1_GENERALIZEDTIME **out) { ASN1_GENERALIZEDTIME *ret = NULL; diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h index df764c5f9f..35637ccbdb 100644 --- a/include/openssl/asn1.h +++ b/include/openssl/asn1.h @@ -625,8 +625,8 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t); ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, long offset_sec); int ASN1_TIME_check(const ASN1_TIME *t); -ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME - **out); +ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t, + ASN1_GENERALIZEDTIME **out); int ASN1_TIME_set_string(ASN1_TIME *s, const char *str); int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);