diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-20 14:34:16 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-07-20 14:34:16 +0000 |
| commit | bde141b3701ed8a9ed582348301cde5223a955ab (patch) | |
| tree | a2cb5fb82e1e713478f5b9caa8365d8cb0727af6 | |
| parent | cd6ecb193334d6f37da04fe4b1650ba6675dc660 (diff) | |
| parent | 00a7f22855845bf15fe6696d950d264ca5251fda (diff) | |
| download | gnutls-bde141b3701ed8a9ed582348301cde5223a955ab.tar.gz | |
Merge branch 'certtool-gost-paramset' into 'master'
certtool: use gnutls_gost_paramset_get_name
See merge request gnutls/gnutls!710
| -rw-r--r-- | src/certtool-common.c | 23 |
1 files changed, 2 insertions, 21 deletions
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); |