diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-04 14:54:15 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-08-04 14:56:04 +0200 |
| commit | a5196b00edd74f514cc3d797b129528e1b3bfa41 (patch) | |
| tree | c6b5b2340ca4355658e084644b48e75cbe3d2771 /tests | |
| parent | 777e64d8c46e75388af4a266cf15b13e3bf7659d (diff) | |
| download | gnutls-a5196b00edd74f514cc3d797b129528e1b3bfa41.tar.gz | |
certtool: improved PKCS #8 information printing
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pkcs8-decode/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/pkcs8-decode/openssl-3des.p8.txt | 12 | ||||
| -rw-r--r-- | tests/pkcs8-decode/openssl-aes128.p8.txt | 12 | ||||
| -rw-r--r-- | tests/pkcs8-decode/openssl-aes256.p8.txt | 12 | ||||
| -rwxr-xr-x | tests/pkcs8-decode/pkcs8 | 12 |
5 files changed, 30 insertions, 19 deletions
diff --git a/tests/pkcs8-decode/Makefile.am b/tests/pkcs8-decode/Makefile.am index 7e308b1cbc..d272bd9cf2 100644 --- a/tests/pkcs8-decode/Makefile.am +++ b/tests/pkcs8-decode/Makefile.am @@ -30,5 +30,6 @@ TESTS = pkcs8 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ LC_ALL="C" \ + VALGRIND="$(VALGRIND)" \ top_builddir="$(top_builddir)" \ srcdir="$(srcdir)" diff --git a/tests/pkcs8-decode/openssl-3des.p8.txt b/tests/pkcs8-decode/openssl-3des.p8.txt index c2896bb54c..b2f20fa3bc 100644 --- a/tests/pkcs8-decode/openssl-3des.p8.txt +++ b/tests/pkcs8-decode/openssl-3des.p8.txt @@ -1,5 +1,7 @@ -Cipher: 3DES-CBC -Schema: PBES2-3DES-CBC (1.2.840.113549.3.7) -Salt: ef831a6bbb25ed2c -Salt size: 8 -Iteration count: 2048 +PKCS #8 information: + Cipher: 3DES-CBC + Schema: PBES2-3DES-CBC (1.2.840.113549.3.7) + Salt: ef831a6bbb25ed2c + Salt size: 8 + Iteration count: 2048 + diff --git a/tests/pkcs8-decode/openssl-aes128.p8.txt b/tests/pkcs8-decode/openssl-aes128.p8.txt index 9786d1674c..a7fa89c477 100644 --- a/tests/pkcs8-decode/openssl-aes128.p8.txt +++ b/tests/pkcs8-decode/openssl-aes128.p8.txt @@ -1,5 +1,7 @@ -Cipher: AES-128-CBC -Schema: PBES2-AES128-CBC (2.16.840.1.101.3.4.1.2) -Salt: 2fe159cbcb050867 -Salt size: 8 -Iteration count: 2048 +PKCS #8 information: + Cipher: AES-128-CBC + Schema: PBES2-AES128-CBC (2.16.840.1.101.3.4.1.2) + Salt: 2fe159cbcb050867 + Salt size: 8 + Iteration count: 2048 + diff --git a/tests/pkcs8-decode/openssl-aes256.p8.txt b/tests/pkcs8-decode/openssl-aes256.p8.txt index 312d50499e..5a1d3806f0 100644 --- a/tests/pkcs8-decode/openssl-aes256.p8.txt +++ b/tests/pkcs8-decode/openssl-aes256.p8.txt @@ -1,5 +1,7 @@ -Cipher: AES-256-CBC -Schema: PBES2-AES256-CBC (2.16.840.1.101.3.4.1.42) -Salt: 8aea7595ea8860bd -Salt size: 8 -Iteration count: 2048 +PKCS #8 information: + Cipher: AES-256-CBC + Schema: PBES2-AES256-CBC (2.16.840.1.101.3.4.1.42) + Salt: 8aea7595ea8860bd + Salt size: 8 + Iteration count: 2048 + diff --git a/tests/pkcs8-decode/pkcs8 b/tests/pkcs8-decode/pkcs8 index 446c4c95ff..041a59bedb 100755 --- a/tests/pkcs8-decode/pkcs8 +++ b/tests/pkcs8-decode/pkcs8 @@ -24,13 +24,17 @@ srcdir=${srcdir:-.} CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT} DIFF=${DIFF:-diff} +if ! test -z "${VALGRIND}";then +VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND}" +fi + ret=0 for p8 in 'encpkcs8.pem foobar' unencpkcs8.pem 'enc2pkcs8.pem baz'; do set -- $p8 file=$1 passwd=$2 - $CERTTOOL --key-info --pkcs8 --password "$passwd" \ - --infile $srcdir/$file | tee out >/dev/null 2>&1 + $VALGRIND $CERTTOOL --key-info --pkcs8 --password "$passwd" \ + --infile $srcdir/$file | tee out >/dev/null rc=$? if test $rc != 0; then cat out @@ -46,8 +50,8 @@ for p8 in openssl-aes128.p8 openssl-aes256.p8 openssl-3des.p8; do set -- $p8 file=$1 passwd=$2 - $CERTTOOL --p8-info --password "1234" \ - --infile $srcdir/$file | tee out >/dev/null 2>&1 + $VALGRIND $CERTTOOL --p8-info --password "1234" \ + --infile $srcdir/$file | tee out >/dev/null rc=$? if test $rc != 0; then cat out |