diff options
| author | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2023-12-22 12:45:02 +0000 |
| commit | 2764ee309a2e0c10cef606345f06dd37c637fc41 (patch) | |
| tree | 4238a756e7624b31ade6e558a1c0794af691412d /common/compliance.c | |
| parent | Register DCO for Mario Haustein (diff) | |
| parent | doc: Explain why socket activation is a problem (diff) | |
| download | gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.tar.gz gnupg-2764ee309a2e0c10cef606345f06dd37c637fc41.zip | |
Merge branch 'STABLE-BRANCH-2-4'
--
Fixed conflicts in
NEWS
g10/encrypt.c
sm/encrypt.c
sm/sign.c
Diffstat (limited to 'common/compliance.c')
| -rw-r--r-- | common/compliance.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/common/compliance.c b/common/compliance.c index 59d94038d..04978ed1b 100644 --- a/common/compliance.c +++ b/common/compliance.c @@ -256,6 +256,13 @@ gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, if (! initialized) return 1; + /* Map the the generic ECC algo to ECDSA if requested. */ + if ((algo_flags & PK_ALGO_FLAG_ECC18) + && algo == GCRY_PK_ECC + && (use == PK_USE_VERIFICATION + || use == PK_USE_SIGNING)) + algo = GCRY_PK_ECDSA; + switch (compliance) { case CO_DE_VS: @@ -280,7 +287,6 @@ gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, default: log_assert (!"reached"); } - (void)algo_flags; break; case PUBKEY_ALGO_DSA: @@ -301,7 +307,7 @@ gnupg_pk_is_allowed (enum gnupg_compliance_mode compliance, result = (use == PK_USE_DECRYPTION); break; - case PUBKEY_ALGO_ECDH: + case PUBKEY_ALGO_ECDH: /* Same value as GCRY_PK_ECC, i.e. 18 */ case GCRY_PK_ECDH: if (use == PK_USE_DECRYPTION) result = 1; @@ -549,6 +555,9 @@ gnupg_rng_is_compliant (enum gnupg_compliance_mode compliance) int *result; int res; + /* #warning debug code ahead */ + /* return 1; */ + result = get_compliance_cache (compliance, 1); if (result && *result != -1) |