sync with OpenBSD -current

This commit is contained in:
purplerain 2024-01-16 01:36:31 +00:00
parent 25aa71bc5f
commit 34a3d7e18a
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
32 changed files with 640 additions and 460 deletions

View file

@ -1,4 +1,4 @@
/* $OpenBSD: iked.c,v 1.66 2023/06/28 12:31:19 gerhard Exp $ */
/* $OpenBSD: iked.c,v 1.67 2024/01/15 15:29:00 tobhe Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@ -301,7 +301,6 @@ parent_configure(struct iked *env)
config_setstatic(env);
config_setcoupled(env, env->sc_decoupled ? 0 : 1);
config_setocsp(env);
config_setcertpartialchain(env);
/* Must be last */
config_setmode(env, env->sc_passive ? 1 : 0);
@ -334,7 +333,6 @@ parent_reload(struct iked *env, int reset, const char *filename)
config_setstatic(env);
config_setcoupled(env, env->sc_decoupled ? 0 : 1);
config_setocsp(env);
config_setcertpartialchain(env);
/* Must be last */
config_setmode(env, env->sc_passive ? 1 : 0);
} else {