/[packages]/updates/1/gnupg2/current/SOURCES/gnupg-2.0.14-tests-s2kcount.patch
ViewVC logotype

Contents of /updates/1/gnupg2/current/SOURCES/gnupg-2.0.14-tests-s2kcount.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 101464 - (show annotations) (download)
Wed Jun 1 19:01:05 2011 UTC (12 years, 9 months ago) by schedbot
File size: 2847 byte(s)
SILENT: branch release 1
1 We have to use fixed s2k-count number otherwise the gpg2 would
2 want to consult gpg-agent which is not yet installed in the mock
3 chroot.
4 diff -up gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k gnupg-2.0.14/tests/openpgp/conventional-mdc.test
5 --- gnupg-2.0.14/tests/openpgp/conventional-mdc.test.s2k 2009-09-21 18:53:46.000000000 +0200
6 +++ gnupg-2.0.14/tests/openpgp/conventional-mdc.test 2010-01-11 10:42:36.000000000 +0100
7 @@ -21,9 +21,9 @@ for ciph in `all_cipher_algos`; do
8 dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
9 fi
10 echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
11 - --force-mdc --cipher $ciph -c -o x --yes z
12 + --force-mdc --cipher $ciph -c -o x --yes --s2k-count 65536 z
13 echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
14 - -o y --yes x
15 + -o y --yes --s2k-count 96 x
16 cmp z y || error "$ciph/$i: mismatch"
17 done
18 done
19 diff -up gnupg-2.0.14/tests/openpgp/conventional.test.s2k gnupg-2.0.14/tests/openpgp/conventional.test
20 --- gnupg-2.0.14/tests/openpgp/conventional.test.s2k 2009-09-21 18:53:46.000000000 +0200
21 +++ gnupg-2.0.14/tests/openpgp/conventional.test 2010-01-11 10:43:00.000000000 +0100
22 @@ -12,8 +12,8 @@
23
24 #info Checking conventional encryption
25 for i in plain-2 data-32000 ; do
26 - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes $i
27 - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
28 + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -c -o x --yes --s2k-count 65536 $i
29 + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
30 cmp $i y || error "$i: mismatch"
31 done
32
33 @@ -21,8 +21,8 @@ for a in `all_cipher_algos`; do
34 echo_n "$a "
35 for i in plain-1 data-80000 ; do
36 echo "Hier spricht HAL" | $GPG --passphrase-fd 0 \
37 - --cipher-algo $a -c -o x --yes $i
38 - echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes x
39 + --cipher-algo $a -c -o x --yes --s2k-count 65536 $i
40 + echo "Hier spricht HAL" | $GPG --passphrase-fd 0 -o y --yes --s2k-count 65536 x
41 cmp $i y || error "$i: ($a) mismatch"
42 done
43 done
44 diff -up gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k gnupg-2.0.14/tests/openpgp/genkey1024.test
45 --- gnupg-2.0.14/tests/openpgp/genkey1024.test.s2k 2009-09-21 18:53:46.000000000 +0200
46 +++ gnupg-2.0.14/tests/openpgp/genkey1024.test 2010-01-11 10:43:14.000000000 +0100
47 @@ -10,7 +10,7 @@
48
49 . $srcdir/defs.inc || exit 3
50
51 -$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
52 +$GPG --quiet --batch --debug-quick-random --s2k-count 65536 --gen-key <<EOF
53 Key-Type: DSA
54 Key-Length: 1024
55 Subkey-Type: ELG
56 @@ -24,7 +24,7 @@
57 EOF
58
59 if have_pubkey_algo "RSA"; then
60 -$GPG --quiet --batch --debug-quick-random --gen-key <<EOF
61 +$GPG --quiet --batch --debug-quick-random --s2k-count 65536 --gen-key <<EOF
62 Key-Type: RSA
63 Key-Length: 1024
64 Key-Usage: sign,encrypt

  ViewVC Help
Powered by ViewVC 1.1.30