48 lines
1.6 KiB
Diff
48 lines
1.6 KiB
Diff
diff --git a/g10/gpg.c b/g10/gpg.c
|
|
index 84706ca6b..74946b0dd 100644
|
|
--- a/g10/gpg.c
|
|
+++ b/g10/gpg.c
|
|
@@ -2573,6 +2573,7 @@ main (int argc, char **argv)
|
|
|
|
/* Set default options which require that malloc stuff is ready. */
|
|
additional_weak_digest ("MD5");
|
|
+ additional_weak_digest ("SHA1");
|
|
parse_auto_key_locate (DEFAULT_AKL_LIST);
|
|
|
|
argc = orig_argc;
|
|
diff --git a/g10/gpgv.c b/g10/gpgv.c
|
|
index ceded4af9..277d3c8ca 100644
|
|
--- a/g10/gpgv.c
|
|
+++ b/g10/gpgv.c
|
|
@@ -205,6 +205,7 @@ main( int argc, char **argv )
|
|
dotlock_disable ();
|
|
gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
|
|
additional_weak_digest("MD5");
|
|
+ additional_weak_digest("SHA1");
|
|
gnupg_initialize_compliance (GNUPG_MODULE_NAME_GPG);
|
|
|
|
pargs.argc = &argc;
|
|
diff --git a/tests/openpgp/gpgv.scm b/tests/openpgp/gpgv.scm
|
|
index 398f05052..7e137a390 100755
|
|
--- a/tests/openpgp/gpgv.scm
|
|
+++ b/tests/openpgp/gpgv.scm
|
|
@@ -59,7 +59,7 @@
|
|
(pipe:do
|
|
(pipe:echo (eval armored-file (current-environment)))
|
|
(pipe:spawn `(,@gpgv --keyring ,keyring))))
|
|
- '(msg_ols_asc msg_cols_asc msg_sl_asc msg_oolss_asc msg_cls_asc msg_clss_asc))
|
|
+ '())
|
|
|
|
(for-each-p
|
|
"Checking that an invalid signature is verified as such"
|
|
@@ -69,7 +69,7 @@
|
|
(pipe:echo (eval armored-file (current-environment)))
|
|
(pipe:spawn `(,@gpgv --keyring ,keyring)))
|
|
(fail "verification succeeded but should not")))
|
|
- '(bad_ls_asc bad_fols_asc bad_olsf_asc bad_ools_asc))
|
|
+ '(bad_ls_asc bad_fols_asc bad_olsf_asc bad_ools_asc msg_ols_asc msg_cols_asc msg_sl_asc msg_oolss_asc msg_cls_asc msg_clss_asc))
|
|
|
|
|
|
;; Need to import the ed25519 sample key used for the next two tests.
|
|
|