mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-12-26 20:11:13 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: acme: copy the original ckch_store

Browse Source 
Copy the original ckch_store instead of creating a new one. This allows
to inherit the ckch_conf from the previous structure when doing a
ckchs_dup(). The ckch_conf contains the SAN for ACME.

Free the previous PKEY since it a new one is generated.
This commit is contained in:
William Lallemand 2025-04-11 23:52:07 +02:00
parent 5b85b81d84
commit 9505b5bdf0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/acme.c
View File

@ -1723,7 +1723,7 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
goto err;
}
newstore = ckch_store_new(store->path);
newstore = ckchs_dup(store);
if (!newstore) {
memprintf(&err, "Out of memory.\n");
goto err;
@ -1769,6 +1769,7 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
EVP_PKEY_CTX_free(pkey_ctx);
EVP_PKEY_free(newstore->data->key);
newstore->data->key = pkey;
ctx->req = acme_x509_req(pkey, store->conf.acme.domains);
@ -1777,8 +1778,6 @@ static int cli_acme_renew_parse(char **args, char *payload, struct appctx *appct
goto err;
}
/* XXX: must implement a real copy */
newstore->conf = store->conf;
ctx->store = newstore;
ctx->cfg = cfg;