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

BUG/MINOR: ssl/cli: fix build for openssl < 1.0.2

Browse Source 
Commit d4f946c ("MINOR: ssl/cli: 'show ssl cert' give information on the
certificates") introduced a build issue with openssl version < 1.0.2
because it uses the certificate bundles.
This commit is contained in:
William Lallemand 2019-12-18 20:36:01 +01:00 committed by William Lallemand
parent d4f946c469
commit ba22e901b3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl_sock.c
View File

@ -10200,6 +10200,7 @@ static int cli_io_handler_show_cert(struct appctx *appctx)
chunk_appendf(trash, "# transaction\n"); chunk_appendf(trash, "# transaction\n");
if (!ckchs->multi) { if (!ckchs->multi) {
chunk_appendf(trash, "*%s\n", ckchs->path); chunk_appendf(trash, "*%s\n", ckchs->path);
#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL
} else { } else {
chunk_appendf(trash, "*%s:", ckchs->path); chunk_appendf(trash, "*%s:", ckchs->path);
for (n = 0; n < SSL_SOCK_NUM_KEYTYPES; n++) { for (n = 0; n < SSL_SOCK_NUM_KEYTYPES; n++) {
@ -10207,6 +10208,7 @@ static int cli_io_handler_show_cert(struct appctx *appctx)
chunk_appendf(trash, " %s.%s\n", ckchs->path, SSL_SOCK_KEYTYPE_NAMES[n]); chunk_appendf(trash, " %s.%s\n", ckchs->path, SSL_SOCK_KEYTYPE_NAMES[n]);
} }
chunk_appendf(trash, "\n"); chunk_appendf(trash, "\n");
#endif
} }
} }
} }
@ -10221,6 +10223,7 @@ static int cli_io_handler_show_cert(struct appctx *appctx)
ckchs = ebmb_entry(node, struct ckch_store, node); ckchs = ebmb_entry(node, struct ckch_store, node);
if (!ckchs->multi) { if (!ckchs->multi) {
chunk_appendf(trash, "%s\n", ckchs->path); chunk_appendf(trash, "%s\n", ckchs->path);
#if HA_OPENSSL_VERSION_NUMBER >= 0x1000200fL
} else { } else {
chunk_appendf(trash, "%s:", ckchs->path); chunk_appendf(trash, "%s:", ckchs->path);
for (n = 0; n < SSL_SOCK_NUM_KEYTYPES; n++) { for (n = 0; n < SSL_SOCK_NUM_KEYTYPES; n++) {
@ -10228,6 +10231,7 @@ static int cli_io_handler_show_cert(struct appctx *appctx)
chunk_appendf(trash, " %s.%s", ckchs->path, SSL_SOCK_KEYTYPE_NAMES[n]); chunk_appendf(trash, " %s.%s", ckchs->path, SSL_SOCK_KEYTYPE_NAMES[n]);
} }
chunk_appendf(trash, "\n"); chunk_appendf(trash, "\n");
#endif
} }
node = ebmb_next(node); node = ebmb_next(node);