peer-cfg: Renumber ocsp_policy_t values so the same default applies for all backends

Only the vici plugin previously set OCSP_SEND_REPLY explicitly, all other
backends would have defaulted to OCSP_SEND_BOTH.

References strongswan/strongswan#2016

diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c
index 2fb3ccfd6aa5c5e6de6aab4b478b1a8f5fe51696..4ccb5df1678534cb11fdc30204d6587ff6f25c7e 100644 (file)
--- a/src/libcharon/config/peer_cfg.c
+++ b/src/libcharon/config/peer_cfg.c
@@ -32,10 +32,10 @@ ENUM(cert_policy_names, CERT_ALWAYS_SEND, CERT_NEVER_SEND,
        "CERT_NEVER_SEND",
 );
 
-ENUM(ocsp_policy_names, OCSP_SEND_BOTH, OCSP_SEND_NEVER,
-       "OCSP_SEND_BOTH",
+ENUM(ocsp_policy_names, OCSP_SEND_REPLY, OCSP_SEND_NEVER,
        "OCSP_SEND_REPLY",
        "OCSP_SEND_REQUEST",
+       "OCSP_SEND_BOTH",
        "OCSP_SEND_NEVER",
 );
 

diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h
index 80f3584a524e8208bc8383eddb5ff457a481b449..69ea97e75b72b71c14a267b44814bf05b0516a46 100644 (file)
--- a/src/libcharon/config/peer_cfg.h
+++ b/src/libcharon/config/peer_cfg.h
@@ -66,12 +66,12 @@ extern enum_name_t *cert_policy_names;
  * OCSP status request/response sending policy.
  */
 enum ocsp_policy_t {
-       /** request OCSP status and reply to OCSP status requests */
-       OCSP_SEND_BOTH =     0,
        /** send OCSP status upon OCSP status request */
-       OCSP_SEND_REPLY =    1,
+       OCSP_SEND_REPLY =    0,
        /** send OCSP status request */
-       OCSP_SEND_REQUEST =  2,
+       OCSP_SEND_REQUEST =  1,
+       /** request OCSP status and reply to OCSP status requests */
+       OCSP_SEND_BOTH =     2,
        /** never send OCSP status request or response */
        OCSP_SEND_NEVER =    3,
 };