mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-22 04:10:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SSL: SSL_group_to_name() compatibility macro.

Browse Source 
No functional changes.
This commit is contained in:
Sergey Kandaurov 2025-07-08 17:59:50 +04:00 committed by pluknet
parent 0bb7489cb2
commit a5d60c30d3
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/event/ngx_event_openssl.c
View File

@ -5055,11 +5055,7 @@ ngx_ssl_get_curve(ngx_connection_t *c, ngx_pool_t *pool, ngx_str_t *s)
return NGX_OK; return NGX_OK;
} }
#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL)
name = SSL_group_to_name(c->ssl->connection, nid); name = SSL_group_to_name(c->ssl->connection, nid);
#else
name = NULL;
#endif
s->len = name ? ngx_strlen(name) : sizeof("0x0000") - 1; s->len = name ? ngx_strlen(name) : sizeof("0x0000") - 1;
s->data = ngx_pnalloc(pool, s->len); 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]; nid = curves[i];
if (nid & TLSEXT_nid_unknown) { if (nid & TLSEXT_nid_unknown) {
#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL)
name = SSL_group_to_name(c->ssl->connection, nid); name = SSL_group_to_name(c->ssl->connection, nid);
#else
name = NULL;
#endif
len += name ? ngx_strlen(name) : sizeof("0x0000") - 1; 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]; nid = curves[i];
if (nid & TLSEXT_nid_unknown) { if (nid & TLSEXT_nid_unknown) {
#if (OPENSSL_VERSION_NUMBER >= 0x3000000fL)
name = SSL_group_to_name(c->ssl->connection, nid); name = SSL_group_to_name(c->ssl->connection, nid);
#else
name = NULL;
#endif
p = name ? ngx_cpymem(p, name, ngx_strlen(name)) p = name ? ngx_cpymem(p, name, ngx_strlen(name))
: ngx_sprintf(p, "0x%04xd", nid & 0xffff); : ngx_sprintf(p, "0x%04xd", nid & 0xffff);

5
src/event/ngx_event_openssl.h
View File

@ -96,6 +96,11 @@
#endif #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; typedef struct ngx_ssl_ocsp_s ngx_ssl_ocsp_t;