mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-07 07:37:02 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: fix indentation in smp_fetch_ssl_fc_ec()

Browse Source 
Fix indentation in smp_fetch_ssl_fc_ec() since it is using exclusively
spaces.

Could be backported if a fix depends on it.
This commit is contained in:
William Lallemand 2024-01-09 11:42:51 +01:00
parent 25da2174c6
commit 9a21b4b435
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/ssl_sample.c
View File

@ -1315,31 +1315,31 @@ smp_fetch_ssl_fc_is_resumed(const struct arg *args, struct sample *smp, const ch
static int static int
smp_fetch_ssl_fc_ec(const struct arg *args, struct sample *smp, const char *kw, void *private) smp_fetch_ssl_fc_ec(const struct arg *args, struct sample *smp, const char *kw, void *private)
{ {
struct connection *conn; struct connection *conn;
SSL *ssl; SSL *ssl;
int __maybe_unused nid; int __maybe_unused nid;
char *curve_name; char *curve_name;
if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK) if (obj_type(smp->sess->origin) == OBJ_TYPE_CHECK)
conn = (kw[4] == 'b') ? sc_conn(__objt_check(smp->sess->origin)->sc) : NULL; conn = (kw[4] == 'b') ? sc_conn(__objt_check(smp->sess->origin)->sc) : NULL;
else else
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? sc_conn(smp->strm->scb) : NULL; smp->strm ? sc_conn(smp->strm->scb) : NULL;
ssl = ssl_sock_get_ssl_object(conn); ssl = ssl_sock_get_ssl_object(conn);
if (!ssl) if (!ssl)
return 0; return 0;
/* /*
* SSL_get0_group_name is a function to get the curve name and is available from * SSL_get0_group_name is a function to get the curve name and is available from
* OpenSSL v3.2 onwards. For OpenSSL >=3.0 and <3.2, we will continue to use * OpenSSL v3.2 onwards. For OpenSSL >=3.0 and <3.2, we will continue to use
* SSL_get_negotiated_group to get the curve name. * SSL_get_negotiated_group to get the curve name.
*/ */
#if (HA_OPENSSL_VERSION_NUMBER >= 0x3020000fL) # if (HA_OPENSSL_VERSION_NUMBER >= 0x3020000fL)
curve_name = (char *)SSL_get0_group_name(ssl); curve_name = (char *)SSL_get0_group_name(ssl);
if (curve_name == NULL) if (curve_name == NULL) {
return 0; return 0;
else { } else {
/** /**
* The curve name returned by SSL_get0_group_name is in lowercase whereas the curve * The curve name returned by SSL_get0_group_name is in lowercase whereas the curve
* name returned when we use `SSL_get_negotiated_group` and `OBJ_nid2sn` is the * name returned when we use `SSL_get_negotiated_group` and `OBJ_nid2sn` is the