mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 22:01:31 +02:00
Code Issues Projects Releases Wiki Activity

CLEANUP: ssl: fix indentation in smp_fetch_ssl_fc_ec() (part 2)

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

This should have been in previous 9a21b4b43 patch but was missed by
accident.

Could be backported if a fix depends on it.
This commit is contained in:
William Lallemand 2024-01-09 15:24:29 +01:00
parent b6c1f5c7d9
commit 0773826645
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/ssl_sample.c
View File

@ -1340,34 +1340,34 @@ smp_fetch_ssl_fc_ec(const struct arg *args, struct sample *smp, const char *kw,
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
* short name and is in upper case. To make the return value consistent across the * short name and is in upper case. To make the return value consistent across the
* different functional calls and to make it consistent while upgrading OpenSSL versions, * different functional calls and to make it consistent while upgrading OpenSSL versions,
* will convert the curve name returned by SSL_get0_group_name to upper case. * will convert the curve name returned by SSL_get0_group_name to upper case.
*/ */
for (int i = 0; curve_name[i]; i++) for (int i = 0; curve_name[i]; i++)
curve_name[i] = toupper(curve_name[i]); curve_name[i] = toupper(curve_name[i]);
} }
#else # else
nid = SSL_get_negotiated_group(ssl); nid = SSL_get_negotiated_group(ssl);
if (!nid) if (!nid)
return 0; return 0;
curve_name = (char *)OBJ_nid2sn(nid); curve_name = (char *)OBJ_nid2sn(nid);
if (curve_name == NULL) if (curve_name == NULL)
return 0; return 0;
#endif # endif
smp->data.u.str.area = curve_name; smp->data.u.str.area = curve_name;
if (!smp->data.u.str.area) if (!smp->data.u.str.area)
return 0; return 0;
smp->data.type = SMP_T_STR; smp->data.type = SMP_T_STR;
smp->flags |= SMP_F_VOL_SESS | SMP_F_CONST; smp->flags |= SMP_F_VOL_SESS | SMP_F_CONST;
smp->data.u.str.data = strlen(smp->data.u.str.area); smp->data.u.str.data = strlen(smp->data.u.str.area);
return 1; return 1;
} }
#endif #endif