priority: compile out GOST algorithms IDs if they are disabled

When compiled with --disable-gost, gnutls-cli --priority NORMAL --list
still prints GOST algorithms for ciphers, MACs, and signatures.  This
change adds compile time checks to suppress them.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/priority.c b/lib/priority.c
index 54d7b1bb45a59009515730d0be90c5726ff1cf8c..0c7ac65d7b67d47feeb7b60d8627132fbe760494 100644 (file)
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -309,7 +309,9 @@ static const int _kx_priority_secure[] = {
 static const int* kx_priority_secure = _kx_priority_secure;
 
 static const int _kx_priority_gost[] = {
+#ifdef ENABLE_GOST
        GNUTLS_KX_VKO_GOST_12,
+#endif
        0,
 };
 static const int* kx_priority_gost = _kx_priority_gost;
@@ -507,9 +509,10 @@ static const int _sign_priority_secure192[] = {
 static const int* sign_priority_secure192 = _sign_priority_secure192;
 
 static const int _sign_priority_gost[] = {
+#ifdef ENABLE_GOST
        GNUTLS_SIGN_GOST_256,
        GNUTLS_SIGN_GOST_512,
-
+#endif
        0
 };
 static const int* sign_priority_gost = _sign_priority_gost;
@@ -531,13 +534,17 @@ static const int *cipher_priority_normal = _cipher_priority_normal_default;
 static const int *mac_priority_normal = mac_priority_normal_default;
 
 static const int _cipher_priority_gost[] = {
+#ifdef ENABLE_GOST
        GNUTLS_CIPHER_GOST28147_TC26Z_CNT,
+#endif
        0
 };
 static const int *cipher_priority_gost = _cipher_priority_gost;
 
 static const int _mac_priority_gost[] = {
+#ifdef ENABLE_GOST
        GNUTLS_MAC_GOST28147_TC26Z_IMIT,
+#endif
        0
 };
 static const int *mac_priority_gost = _mac_priority_gost;