diff options
| author | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-01-20 21:41:47 +0000 |
|---|---|---|
| committer | Dmitry Baryshkov <dbaryshkov@gmail.com> | 2020-01-20 21:41:47 +0000 |
| commit | 564756ee10eae57fe23e8a31a463e30e89208217 (patch) | |
| tree | 406988e20963d1b5fea6763780b15ae7c394f06f | |
| parent | ad93addd6db2dfd703888b24f7a9948d1f593c90 (diff) | |
| parent | 6cebf4e042ac0f338a80121beff92ad120235407 (diff) | |
| download | gnutls-564756ee10eae57fe23e8a31a463e30e89208217.tar.gz | |
Merge branch 'fix-gost-pkcs12' into 'master'
pkcs12: use correct key length when using STREEBOG-512
See merge request gnutls/gnutls!1171
| -rw-r--r-- | lib/x509/pkcs12.c | 2 | ||||
| -rwxr-xr-x | tests/cert-tests/pkcs12-gost | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c index 200d1de908..8c3310d066 100644 --- a/lib/x509/pkcs12.c +++ b/lib/x509/pkcs12.c @@ -970,7 +970,7 @@ int gnutls_pkcs12_generate_mac2(gnutls_pkcs12_t pkcs12, gnutls_mac_algorithm_t m sizeof(salt), iter, pass, - mac_size, + key_len, key); } else #endif diff --git a/tests/cert-tests/pkcs12-gost b/tests/cert-tests/pkcs12-gost index ee9318f750..2b5b6bfd79 100755 --- a/tests/cert-tests/pkcs12-gost +++ b/tests/cert-tests/pkcs12-gost @@ -81,6 +81,20 @@ if test ${rc} != 0; then exit 1 fi +${VALGRIND} "${CERTTOOL}" --pkcs-cipher=gost28147-tc26z --hash streebog-512 --to-p12 --password "Пароль для PFX" --p12-name "my-key" --load-certificate "${srcdir}/../certs/cert-ecc256.pem" --load-privkey "${srcdir}/../certs/ecc256.pem" --load-ca-certificate "${srcdir}/../certs/ca-cert-ecc.pem" --outder --outfile $TMPFILE >/dev/null +rc=$? +if test ${rc} != 0; then + echo "PKCS12 FATAL encoding" + exit 1 +fi + +${VALGRIND} "${CERTTOOL}" --p12-info --inder --password "Пароль для PFX" --infile $TMPFILE >${TMPFILE_PEM} 2>/dev/null +rc=$? +if test ${rc} != 0; then + echo "PKCS12 FATAL decrypting/decoding" + exit 1 +fi + rm -f "$TMPFILE" "$TMPFILE_PEM" exit 0 |