From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 19 Jul 2018 11:19:07 +0000 (+0300)
Subject: certtool: use gnutls_gost_paramset_get_name
X-Git-Tag: gnutls_3_6_4~64^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00a7f22855845bf15fe6696d950d264ca5251fda;p=thirdparty%2Fgnutls.git

certtool: use gnutls_gost_paramset_get_name

gost_param_name() predates gnutls_gost_paramset_get_name() and
gnutls_gost_paramset_t. Use current API functions instead of hand-coding
new functions.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

diff --git a/src/certtool-common.c b/src/certtool-common.c
index 858de98163..19ec0c48c9 100644
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -907,25 +907,6 @@ print_ecc_pkey(FILE * outfile, gnutls_ecc_curve_t curve,
 	}
 }
 
-static const char *
-gost_param_name(int param)
-{
-	switch(param) {
-	case 0:
-		return "TC26-Z";
-	case 1:
-		return "CryptoPro-A";
-	case 2:
-		return "CryptoPro-B";
-	case 3:
-		return "CryptoPro-C";
-	case 4:
-		return "CryptoPro-D";
-	default:
-		return "unknown";
-	}
-}
-
 void
 print_gost_pkey(FILE * outfile, gnutls_ecc_curve_t curve,
 	       gnutls_digest_algorithm_t digest, gnutls_gost_paramset_t paramset,
@@ -948,10 +929,10 @@ print_gost_pkey(FILE * outfile, gnutls_ecc_curve_t curve,
 
 	if (cprint != 0)
 		fprintf(outfile, "/* paramset: %s */\n",
-			gost_param_name(paramset));
+			gnutls_gost_paramset_get_name(paramset));
 	else
 		fprintf(outfile, "paramset:\t%s\n",
-			gost_param_name(paramset));
+			gnutls_gost_paramset_get_name(paramset));
 
 	if (k) {
 		print_head(outfile, "private key", k->size, cprint);