diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/compliance.c | 21 | ||||
| -rw-r--r-- | common/compliance.h | 12 |
2 files changed, 19 insertions, 14 deletions
diff --git a/common/compliance.c b/common/compliance.c index 3c43fd821..8b9167758 100644 --- a/common/compliance.c +++ b/common/compliance.c @@ -154,10 +154,10 @@ gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo, case is_dsa: if (key) { - size_t L = gcry_mpi_get_nbits (key[0] /* p */); - size_t N = gcry_mpi_get_nbits (key[1] /* q */); - result = (L == 256 - && (N == 2048 || N == 3072)); + size_t P = gcry_mpi_get_nbits (key[0]); + size_t Q = gcry_mpi_get_nbits (key[1]); + result = (Q == 256 + && (P == 2048 || P == 3072)); } break; @@ -171,7 +171,8 @@ gnupg_pk_is_compliant (enum gnupg_compliance_mode compliance, int algo, } result = (curvename - && algo != PUBKEY_ALGO_EDDSA + && (algo == PUBKEY_ALGO_ECDH + || algo == PUBKEY_ALGO_ECDSA) && (!strcmp (curvename, "brainpoolP256r1") || !strcmp (curvename, "brainpoolP384r1") || !strcmp (curvename, "brainpoolP512r1"))); @@ -238,13 +239,13 @@ gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, case PUBKEY_ALGO_DSA: if (key) { - size_t L = gcry_mpi_get_nbits (key[0] /* p */); - size_t N = gcry_mpi_get_nbits (key[1] /* q */); + size_t P = gcry_mpi_get_nbits (key[0]); + size_t Q = gcry_mpi_get_nbits (key[1]); return ((use == PK_USE_SIGNING - && L == 256 - && (N == 2048 || N == 3072)) + && Q == 256 + && (P == 2048 || P == 3072)) || (use == PK_USE_VERIFICATION - && N < 2048)); + && P < 2048)); } else return 0; diff --git a/common/compliance.h b/common/compliance.h index 183f142e7..d55bbf3ac 100644 --- a/common/compliance.h +++ b/common/compliance.h @@ -57,14 +57,17 @@ int gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, int gnupg_cipher_is_compliant (enum gnupg_compliance_mode compliance, cipher_algo_t cipher, enum gcry_cipher_modes mode); -int gnupg_cipher_is_allowed (enum gnupg_compliance_mode compliance, int producer, +int gnupg_cipher_is_allowed (enum gnupg_compliance_mode compliance, + int producer, cipher_algo_t cipher, enum gcry_cipher_modes mode); int gnupg_digest_is_compliant (enum gnupg_compliance_mode compliance, digest_algo_t digest); -int gnupg_digest_is_allowed (enum gnupg_compliance_mode compliance, int producer, +int gnupg_digest_is_allowed (enum gnupg_compliance_mode compliance, + int producer, digest_algo_t digest); -const char *gnupg_status_compliance_flag (enum gnupg_compliance_mode compliance); +const char *gnupg_status_compliance_flag (enum gnupg_compliance_mode + compliance); struct gnupg_compliance_option { @@ -76,7 +79,8 @@ int gnupg_parse_compliance_option (const char *string, struct gnupg_compliance_option options[], size_t length, int quiet); -const char *gnupg_compliance_option_string (enum gnupg_compliance_mode compliance); +const char *gnupg_compliance_option_string (enum gnupg_compliance_mode + compliance); #endif /*GNUPG_COMMON_COMPLIANCE_H*/ |