diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2025-07-08 17:59:50 +0400 |
|---|---|---|
| committer | pluknet <pluknet@nginx.com> | 2025-07-10 19:00:45 +0400 |
| commit | a5d60c30d3d494291dd7e2ddde4536a439bab5bf (patch) | |
| tree | afb2098cac3866fbe725694ad8d3ec13606886a4 | |
| parent | 0bb7489cb2fcc60ce24fae2d5581c7441bfa0931 (diff) | |
| download | nginx-a5d60c30d3d494291dd7e2ddde4536a439bab5bf.tar.gz nginx-a5d60c30d3d494291dd7e2ddde4536a439bab5bf.tar.bz2 | |
SSL: SSL_group_to_name() compatibility macro.
No functional changes.
| -rw-r--r-- | src/event/ngx_event_openssl.c | 12 | ||||
| -rw-r--r-- | src/event/ngx_event_openssl.h | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index a7b389444..fc7f26655 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -5055,11 +5055,7 @@ ngx_ssl_get_curve(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) 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 @@ ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) 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 @@ ngx_ssl_get_curves(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s) 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); diff --git a/src/event/ngx_event_openssl.h b/src/event/ngx_event_openssl.h index 9e68deb44..61ce16dab 100644 --- a/src/event/ngx_event_openssl.h +++ b/src/event/ngx_event_openssl.h @@ -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; |