diff options
| author | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-10-13 13:13:44 +0000 |
| commit | bf91c4c8d50ba6fc9ab06f79b02c01389e337c5e (patch) | |
| tree | 8b049d4ed261e45fc7d68c210a9c7ad58650c3d5 /tests/openpgp/conventional.test | |
| parent | gpg: Remove all support for v3 keys and always create v4-signatures. (diff) | |
| parent | gpg: Remove extra RSA import status line. (diff) | |
| download | gnupg-wk/test-master.tar.gz gnupg-wk/test-master.zip | |
Merge branch 'master' into wk/test-masterwk/test-master
Diffstat (limited to 'tests/openpgp/conventional.test')
| -rwxr-xr-x | tests/openpgp/conventional.test | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tests/openpgp/conventional.test b/tests/openpgp/conventional.test index 5028b2934..30c9ba042 100755 --- a/tests/openpgp/conventional.test +++ b/tests/openpgp/conventional.test @@ -10,19 +10,23 @@ . $srcdir/defs.inc || exit 3 +# We use use a lower than default value for the S2K count to run the +# tests faster. We used a fixed value of 65536 already the past. +s2k="--s2k-count=65536" + #info Checking conventional encryption for i in plain-2 data-32000 ; do - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -c -o x --yes $i + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x cmp $i y || error "$i: mismatch" done for a in `all_cipher_algos`; do progress "$a" for i in plain-1 data-80000 ; do - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \ + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \ --cipher-algo $a -c -o x --yes $i - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x cmp $i y || error "$i: ($a) mismatch" done done |