summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2017-04-05 11:08:09 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2017-04-06 12:57:07 +0200
commit5df1e18459ee78d134c4d150b00b8ce74c7ef6ed (patch)
tree7d15a544067d5b0c828f315c554d2076299ae72f
parent4c36ab93e19f4a817902571a98f70354b06ca1ef (diff)
downloadgnutls-5df1e18459ee78d134c4d150b00b8ce74c7ef6ed.tar.gz
tests: added PKCS#12 unit test with AES file
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r--tests/cert-tests/Makefile.am2
-rw-r--r--tests/cert-tests/data/aes-128.p12bin0 -> 1485 bytes
-rwxr-xr-xtests/cert-tests/pkcs124
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 1434f0d9b0..c7ce23231f 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST = data/ca-no-pathlen.pem data/no-ca-or-pathlen.pem data/aki-cert.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/pbes1-no-salt.p12 \
- templates/inhibit-anypolicy.tmpl data/inhibit-anypolicy.pem
+ templates/inhibit-anypolicy.tmpl data/inhibit-anypolicy.pem data/aes-128.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/aes-128.p12 b/tests/cert-tests/data/aes-128.p12
new file mode 100644
index 0000000000..b20fbb2e9f
--- /dev/null
+++ b/tests/cert-tests/data/aes-128.p12
Binary files differ
diff --git a/tests/cert-tests/pkcs12 b/tests/cert-tests/pkcs12
index f99b21b24b..12049c8fd0 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 "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
+for p12 in "aes-128.p12 Red%20Hat%20Enterprise%20Linux%207.4" "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')
@@ -59,7 +59,7 @@ for p12 in "pbes1-no-salt.p12 Red%20Hat%20Enterprise%20Linux%207.4" "no-salt.p12
fi
rc=$?
if test ${rc} != 0; then
- echo "NEON PKCS12 FATAL ${p12}"
+ echo "PKCS12 FATAL ${p12}"
exit 1
fi
done