gpg: Implictly set allow-9980 in de-vs compliance mode.wk/rfc9980

* g10/gpg.c (set_compliance_option): Enable 9980 in de-vs mode.

2 files changed, 7 insertions, 5 deletions

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 1df31c7a0..8a311b1a0 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -3991,11 +3991,12 @@ These are obsolete options; they have no more effect since GnuPG 2.2.8.
 @item --allow-9980
 @opindex allow-9980
 Enabling this option allows the processing of some data formats
-specified by RFC-9980 (PQC for OpenPGP) and its dependencies.  Due to
-this bloated specifications the use of this option is not suggested.
-The standard GnuPG mode is more oriented at the classic PGP and
-LibrePGP specification which also provide PQC support but in a more
-lean and PGP-style way.
+specified by RFC-9980 (PQC for OpenPGP) and its dependencies.  It is
+implictly enabled when using the compliance modes ``fips'' or
+``de-vs''.  Due the bloated specification the use of this option is
+not suggested.  The standard GnuPG mode is more oriented at the
+classic PGP and thus LibrePGP specification which also provide PQC
+support but in a more lean and PGP-style way.
 
 @item --enable-special-filenames
 @opindex enable-special-filenames
diff --git a/g10/gpg.c b/g10/gpg.c
index df4026e21..965b4076b 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2382,6 +2382,7 @@ set_compliance_option (enum cmd_and_opt_values option)
       /* We divert here from the backward compatible rfc4880 algos.  */
       opt.s2k_digest_algo = DIGEST_ALGO_SHA256;
       opt.s2k_cipher_algo = CIPHER_ALGO_AES256;
+      opt.flags.allow_9980 = 1;  /* Germany likes the NSA.  */
       break;
 
     case oFIPS: