diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-15 19:00:23 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-15 19:00:23 +0300 |
| commit | 3294292b667ffa9ad55c7bd2e59943bd6eca4a4d (patch) | |
| tree | 3187407d05e5d5a722fea2699b598a6b380b18b5 /src/event/ngx_event_openssl_stapling.c | |
| parent | 592dbcc3151e49f6ee0602812adcaa6ffa885317 (diff) | |
| download | nginx-3294292b667ffa9ad55c7bd2e59943bd6eca4a4d.tar.gz nginx-3294292b667ffa9ad55c7bd2e59943bd6eca4a4d.tar.bz2 | |
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().
Diffstat (limited to 'src/event/ngx_event_openssl_stapling.c')
| -rw-r--r-- | src/event/ngx_event_openssl_stapling.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/event/ngx_event_openssl_stapling.c b/src/event/ngx_event_openssl_stapling.c index 5e1eb502d..d332c112e 100644 --- a/src/event/ngx_event_openssl_stapling.c +++ b/src/event/ngx_event_openssl_stapling.c @@ -773,7 +773,7 @@ static time_t ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time) { BIO *bio; - u_char *value; + char *value; size_t len; time_t time; @@ -793,9 +793,9 @@ ngx_ssl_stapling_time(ASN1_GENERALIZEDTIME *asn1time) 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); |