summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2020-01-13 12:15:38 +0000
committerDmitry Baryshkov <dbaryshkov@gmail.com>2020-01-13 12:15:38 +0000
commiteacd015f1157d465e254e96c9994aac4b66577ce (patch)
tree61d9865fb0c092f486b80b72ab2d67bad37ef8ce
parent0b2ceb2e945be38e8e64bd6ed7cdddca1ed0ac0b (diff)
parentb320b69b4e0ab77010116c2a56744321d0c3dfd2 (diff)
downloadgnutls-eacd015f1157d465e254e96c9994aac4b66577ce.tar.gz
Merge branch 'gost-prio-tests' into 'master'
tests/priorities: add tests for GOST ciphersuites enablement See merge request gnutls/gnutls!1166
-rw-r--r--lib/priority.c1
-rw-r--r--tests/priorities.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/priority.c b/lib/priority.c
index 71e0465767..565bf45ea5 100644
--- a/lib/priority.c
+++ b/lib/priority.c
@@ -299,6 +299,7 @@ static const int* kx_priority_secure = _kx_priority_secure;
static const int _kx_priority_gost[] = {
GNUTLS_KX_VKO_GOST_12,
+ 0,
};
static const int* kx_priority_gost = _kx_priority_gost;
diff --git a/tests/priorities.c b/tests/priorities.c
index 6daef59ab6..d53d7dfda8 100644
--- a/tests/priorities.c
+++ b/tests/priorities.c
@@ -138,6 +138,9 @@ void doit(void)
try_prio("NORMAL:-CIPHER-ALL:+NULL", null, 1, __LINE__); /* null */
try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL", null_normal_cs, 8, __LINE__); /* should be null + all */
try_prio("NORMAL:-CIPHER-ALL:+NULL:+CIPHER-ALL:-CIPHER-ALL:+AES-128-CBC", 4, 1, __LINE__); /* should be null + all */
+#ifdef ENABLE_GOST
+ try_prio("NONE:+VERS-TLS1.2:+GOST", 1, 1, __LINE__);
+#endif
}
try_prio("PERFORMANCE", normal_cs, normal_ciphers, __LINE__);