mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-05 23:07:49 +02:00
4584125802
* g10/encrypt.c (use_mdc): Make it a global func.
* g10/sign.c (sign_symencrypt_file): Use that function to decide
whether to use an MDC.
* tests/openpgp/conventional-mdc.test: Add a simple test case.
--
We used --force-mdc in sign+symenc mode (-cs) only with --force-mdc.
That broke our assumption from commit 625e292 (GnuPG 2.1.9) that all
uses of modern ciphers are using MDC.
Reported-by: Ben Kibbey <bjk@luxsci.net>
Signed-off-by: Werner Koch <wk@gnupg.org>
45 lines
1.5 KiB
Bash
Executable File
45 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
# Copyright 2000,2001,2002,2003,2004,2005,2006,
|
|
# 2007 Free Software Foundation, Inc.
|
|
# This file is free software; as a special exception the author gives
|
|
# unlimited permission to copy and/or distribute it, with or without
|
|
# modifications, as long as this notice is preserved. This file is
|
|
# distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY, to the extent permitted by law; without even the implied
|
|
# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
. $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"
|
|
for i in 0 1 2 3 9 10 11 19 20 21 22 23 39 40 41 8192 32000 ; do
|
|
# *BSD's dd can't cope with a count of 0
|
|
if test "$i" = "0"; then
|
|
: >z
|
|
else
|
|
dd if=data-80000 of=z bs=1 count=$i 2>/dev/null
|
|
fi
|
|
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 $s2k \
|
|
-o y --yes x
|
|
cmp z y || error "$ciph/$i: mismatch"
|
|
done
|
|
done
|
|
progress_end
|
|
|
|
#info Checking sign+symencrypt
|
|
for i in $plain_files $data_files; do
|
|
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -cs -o x --yes $i
|
|
echo "Hier spricht HAL" | $GPG --passphrase-fd 0 $s2k -o y --yes x
|
|
cmp $i y || error "$i: mismatch in sign+symenc"
|
|
done
|
|
|
|
|
|
# eof
|