Mercurial > nginx
changeset 9430:644e6351d996
SSL: SSL_group_to_name() compatibility macro.
No functional changes.
| author | Sergey Kandaurov <pluknet@nginx.com> |
|---|---|
| date | Tue, 08 Jul 2025 17:59:50 +0400 |
| parents | ceb120f18bab |
| children | b18e6a6bb729 |
| files | src/event/ngx_event_openssl.c src/event/ngx_event_openssl.h |
| diffstat | 2 files changed, 5 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c Sun Jun 22 20:40:05 2025 +0400 +++ b/src/event/ngx_event_openssl.c Tue Jul 08 17:59:50 2025 +0400 @@ -5055,11 +5055,7 @@ return NGX_OK; } -#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL) name = SSL_group_to_name(c->ssl->connection, nid); -#else - name = NULL; -#endif s->len = name ? ngx_strlen(name) : sizeof("0x0000") - 1; s->data = ngx_pnalloc(pool, s->len); @@ -5113,11 +5109,7 @@ nid = curves[i]; if (nid & TLSEXT_nid_unknown) { -#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL) name = SSL_group_to_name(c->ssl->connection, nid); -#else - name = NULL; -#endif len += name ? ngx_strlen(name) : sizeof("0x0000") - 1; @@ -5139,11 +5131,7 @@ nid = curves[i]; if (nid & TLSEXT_nid_unknown) { -#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL) name = SSL_group_to_name(c->ssl->connection, nid); -#else - name = NULL; -#endif p = name ? ngx_cpymem(p, name, ngx_strlen(name)) : ngx_sprintf(p, "0x%04xd", nid & 0xffff);
--- a/src/event/ngx_event_openssl.h Sun Jun 22 20:40:05 2025 +0400 +++ b/src/event/ngx_event_openssl.h Tue Jul 08 17:59:50 2025 +0400 @@ -96,6 +96,11 @@ #endif +#if (OPENSSL_VERSION_NUMBER < 0x3000000fL) +#define SSL_group_to_name(s, nid) NULL +#endif + + typedef struct ngx_ssl_ocsp_s ngx_ssl_ocsp_t;