Size HMAC key generation buffers to the maximum block size

hmac_generate() declared its on-stack nonce buffer as
unsigned char data[ISC_MAX_MD_SIZE], i.e. 64 bytes. That is the maximum
digest size, but the buffer is filled up to the algorithm's HMAC block
size, which is 128 bytes for SHA-384 and SHA-512. Asking rndc-confgen
for an HMAC-SHA-384 or HMAC-SHA-512 key with -b > 512 (the documented
range allows up to 1024) wrote past the end of the stack buffer; on
hardened builds this aborted with a stack-smash detector firing
instead of producing a key.

Use the existing ISC_MAX_BLOCK_SIZE (128) for the buffer so the full
1..1024 range advertised by -A hmac-sha{384,512} works as documented.
The matching key_rawsecret[64] in confgen's generate_key() is enlarged
the same way so the generated key fits when dumped to the buffer.

Add a system test that exercises rndc-confgen across the previously
overflowing keysizes; with -Db_sanitize=address it caught the abort
before the fix.

Assisted-by: Claude:claude-opus-4-7
This commit is contained in:
Ondřej Surý 2026-04-29 16:23:10 +02:00
parent ce77138b5c
commit 46f6bb6364
No known key found for this signature in database
GPG key ID: 2820F37E873DEA41
3 changed files with 35 additions and 2 deletions

View file

@ -21,6 +21,7 @@
#include <isc/base64.h>
#include <isc/buffer.h>
#include <isc/file.h>
#include <isc/md.h>
#include <isc/mem.h>
#include <isc/result.h>
#include <isc/string.h>
@ -117,7 +118,7 @@ generate_key(isc_mem_t *mctx, dns_secalg_t alg, int keysize,
isc_result_t result = ISC_R_SUCCESS;
isc_buffer_t key_rawbuffer;
isc_region_t key_rawregion;
char key_rawsecret[64];
char key_rawsecret[ISC_MAX_BLOCK_SIZE];
dst_key_t *key = NULL;
switch (alg) {

View file

@ -9,7 +9,9 @@
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
import base64
import os
import re
import subprocess
import pytest
@ -67,3 +69,33 @@ def test_ddns_confgen_default():
def test_ddns_confgen_rejects_injection(args):
with pytest.raises(subprocess.CalledProcessError):
isctest.run.cmd([DDNSCONFGEN, "-q", *args])
def _extract_secret(stdout: bytes) -> bytes:
match = re.search(rb'secret\s+"([^"]+)"', stdout)
assert match is not None, f"no secret in output: {stdout!r}"
return base64.b64decode(match.group(1))
@pytest.mark.parametrize(
"algorithm,bits",
[
("hmac-sha256", 1),
("hmac-sha256", 256),
("hmac-sha256", 512),
("hmac-sha384", 1),
("hmac-sha384", 384),
("hmac-sha384", 513),
("hmac-sha384", 768),
("hmac-sha384", 1024),
("hmac-sha512", 1),
("hmac-sha512", 512),
("hmac-sha512", 513),
("hmac-sha512", 1024),
],
)
def test_rndc_confgen_hmac_keysize(algorithm, bits):
cmd = isctest.run.cmd([os.environ["RNDCCONFGEN"], "-A", algorithm, "-b", str(bits)])
secret = _extract_secret(cmd.proc.stdout)
assert len(secret) == (bits + 7) // 8
assert f"algorithm {algorithm};".encode() in cmd.proc.stdout

View file

@ -249,7 +249,7 @@ hmac_generate(isc_md_type_t type, dst_key_t *key) {
isc_buffer_t b;
isc_result_t result;
unsigned int bytes, len;
unsigned char data[ISC_MAX_MD_SIZE] = { 0 };
unsigned char data[ISC_MAX_BLOCK_SIZE] = { 0 };
len = isc_md_type_get_block_size(type);