diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-04-04 15:22:06 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-04-04 16:40:15 +0200 |
| commit | 809631ddc7612d41d90e69967c644c1dcb1c9e3b (patch) | |
| tree | 444c4870c909f06e375f7288caf1eb512c373e13 | |
| parent | 170f6a4c1e50d98525b2bd4bc13db1749a7d3ca2 (diff) | |
| download | gnutls-tmp-pkcs12-zero-salt-fix.tar.gz | |
tests: added unit test for PKCS#12 with file that uses PBES1 with no salttmp-pkcs12-zero-salt-fix
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
| -rw-r--r-- | tests/cert-tests/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/cert-tests/data/pbes1-no-salt.p12 | bin | 0 -> 2424 bytes | |||
| -rwxr-xr-x | tests/cert-tests/pkcs12 | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index 521bf89339..7df8788330 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -70,7 +70,7 @@ EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.pem data/chain-with-critical-on-intermediate.pem data/chain-with-critical-on-endcert.pem \ templates/crit-extensions.tmpl data/crit-extensions.pem data/x509-with-zero-version.pem \ data/key-corpus-rc2-1.p12 data/key-corpus-rc2-2.p12 data/key-corpus-rc2-3.p12 \ - data/key-corpus-rc2-1.p12.out data/no-salt.p12 data/mac-sha512.p12 + data/key-corpus-rc2-1.p12.out data/no-salt.p12 data/mac-sha512.p12 data/pbes1-no-salt.p12 dist_check_SCRIPTS = pathlen aki certtool invalid-sig email \ pkcs7 pkcs7-broken-sigs privkey-import name-constraints certtool-long-cn crl provable-privkey \ diff --git a/tests/cert-tests/data/pbes1-no-salt.p12 b/tests/cert-tests/data/pbes1-no-salt.p12 Binary files differnew file mode 100644 index 0000000000..012406251e --- /dev/null +++ b/tests/cert-tests/data/pbes1-no-salt.p12 diff --git a/tests/cert-tests/pkcs12 b/tests/cert-tests/pkcs12 index a1639c0c7f..f99b21b24b 100755 --- a/tests/cert-tests/pkcs12 +++ b/tests/cert-tests/pkcs12 @@ -45,7 +45,7 @@ TMPFILE_PEM=pkcs12.$$.pem.tmp DEBUG="1" -for p12 in "no-salt.p12 Red%20Hat%20Enterprise%20Linux%207.4" "mac-sha512.p12 Red%20Hat%20Enterprise%20Linux%207.4" "cert-with-crl.p12 password" "client.p12 foobar" "openssl.p12 CaudFocwijRupogDoicsApfiHadManUgNa" "noclient.p12" "unclient.p12" "pkcs12_2certs.p12"; do +for p12 in "pbes1-no-salt.p12 Red%20Hat%20Enterprise%20Linux%207.4" "no-salt.p12 Red%20Hat%20Enterprise%20Linux%207.4" "mac-sha512.p12 Red%20Hat%20Enterprise%20Linux%207.4" "cert-with-crl.p12 password" "client.p12 foobar" "openssl.p12 CaudFocwijRupogDoicsApfiHadManUgNa" "noclient.p12" "unclient.p12" "pkcs12_2certs.p12"; do set -- ${p12} file="$1" passwd=$(echo $2|sed 's/%20/ /g') |