diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-16 08:04:36 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2018-11-16 08:04:36 +0000 |
| commit | 0f3dca28c5597a2813cad4ccc7770291230b3c95 (patch) | |
| tree | 28a0ab65e95a0eaeeea4049f7f41a04f24d262fc /src | |
| parent | 7e488b042f408c6f934c6b198d7c5d3a27e3bdb6 (diff) | |
| parent | 7f87410c279338228c4caeeb1eca7a086a717e7e (diff) | |
| download | gnutls-0f3dca28c5597a2813cad4ccc7770291230b3c95.tar.gz | |
Merge branch 'gost-raw-privkeys' into 'master'
Improve support of GOST private keys parsing
See merge request gnutls/gnutls!802
Diffstat (limited to 'src')
| -rw-r--r-- | src/certtool-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/certtool-common.c b/src/certtool-common.c index acd314a0ac..893e17f276 100644 --- a/src/certtool-common.c +++ b/src/certtool-common.c @@ -1174,6 +1174,8 @@ int cipher_to_flags(const char *cipher) return GNUTLS_PKCS_USE_PBES2_GOST_CPC; } else if (strcasecmp(cipher, "gost28147-cpd") == 0) { return GNUTLS_PKCS_USE_PBES2_GOST_CPD; + } else if (strcasecmp(cipher, "none") == 0) { + return GNUTLS_PKCS_PLAIN; } fprintf(stderr, "unknown cipher %s\n", cipher); |