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-mdc.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-mdc.test')
| -rwxr-xr-x | tests/openpgp/conventional-mdc.test | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/openpgp/conventional-mdc.test b/tests/openpgp/conventional-mdc.test index 15b525fa7..744e11ef3 100755 --- a/tests/openpgp/conventional-mdc.test +++ b/tests/openpgp/conventional-mdc.test @@ -10,6 +10,10 @@ . $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 ciph in `all_cipher_algos`; do progress "$ciph" @@ -20,9 +24,9 @@ for ciph in `all_cipher_algos`; do else dd if=data-80000 of=z bs=1 count=$i 2>/dev/null fi - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \ + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \ --force-mdc --cipher $ciph -c -o x --yes z - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \ + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k \ -o y --yes x cmp z y || error "$ciph/$i: mismatch" done |