ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

fix: usr: disable deterministic ecdsa for fips builds

Browse Source 
FIPS 186-5 [1] allows the usage deterministic ECDSA (Section 6.3) which
is compabile with RFC 6979 [2] but OpenSSL seems to follow FIPS 186-4
(Section 6.3) [3] which only allows for random k values, failing
k value generation for OpenSSL >=3.2. [4]

Fix signing by not using deterministic ECDSA when FIPS mode is active.

[1]: https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-5.pdf
[2]: https://datatracker.ietf.org/doc/html/rfc6979
[3]: https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf
[4]: 85f17585b0/crypto/ec/ecdsa_ossl.c (L201-L207)

Closes #5072

Merge branch '5072-the-ecdsa_determinism_test-check-fails-on-ol-9-5-fips' into 'main'

See merge request isc-projects/bind9!9808
This commit is contained in:
Michal Nowak
2024-12-09 11:55:53 +00:00
parent 6306031409 8d093a6b66
commit 707dded979
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/dns/opensslecdsa_link.c
View File

@@ -26,6 +26,7 @@
#include <openssl/param_build.h>
#endif
#include <isc/fips.h>
#include <isc/mem.h>
#include <isc/result.h>
#include <isc/safe.h>
@@ -706,9 +707,12 @@ opensslecdsa_createctx(dst_key_t *key, dst_context_t *dctx) {
}
#if OPENSSL_VERSION_NUMBER >= 0x30200000L
ret = opensslecdsa_set_deterministic(pctx, dctx->key->key_alg);
if (ret != ISC_R_SUCCESS) {
goto err;
if (!isc_fips_mode()) {
ret = opensslecdsa_set_deterministic(
pctx, dctx->key->key_alg);
if (ret != ISC_R_SUCCESS) {
goto err;
}
}
#endif /* OPENSSL_VERSION_NUMBER >= 0x30200000L */

7
tests/dns/dst_test.c
View File

@@ -31,6 +31,7 @@
#include <cmocka.h>
#include <isc/file.h>
#include <isc/fips.h>
#include <isc/hex.h>
#include <isc/result.h>
#include <isc/stdio.h>
@@ -467,7 +468,11 @@ ISC_RUN_TEST_IMPL(ecdsa_determinism_test) {
dst_context_destroy(&ctx);
#if OPENSSL_VERSION_NUMBER >= 0x30200000L
assert_memory_equal(sigbuf1->base, sigbuf2->base, siglen);
if (isc_fips_mode()) {
assert_memory_not_equal(sigbuf1->base, sigbuf2->base, siglen);
} else {
assert_memory_equal(sigbuf1->base, sigbuf2->base, siglen);
}
#else
assert_memory_not_equal(sigbuf1->base, sigbuf2->base, siglen);
#endif