upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-15 21:59:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUG/MINOR: acme: allow 'key' when generating cert
Some checks are pending
Contrib / build (push) Waiting to run
Details
alpine/musl / gcc (push) Waiting to run
Details
VTest / Generate Build Matrix (push) Waiting to run
Details
VTest / (push) Blocked by required conditions
Details
Windows / Windows, gcc, all features (push) Waiting to run
Details

Browse source 
Allow to use the 'key' keyword when 'crt' was generated with both a crt
and a key.

No backport needed.
This commit is contained in:
William Lallemand 2025-11-06 14:11:43 +01:00
parent 05036180d9
commit 094baa1cc0
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ssl_ckch.c
View file

@ -4779,9 +4779,9 @@ static int ckch_conf_load_key_or_generate(void *value, char *buf, struct ckch_st
errno = 0;
/* if ACME is enabled and the file does not exists, and no key was previously loaded generate the key */
if (s->conf.acme.id &&
(stat(path, &sb) == -1 && errno == ENOENT) &&
(!s->data->key)) {
s->data->key = acme_gen_tmp_pkey();
(stat(path, &sb) == -1 && errno == ENOENT)) {
if (!s->data->key)
s->data->key = acme_gen_tmp_pkey();
} else
#endif
{