diff options
| author | Matt Caswell <matt@openssl.org> | 2017-05-02 11:08:33 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-05-19 08:54:39 +0100 |
| commit | 9bfeeef8ee2220339e601a028fa991c30d296ed4 (patch) | |
| tree | feef15a5c02b83dd4cf709e536ba7f7706102b4f | |
| parent | 6944311688015ad293bd788ce78f3226738ebf00 (diff) | |
Fix ASN1_TIME_to_generalizedtime to take a const ASN1_TIME
Fixes #1526
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3360)
| -rw-r--r-- | crypto/asn1/a_time.c | 2 | ||||
| -rw-r--r-- | include/openssl/asn1.h | 4 |
2 files changed, 3 insertions, 3 deletions
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 0bbdabab38..2e239f73bc 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); |