diff options
| author | Daiki Ueno <ueno@gnu.org> | 2022-01-14 10:08:48 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2022-01-14 10:08:48 +0000 |
| commit | 6fa472075e7b8e4fb51d089eaee4ed2094e7335b (patch) | |
| tree | 132d2cc887123779668d982a80d6960841837055 /lib | |
| parent | a9761c4dae23f99c8cf964b08fc3c3cff9cfbb5e (diff) | |
| parent | 69aebb8d928a473693cfa337bd8d682a4eb852ff (diff) | |
| download | gnutls-6fa472075e7b8e4fb51d089eaee4ed2094e7335b.tar.gz | |
Merge branch 'wip/dueno/gost-pkcs12' into 'master'
pkcs12: use the correct MAC algorithm for GOST key generation
Closes #1225
See merge request gnutls/gnutls!1514
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/x509/pkcs7-crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/x509/pkcs7-crypt.c b/lib/x509/pkcs7-crypt.c index e714861bfe..4cce52ecf0 100644 --- a/lib/x509/pkcs7-crypt.c +++ b/lib/x509/pkcs7-crypt.c @@ -1569,7 +1569,7 @@ _gnutls_pkcs_generate_key(schema_id schema, if (p->pbes2 != 0) { if (p->schema == PBES2_GOST28147_89_TC26Z) - kdf_params->mac = GNUTLS_MAC_STREEBOG_256; + kdf_params->mac = GNUTLS_MAC_STREEBOG_512; else if (p->schema == PBES2_GOST28147_89_CPA || p->schema == PBES2_GOST28147_89_CPB || p->schema == PBES2_GOST28147_89_CPC || |