Mercurial > hg > nginx
changeset 6842:25d0d6dabe00
SSL: backed out changeset e7cb5deb951d, reimplemented properly.
Changeset e7cb5deb951d breaks build on CentOS 5 with "dereferencing
type-punned pointer will break strict-aliasing rules" warning. It is
backed out.
Instead, to keep builds with BoringSSL happy, type of the "value"
variable changed to "char *", and an explicit cast added before calling
ngx_parse_http_time().
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Thu, 15 Dec 2016 19:00:23 +0300 |
parents | e7cb5deb951d |
children | a3dc657f4e95 |
files | src/event/ngx_event_openssl.c src/event/ngx_event_openssl_stapling.c |
diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Tue Dec 13 14:19:30 2016 -0800 +++ b/src/event/ngx_event_openssl.c Thu Dec 15 19:00:23 2016 +0300 @@ -4049,7 +4049,7 @@ ASN1_TIME *asn1time) { BIO *bio; - u_char *value; + char *value; size_t len; time_t time; @@ -4069,9 +4069,9 @@ BIO_write(bio, "Tue ", sizeof("Tue ") - 1); ASN1_TIME_print(bio, asn1time); - len = BIO_get_mem_data(bio, (char **) &value); - - time = ngx_parse_http_time(value, len); + len = BIO_get_mem_data(bio, &value); + + time = ngx_parse_http_time((u_char *) value, len); BIO_free(bio);
--- a/src/event/ngx_event_openssl_stapling.c Tue Dec 13 14:19:30 2016 -0800 +++ b/src/event/ngx_event_openssl_stapling.c Thu Dec 15 19:00:23 2016 +0300 @@ -773,7 +773,7 @@ ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time) { BIO *bio; - u_char *value; + char *value; size_t len; time_t time; @@ -793,9 +793,9 @@ BIO_write(bio, "Tue ", sizeof("Tue ") - 1); ASN1_GENERALIZEDTIME_print(bio, asn1time); - len = BIO_get_mem_data(bio, (char **) &value); + len = BIO_get_mem_data(bio, &value); - time = ngx_parse_http_time(value, len); + time = ngx_parse_http_time((u_char *) value, len); BIO_free(bio);