diff options
| -rw-r--r-- | common/openpgpdefs.h | 2 | ||||
| -rw-r--r-- | doc/DETAILS | 3 | ||||
| -rw-r--r-- | g10/gpg.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index f3d97b665..10fc2c5bd 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -157,7 +157,7 @@ typedef enum AEAD_ALGO_NONE = 0, AEAD_ALGO_EAX = 1, AEAD_ALGO_OCB = 2, - AEAD_ALGO_GCM = 3 /* Urgs - the NSA wants this for FIPS. */ + AEAD_ALGO_GCM = 3 /* Urgs - NIST wants this for FIPS. */ } aead_algo_t; diff --git a/doc/DETAILS b/doc/DETAILS index 7a43418b0..4fa3ad86d 100644 --- a/doc/DETAILS +++ b/doc/DETAILS @@ -1894,6 +1894,9 @@ Description of some debug flags: searching and grouping. - [email protected] :: Used by GnuPG to mark the compliance of encryption subkeys. + - [email protected] :: This is a binary notation with a fingerprint + array of members for a member key. + ** Simplified revocation certificates Revocation certificates consist only of the signature packet; @@ -2382,7 +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. */ + opt.flags.allow_9980 = 1; /* Germany prefers IETF specs. */ break; case oFIPS: |