]>
git.ipfire.org Git - thirdparty/openssl.git/log
Nikola Pajkovsky [Wed, 30 Jul 2025 07:21:29 +0000 (09:21 +0200)]
Revert "Pairwise check for DH keys import as part of FIPS"
Not needed anymore. It's handled in the 'ec (fips): add PCT for key import'
This reverts commit
e08b83cbb3b853ae9dc364c32d927405172918ac .
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 30 Jul 2025 06:50:03 +0000 (16:50 +1000)]
dh: add extra argument to ossl_dh_check_pairwise
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Thu, 30 Jan 2025 23:38:28 +0000 (10:38 +1100)]
dh: add FIPS 140-3 PCT on key import.
This is mandated by FIPS 140-3 IG 10.3.A additional comment 1
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Thu, 30 Jan 2025 23:16:17 +0000 (10:16 +1100)]
fips: add DH PCT name
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 29 Jan 2025 01:41:59 +0000 (12:41 +1100)]
changes: add note about PCT on key import to the FIPS provider
This is mandated by FIPS 140-3 IG 10.3.A additional comment 1.
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 29 Jan 2025 00:31:33 +0000 (11:31 +1100)]
rsa (fips): add PCT for key import
FIPS 140-3 IG 10.3.A additional comment 1 mandates a PCT on key import.
Fixes #26572
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 29 Jan 2025 00:16:54 +0000 (11:16 +1100)]
ec (fips): add PCT for key import
FIPS 140-3 IG 10.3.A additional comment 1 mandates a PCT on key import.
Fixes #26572
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 29 Jan 2025 00:16:44 +0000 (11:16 +1100)]
ecx (fips): add PCT for key import
FIPS 140-3 IG 10.3.A additional comment 1 mandates a PCT on key import.
Fixes #26572
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Pauli [Wed, 29 Jan 2025 00:44:02 +0000 (11:44 +1100)]
rsa: expose pairwise consistency test API
This is only used by the FIPS provider as part of importing keys. At least
at the moment.
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28122)
Saurabh Kushwah [Wed, 30 Jul 2025 12:36:57 +0000 (18:06 +0530)]
apps/asn1parse.c: correct help text order for -genstr option
CLA: trivial
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28123)
Pauli [Thu, 17 Jul 2025 03:24:21 +0000 (13:24 +1000)]
pbkdf2: remove second compiled file
The main source file now depends on FIPS_MODULE so there is no need to have
a second file with a fips flag defined.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 16 Jul 2025 08:09:54 +0000 (18:09 +1000)]
macsig: call updated ossl_prov_set_macctx function
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 17 Jul 2025 01:13:56 +0000 (11:13 +1000)]
params: emit an error if a parameter array overflows
This is in addition to returning an error code.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Fri, 11 Jul 2025 06:03:12 +0000 (16:03 +1000)]
params: revert error checking when params are duplicated
This is to avoid a change of behaviour even though it is a result of user
error. When params are duplicated, all but the first are ignored and no
error is returned.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 10 Jul 2025 01:47:16 +0000 (11:47 +1000)]
hkdf: changes to incorporate the fixed digest HkDF flavours
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 10 Jul 2025 00:41:51 +0000 (10:41 +1000)]
kdf: use generated param name alias handling
secret or key is the common one but ukm and partyu-info are also aliases for
the X9.42 KDF.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 10 Jul 2025 00:40:55 +0000 (10:40 +1000)]
params: allow param name aliases
We allowed multiple names for the same parameter in a number of places.
This is best dealt with in the generated code.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 8 Jul 2025 01:36:51 +0000 (11:36 +1000)]
tls1-prf: process multiple seed parameters with a single realloc call
The old code did a realloc for each such parameter which is inefficient
because they are most often passed in in pentuples.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 7 Jul 2025 23:32:36 +0000 (09:32 +1000)]
paramnames: factor out common code after successful match
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 3 Jul 2025 03:07:48 +0000 (13:07 +1000)]
kdfs: make the 'engine' parameter hidden
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 3 Jul 2025 03:08:27 +0000 (13:08 +1000)]
params: add support for 'hidden' parameters
These are in the name decoder and structure but do not appear in the parameter
listing.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 07:19:43 +0000 (17:19 +1000)]
hmacdrbg_kdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 07:08:00 +0000 (17:08 +1000)]
hmacdrbg_kdf: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 07:06:25 +0000 (17:06 +1000)]
hmacdrbg_kdf: rename C file for conversion to generated param name decoding
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 07:22:51 +0000 (17:22 +1000)]
evp_kdf_test: skip "engine" parameters when checking for updatability.
The code already skips "properties" and "engines" behaves the same.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 07:05:17 +0000 (17:05 +1000)]
argon2: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:55:37 +0000 (16:55 +1000)]
argon2: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:54:20 +0000 (16:54 +1000)]
argon2: rename C file for conversion to generated param name decoding
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:53:40 +0000 (16:53 +1000)]
krb5kdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:52:34 +0000 (16:52 +1000)]
krb5kdf: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:45:50 +0000 (16:45 +1000)]
krb5kdf: rename C file for conversion to generated param name decoding
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:45:10 +0000 (16:45 +1000)]
pbkdf1: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:39:52 +0000 (16:39 +1000)]
pbkdf1: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:39:34 +0000 (16:39 +1000)]
pbkdf1: rename C file for conversion to generated param name decoding
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:37:26 +0000 (16:37 +1000)]
pkcs12kdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:35:24 +0000 (16:35 +1000)]
pkcs12kdf: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:34:58 +0000 (16:34 +1000)]
pkcs12kdf: rename C file for conversion to generated param name decoding
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:28:39 +0000 (16:28 +1000)]
scrypt: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:28:24 +0000 (16:28 +1000)]
scrypt: update build infrastructure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:28:09 +0000 (16:28 +1000)]
scrypt: rename C file for conversion to generated param name decodering
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 06:16:15 +0000 (16:16 +1000)]
pbkdf2: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 05:54:13 +0000 (15:54 +1000)]
pbkdf2: build infrastructure changes
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 05:54:02 +0000 (15:54 +1000)]
pbkdf2: rename for autogeneration of param name parsing
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 00:31:31 +0000 (10:31 +1000)]
x9.42kdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 00:10:31 +0000 (10:10 +1000)]
build infrastructure changes for X9.42 KDF
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 00:09:30 +0000 (10:09 +1000)]
rename X9.42 KDF for autogeneration of param name parsing
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 2 Jul 2025 00:07:19 +0000 (10:07 +1000)]
pvkkdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 23:59:42 +0000 (09:59 +1000)]
sshkdf: convert to generated OSSL_PARAM parser
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 23:48:02 +0000 (09:48 +1000)]
build infrastructure for PVK KDF
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 23:42:20 +0000 (09:42 +1000)]
build infrastructure changes for SSH KDF
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 23:13:26 +0000 (09:13 +1000)]
rename sshkdf for autogeneration of param name parsing
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 01:42:34 +0000 (11:42 +1000)]
tls1prf: update to use generated param decoders
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 00:49:50 +0000 (10:49 +1000)]
kdf: remove max argument to the param concatenation helper
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 1 Jul 2025 00:01:00 +0000 (10:01 +1000)]
tls1_prf: update build infrastructure for generated param parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 23:58:41 +0000 (09:58 +1000)]
rename tls1 PRF C file
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:10:48 +0000 (13:10 +1000)]
kbkdf: conversion to use generated param parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:10:40 +0000 (13:10 +1000)]
sskdf: conversion to use generated param parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:09:53 +0000 (13:09 +1000)]
util: add helper functions that don't locate the parameters
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:09:29 +0000 (13:09 +1000)]
params: add helper functions that don't locate the parameters
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:08:23 +0000 (13:08 +1000)]
fips: update FIPS indicator functions so non-locating flavours are available
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 25 Jun 2025 22:12:03 +0000 (08:12 +1000)]
hkdf: conversion to use generated param parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Fri, 27 Jun 2025 01:55:28 +0000 (11:55 +1000)]
kdf: rename SSKDF and KBKDF for param parser generation
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 25 Jun 2025 00:56:43 +0000 (10:56 +1000)]
hkdf: rename file for Perl processing
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 25 Jun 2025 22:11:47 +0000 (08:11 +1000)]
params: update param parser generator script to support duplicated parameters
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Fri, 27 Jun 2025 01:55:55 +0000 (11:55 +1000)]
build infrastructure changes for KBKDF and SSKDF to use generated param parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Tue, 24 Jun 2025 04:05:42 +0000 (14:05 +1000)]
Update build infrastructure for generated hkdf.c file
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Mon, 30 Jun 2025 03:11:51 +0000 (13:11 +1000)]
test: seperate the integer and string fetches of the 'mode' parameter
The generated parameter parsers don't accept duplication of parameters so this
causes an error at runtime if not seperated.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Thu, 26 Jun 2025 00:13:25 +0000 (10:13 +1000)]
params: add additional error checking to generated param name parsers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 25 Jun 2025 00:50:43 +0000 (10:50 +1000)]
params: update generated decoder based implementations to handle return code
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Pauli [Wed, 25 Jun 2025 00:50:15 +0000 (10:50 +1000)]
params: generated decoder functions return an error state on failure
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27923)
Tomas Mraz [Thu, 31 Jul 2025 09:54:28 +0000 (11:54 +0200)]
CMS KEMRecipientInfo support requires HKDF with fixed digests
These are not present in FIPS providers <3.6.0.
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28133)
Michael Baentsch [Tue, 29 Jul 2025 10:32:00 +0000 (12:32 +0200)]
Remove unnecessary OPENSSL_NO_RSA remnants
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28113)
Michael Baentsch [Mon, 28 Jul 2025 04:52:49 +0000 (06:52 +0200)]
fuzz/dtlsserver.c: Remove incorrect ifdef guard
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28102)
Tomas Mraz [Mon, 28 Jul 2025 08:55:45 +0000 (10:55 +0200)]
test_tlsext_status_type(): Avoid leaking of previously allocated data
Fixes Coverity
1659226 ,
1659224 ,
1659223
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28105)
Ingo Franzki [Tue, 22 Jul 2025 13:09:27 +0000 (15:09 +0200)]
Only report generic error if provider did not put an error on the error queue
Commit
72351b0d18078170af270418b2d5e9fc579cb1af added code to unconditionally
put a generic error onto the error stack, if key generation, encryption,
decryption, sign, or verify fails to ensure that there is an error entry
on the error queue, even if the provider did not itself put a specific error
onto the queue.
However, this can hide error details if an application just looks at the very
last error entry and checks for specific errors. Now, the generic error is
always the last entry, and the application won't find the expected error
entry, although it would be there as second last entry. This can lead to
different application behavior in error situations than before this change.
To fix this, only add the generic error entry if the provider did not itself
add an error entry onto the queue. That way, there always is an error on the
error queue in case of a failure, but no behavior change in case the provider
emitted the error entry itself.
Closes: https://github.com/openssl/openssl/issues/27992
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28073)
Ingo Franzki [Tue, 22 Jul 2025 13:01:38 +0000 (15:01 +0200)]
Make ERR_count_to_mark() available to providers via 'in' dispatch array
Functions like ERR_set_mark(), ERR_clear_last_mark(), and ERR_pop_to_mark()
are already passed to the a provider via the 'in' dispatch array of the
provider initialization function (although the documentation did not
mention them).
Also pass ERR_count_to_mark() to the provider the same way, and update
the documentation to mention all four functions.
Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28073)
Eugene Syromiatnikov [Wed, 30 Jul 2025 13:55:14 +0000 (15:55 +0200)]
Fix hanging of test_external_cf_quiche
The commit "Remove HARNESS_OSSL_PREFIX manipulation in the test harness"
forced all the output to be processed by the test harness, which means
that any process that keeps the stdout FD open prevents the run() call
from finishing, as was the case in the test_external_cf_quiche test that
ran quiche server in the background, but retaining the std{in,out,err}
descriptors. Avoid that by explicitly redirecting them to a log file.
Reported-by: Tomas Mraz <tomas@openssl.org>
Fixes: 70c05fcde53cf "Remove HARNESS_OSSL_PREFIX manipulation in the test harness"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28125)
Daniel Van Geest [Thu, 3 Apr 2025 10:19:43 +0000 (11:19 +0100)]
Implement KEMRecipientInfo (RFC9629) in CMS
Also add support for ML-KEM in CMS (draft-ietf-lamps-cms-kyber).
Add the -recip_kdf and -recip_ukm parameters to `openssl cms -encrypt`
to allow the user to specify the KDF algorithm and optional user
keying material for each recipient.
A provider may indicate which RecipientInfo type is supported
for a key, otherwise CMS will try to figure it out itself. A
provider may also indicate which KDF to use in KEMRecipientInfo
if the user hasn't specified one.
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27681)
Anton Moryakov [Fri, 25 Jul 2025 12:43:15 +0000 (15:43 +0300)]
crypto: evp: fix potential null pointer dereference in EVP_DigestSignUpdate in m_sigver.c
Static analysis detected that EVP_DigestSign() could lead to null pointer
dereference in EVP_DigestSignUpdate() when pctx->pmeth is NULL. The issue
occurs in the legacy code path where pmeth is accessed without prior null
check.
This fix adds a proper null check for pctx->pmeth in the legacy section
of EVP_DigestSignUpdate() to prevent the crash when the function is called
through EVP_DigestSign() with improperly initialized context.
The check is placed in EVP_DigestSignUpdate() rather than EVP_DigestSign()
to maintain proper separation of concerns and follow OpenSSL's architectural
patterns where lower-level functions handle their own parameter validation.
Fixes potential crash in signature operations with legacy providers.
CLA: trivial
Signed-off-by: Anton Moryakov <ant.v.moryakov@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28095)
Neil Horman [Sat, 26 Jul 2025 13:30:53 +0000 (09:30 -0400)]
Fix NULL check in get_ocsp_resp_from_responder
We assign an allocation to *sk_resp, but only check for NULL on sk_resp,
not the value it points to.
Addresses https://scan5.scan.coverity.com/#/project-view/60762/10222?selectedIssue=
1659222
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28101)
Neil Horman [Sat, 26 Jul 2025 13:28:01 +0000 (09:28 -0400)]
Set *sk_resp to NULL when freeing.
Its possible for get_ocsp_resp_from_responder to return OK after having
freed *sk_resp without setting the freed pointer to NULL, leading us to
set a garbage pointer in other code.
Ensure that we set it to NULL after freeing
Addresses https://scan5.scan.coverity.com/#/project-view/60762/10222?selectedIssue=
1659225
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28101)
Neil Horman [Sat, 26 Jul 2025 13:18:11 +0000 (09:18 -0400)]
Fix NULL check in bring_oscp_resp_in_correct_order
We assign an allocated pointer to *sk_resp but only check if sk_resp is
NULL when sk_resp is a pointer to a pointer
Addresses https://scan5.scan.coverity.com/#/project-view/60762/10222?selectedIssue=
1659227
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28101)
Neil Horman [Mon, 14 Jul 2025 13:12:17 +0000 (09:12 -0400)]
reduce lock contention when adding objects to ADDED_OBJ hash table
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28081)
Neil Horman [Sun, 13 Jul 2025 12:51:41 +0000 (08:51 -0400)]
move added creation to happen outside of write lock
We have a global ADDED_OBJ hashtable, and we check to create it
on every object add with the write lock potentially held. move that
creation to a RUN_ONCE routine so that its always created before the
write lock is held
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28081)
Norbert Pocs [Fri, 18 Jul 2025 12:29:57 +0000 (14:29 +0200)]
unix-Makefile.tmpl: Run find-doc-nits with env var checker too
Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Norbert Pocs [Thu, 17 Jul 2025 13:42:44 +0000 (15:42 +0200)]
find-doc-nits: Check env var documentation
Check the code (source files and .in files) for undocumented ENV
variable names. The variable name should be documented in openssl-env or
in a designated man page in the "ENVIRONMENT" section.
Resolves: https://github.com/openssl/openssl/issues/28050
Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Tue, 22 Jul 2025 03:06:30 +0000 (05:06 +0200)]
doc/man1/openssl-rehash.pod.in: document PATH environment variable
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 08:26:28 +0000 (10:26 +0200)]
doc/man7/openssl-env: document HOME environment variable usage
Seems to be the only place where it is used, as of now.
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 08:25:41 +0000 (10:25 +0200)]
doc/man7/openssl-env: document OPENSSL_TEST_LIBCTX environment variable
Complements:
e89578be2930 "Test RSA oaep in fips mode"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 08:29:56 +0000 (10:29 +0200)]
doc/man7/openssl-env: OPENSSL_TRACE: tfix
Fixes: ee0bf38e8709 "improve and move text on OPENSSL_TRACE from doc/man1/openssl.pod to doc/man7/openssl-env.pod"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 07:53:51 +0000 (09:53 +0200)]
doc/man7/openssl-env: sort OPENSSL_TRACE categories lexicographically
There is little reason to preserve the declaration order for the reader.
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Tue, 22 Jul 2025 01:58:38 +0000 (03:58 +0200)]
doc/man7/openssl-env: update REF_COUNT OPENSSL_TRACE category description
It seems that its usage has been changed since the initial mention
in
6d594fdf52c4 "OSSL_trace_set_channel.pod and openssl.pod:
fix missing/inconsistent category items".
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 07:47:26 +0000 (09:47 +0200)]
doc/man7/openssl-env: document QUERY OPENSSL_TRACE category
Complements:
eed43f8a12ef "Add a QUERY trace category"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 07:45:54 +0000 (09:45 +0200)]
doc/man7/openssl-env: document PROVIDER OPENSSL_TRACE category
Complements:
93296eaaa0e8 "Adding a trace category for PROVIDER calls"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Mon, 14 Jul 2025 07:43:07 +0000 (09:43 +0200)]
doc/man7/openssl-env: reword the description
The manual page describes not only environment variables that pertain
the library, but some of the applications as well (OPENSSL,
OPENSSL_CONFIG, and TSGET are possible examples). Also, the effect
of the variables is not limited to the changes in default paths.
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Fri, 11 Jul 2025 18:10:50 +0000 (20:10 +0200)]
doc/man7/openssl-env: document which variables are considered security-sensitive
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Fri, 11 Jul 2025 17:50:41 +0000 (19:50 +0200)]
doc/man7/openssl-env: document OPENSSL_DEBUG_DECC_INIT environment variable
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Fri, 11 Jul 2025 17:23:39 +0000 (19:23 +0200)]
Document LEGACY_GOST_PKCS12 environment variable
Add its mention to doc/man7/openssl-env.pod and describe its semantics
in doc/man3/PKCS12_gen_mac.pod.
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Fri, 11 Jul 2025 12:49:22 +0000 (14:49 +0200)]
Document OPENSSL_MALLOC_SEED environment variable
Add its mention to doc/man3/OPENSSL_malloc.pod,
doc/man7/openssl-env.pod, and util/other.syms.
Also, reorder the variable order in doc/man7/openssl-env.pod
to a lexicographical one.
Complements:
3df5736cf303 "Improve Malloc Failure Test"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)
Eugene Syromiatnikov [Fri, 11 Jul 2025 12:24:59 +0000 (14:24 +0200)]
doc/man3/OPENSSL_malloc: improve OPENSSL_MALLOC_FAILURES documentation
Reflect its ability to accept floating point numbers in the failure
probability specification.
Complements:
3df5736cf303 "Improve Malloc Failure Test"
Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28025)