From: William Lallemand <wlallemand@haproxy.com>
Date: Wed, 25 Mar 2020 19:20:26 +0000 (+0100)
Subject: REORG: ssl: move SETCERT enum to ssl_sock.h
X-Git-Tag: v2.2-dev6~70
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ad3c37b760db8dd4c0780978244d7f4f2bfbf582;p=thirdparty%2Fhaproxy.git

REORG: ssl: move SETCERT enum to ssl_sock.h

Move the SETCERT enum at the right place to cleanup ssl_sock.c.
---

diff --git a/include/types/ssl_sock.h b/include/types/ssl_sock.h
index add74544d1..e5d676db89 100644
--- a/include/types/ssl_sock.h
+++ b/include/types/ssl_sock.h
@@ -91,6 +91,14 @@ struct sh_ssl_sess_hdr {
 	unsigned char key_data[SSL_MAX_SSL_SESSION_ID_LENGTH];
 };
 
+/* states of the CLI IO handler for 'set ssl cert' */
+enum {
+	SETCERT_ST_INIT = 0,
+	SETCERT_ST_GEN,
+	SETCERT_ST_INSERT,
+	SETCERT_ST_FIN,
+};
+
 /* This is used to preload the certifcate, private key
  * and Cert Chain of a file passed in via the crt
  * argument
diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 1207e9c710..f21c4b9d38 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -11161,13 +11161,6 @@ struct {
 	[CERT_TYPE_MAX]    = { NULL,      CERT_TYPE_MAX,      NULL },
 };
 
-/* states of the CLI IO handler for 'set ssl cert' */
-enum {
-	SETCERT_ST_INIT = 0,
-	SETCERT_ST_GEN,
-	SETCERT_ST_INSERT,
-	SETCERT_ST_FIN,
-};
 
 /* release function of the  `show ssl cert' command */
 static void cli_release_show_cert(struct appctx *appctx)