From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 25 Aug 2020 11:35:54 +0000 (+0200)
Subject: tls-hkdf: Make labels enum a proper type
X-Git-Tag: 5.9.2rc1~23^2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fff1974012df309b0483021941557f3ddf4155c7;p=thirdparty%2Fstrongswan.git

tls-hkdf: Make labels enum a proper type
---

diff --git a/src/libtls/tls_hkdf.c b/src/libtls/tls_hkdf.c
index d0c44f5585..682dd2fb54 100644
--- a/src/libtls/tls_hkdf.c
+++ b/src/libtls/tls_hkdf.c
@@ -356,7 +356,7 @@ METHOD(tls_hkdf_t, set_shared_secret, void,
 }
 
 METHOD(tls_hkdf_t, generate_secret, bool,
-	private_tls_hkdf_t *this, enum tls_hkdf_labels_t label, chunk_t messages,
+	private_tls_hkdf_t *this, tls_hkdf_label_t label, chunk_t messages,
 	chunk_t *secret)
 {
 	switch (label)
diff --git a/src/libtls/tls_hkdf.h b/src/libtls/tls_hkdf.h
index a820b02982..2f56a04f16 100644
--- a/src/libtls/tls_hkdf.h
+++ b/src/libtls/tls_hkdf.h
@@ -25,12 +25,13 @@
 #include <library.h>
 #include <crypto/hashers/hasher.h>
 
+typedef enum tls_hkdf_label_t tls_hkdf_label_t;
 typedef struct tls_hkdf_t tls_hkdf_t;
 
 /**
  * TLS HKDF labels
  */
-enum tls_hkdf_labels_t {
+enum tls_hkdf_label_t {
 	TLS_HKDF_EXT_BINDER,
 	TLS_HKDF_RES_BINDER,
 	TLS_HKDF_C_E_TRAFFIC,
@@ -65,7 +66,7 @@ struct tls_hkdf_t {
 	 * @param secret			secret will be written into this chunk, if used
 	 * @return					TRUE if secrets derived successfully
 	 */
-	bool (*generate_secret)(tls_hkdf_t *this, enum tls_hkdf_labels_t label,
+	bool (*generate_secret)(tls_hkdf_t *this, tls_hkdf_label_t label,
 							chunk_t messages, chunk_t *secret);
 
 	/**