mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SSL: backed out changeset e7cb5deb951d, reimplemented properly.

Browse Source 
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().
This commit is contained in:
Maxim Dounin 2016-12-15 19:00:23 +03:00
parent 592dbcc315
commit 3294292b66
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event/ngx_event_openssl.c
View File

@ -4049,7 +4049,7 @@ ngx_ssl_parse_time(
ASN1_TIME *asn1time) ASN1_TIME *asn1time)
{ {
BIO *bio; BIO *bio;
u_char *value; char *value;
size_t len; size_t len;
time_t time; time_t time;
@ -4069,9 +4069,9 @@ ngx_ssl_parse_time(
BIO_write(bio, "Tue ", sizeof("Tue ") - 1); BIO_write(bio, "Tue ", sizeof("Tue ") - 1);
ASN1_TIME_print(bio, asn1time); ASN1_TIME_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); BIO_free(bio);

6
src/event/ngx_event_openssl_stapling.c
View File

@ -773,7 +773,7 @@ static time_t
ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time) ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time)
{ {
BIO *bio; BIO *bio;
u_char *value; char *value;
size_t len; size_t len;
time_t time; time_t time;
@ -793,9 +793,9 @@ ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time)
BIO_write(bio, "Tue ", sizeof("Tue ") - 1); BIO_write(bio, "Tue ", sizeof("Tue ") - 1);
ASN1_GENERALIZEDTIME_print(bio, asn1time); 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); BIO_free(bio);