summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2017-08-29 17:44:10 +0300
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2018-06-23 12:20:16 +0300
commit1746bbcd41005733385dc980c94d911f5a0347a5 (patch)
treee5ad71a614029a0e4c5af62d315d371c0875cb30
parentd2fde63f9d92acb61f77ce541000a58543e13ba5 (diff)
downloadgnutls-1746bbcd41005733385dc980c94d911f5a0347a5.tar.gz
tests: privkey-keygen: adapt to support GOST algorithms
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r--tests/privkey-keygen.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/privkey-keygen.c b/tests/privkey-keygen.c
index 7762938dcf..85f803a6b3 100644
--- a/tests/privkey-keygen.c
+++ b/tests/privkey-keygen.c
@@ -67,6 +67,12 @@ static void sign_verify_data(gnutls_pk_algorithm_t algorithm, gnutls_x509_privke
if (algorithm == GNUTLS_PK_EDDSA_ED25519)
digest = GNUTLS_DIG_SHA512;
+ else if (algorithm == GNUTLS_PK_GOST_01)
+ digest = GNUTLS_DIG_GOSTR_94;
+ else if (algorithm == GNUTLS_PK_GOST_12_256)
+ digest = GNUTLS_DIG_STREEBOG_256;
+ else if (algorithm == GNUTLS_PK_GOST_12_512)
+ digest = GNUTLS_DIG_STREEBOG_512;
else
digest = GNUTLS_DIG_SHA256;
@@ -119,12 +125,13 @@ void doit(void)
algorithm == GNUTLS_PK_ECDH_X25519)
continue;
- /* Unsupported for now */
- if (algorithm == GNUTLS_PK_GOST_01 ||
- algorithm == GNUTLS_PK_GOST_12_256 ||
- algorithm == GNUTLS_PK_GOST_12_512)
+ if (gnutls_fips140_mode_enabled() &&
+ (algorithm == GNUTLS_PK_GOST_01 ||
+ algorithm == GNUTLS_PK_GOST_12_256 ||
+ algorithm == GNUTLS_PK_GOST_12_512))
continue;
+
ret = gnutls_x509_privkey_init(&pkey);
if (ret < 0) {
fail("gnutls_x509_privkey_init: %d\n",