2312 Commits

Author	SHA1	Message	Date
Ingo Franzki	b9ff440dd6	Only report generic error if provider did not put an error on the error queue ... Commit 72351b0d18 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)	2025-07-30 18:27:08 +02:00
Anton Moryakov	daa004d484	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)	2025-07-30 08:55:46 +10:00
Norbert Pocs	c315f98f71	evp_pkey_type: Make base_id_conversion table static ... This commit fixes CI failures (when configured with --strict-warnings) Signed-off-by: Norbert Pocs <norbertp@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/28061)	2025-07-18 08:57:16 +02:00
Norbert Pocs	af2aaf3271	Deprecate ASN1_METH internal usage ... Some of them are needed and were kept by adding `#include "internal/deprecated"` and some had to be turned off. Signed-off-by: Norbert Pocs <norbertp@openssl.org> Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27727)	2025-07-17 11:25:18 -04:00
Norbert Pocs	112f3afd21	crypto/evp/digest.c: optimize ossl_(un)likely ... Signed-off-by: Norbert Pocs <norbertp@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27961)	2025-07-16 13:07:15 -04:00
Tomas Mraz	bb86c43fa8	libapps + libcrypto: Silence warnings on Win64 builds ... Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27806)	2025-07-02 17:26:26 +02:00
Viktor Dukhovni	2c74a8d1ef	Allow keygen after dup of minimal PKEY ctx ... It should be possible to repeatedly duplicate a PKEY CTX created via EVP_PKEY_CTX_new_from_name() that has not yet been assigned an "operation" (e.g. via EVP_PKEY_CTX_keygen_init()), and then perform keygen_init() and keygen() on the duplicated copies. When the operation is not yet set, all that's needed is to not try to use the key if one isn't set yet. Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27662)	2025-06-10 19:43:56 +02:00
Daniel Van Geest	bef03c6a24	Fix SHAKE AlgorithmIdentifier encodings ... NIST CSOR specifies that the id-shake128 and id-shake256 algorithm identifiers, like the SHA-3 ones, do not carry any parameters. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27190)	2025-06-10 19:42:00 +02:00
Dr. David von Oheimb	c37b9e3425	crypto/evp/ctrl_params_translate.c: prevent clashes of generic names NONE, GET, SET ... Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/27773)	2025-06-09 10:32:39 +02:00
Pauli	a2cd7ecd75	rand: add argument error checking to EVP_RAND_nonce() ... Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27766)	2025-06-09 10:24:08 +02:00
Pauli	a2b9120d15	rand: produce correct return from EVP_RAND_nonce ... Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27766)	2025-06-09 10:24:08 +02:00
Viktor Dukhovni	005fa3e00e	Note finished state in cipher BIO EOF ... When the cipher BIO encounters a non-retriable EOF (or error), mark the state as "finished", else a subsequent BIO_flush() or attempted read may attempt to finalise the crypto state again, and fail, leading, for example, to users seeing erroneous apparent decryption failure. This is not a new problem, the fix should be backported to all supported releases. It was made more apparent by recent changes to the base64 BIO, which returns a non-retriable EOF when padding is seen at the end of the base64 data, even if the underlying next BIO is "retriable". Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27680)	2025-05-29 16:02:26 +02:00
Pauli	8bdb122877	evp: add EVP_PKEY_get_security_category function ... Reviewed-by: Shane Lontis <shane.lontis@oracle.com> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/27571)	2025-05-27 18:01:44 +10:00
Tomas Mraz	52a2b3d82f	Avoid leaking duplicated EVP_PKEY_CTX in case of error ... Fixes Coverity 1647946 1647947 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27686) (cherry picked from commit 240228979b)	2025-05-23 17:39:09 +02:00
Dr. David von Oheimb	8626a716b0	crypto/evp/signature.c: add checks for consistent presence of 'update' and 'final' functions ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27367)	2025-05-20 21:19:34 +02:00
Dr. David von Oheimb	4a9a59cb07	crypto/evp/signature.c: add more specific diagnostic data in case provider does not implement functions needed ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27367)	2025-05-20 21:19:34 +02:00
Dr. David von Oheimb	3a57fb1386	crypto/evp/signature.c: compensate for providers not adding error queue entries on operation failure ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27367)	2025-05-20 21:19:34 +02:00
Dr. David von Oheimb	72351b0d18	crypto/evp: compensate for providers not adding error queue entries for keymgmt, sigver, and asymcipher ... Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27367)	2025-05-20 21:19:34 +02:00
Kenjiro Nakayama	305bbc1837	bio_b64.c: Replace OPENSSL_assert() calls with ossl_assert() ... Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27401)	2025-04-30 15:53:44 +02:00
slontis	3c22da7346	Fix EVP_PKEY_CTX_dup() so that it copies the keymanager. ... A call to EVP_PKEY_CTX_new() creates a keymgmt pointer internally, but EVP_PKEY_CTX_dup() does not copy this field. Calling EVP_PKEY_derive_set_peer_ex() after EVP_PKEY_CTX_dup() resulted in a segfault because it tried to access this pointer. EVP_PKEY_CTX_dup() has been updated to copy the keymanager (and upref it). Reported by Eamon ODea (Oracle). Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Paul Dale <ppzgs1@gmail.com> (Merged from https://github.com/openssl/openssl/pull/27304)	2025-04-15 15:44:58 +01:00
fangming.fang	86408fa8de	Implement interleaving aes-cbc-hmac-sha on aarch64 ... This is to implement #19932, it adds enc-then-mac aes-cbc-hmac-sha1/256, aes-cbc and hmac-sha1/256 are interleaved to achieve better performance. It only supports non-padding mode that means the length of input data should be multiple of 16 bytes. Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/22949)	2025-04-14 14:53:30 +01:00
Viktor Dukhovni	27b88364e4	Avoid erroneous legacy code path when provided ... Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/27075)	2025-03-20 11:33:23 +01:00
Tomas Mraz	c8654f79f4	Keep the provided peer EVP_PKEY in the EVP_PKEY_CTX too ... Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26976)	2025-03-14 09:44:52 +01:00
openssl-machine	0c679f5566	Copyright year updates ... Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> Release: yes	2025-03-12 13:35:59 +00:00
Jakub Zelenka	5045712d3d	Fix libctx passing for CMS PWRI use ... Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26937)	2025-03-03 09:26:44 +01:00
Valerii Krygin	f86acc9434	EVP_DecodeUpdate() should not produce padding zeros to the decoded output (Fixes #26677) ... EVP_DecodeUpdate() should not produce zeros for input padding `=` signs to avoid writing to non-allocated memory regions. To achieve this: - Add `eof` parameter to `evp_decodeblock_int` function in `openssl/crypto/evp`. The parameter should either contain the number of the input padding characters to ignore or `-1` if the function has to count them. - Use precalculated `eof` in `EVP_DecodeUpdate` to fix its behaviour. - Use `eof = -1` in `EVP_DecodeFinal` to count it in `evp_decodeblock_int`. - Do not ignore padding in `EVP_DecodeBlock` (`eof = 0`) because it should write padding zeros according to the documentation. - Add the HISTORY section to EVP_EncodeInit documentation to describe the fix. Other changes: - Update AUTHORS.md - Update the copyright date in the documentation. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26678)	2025-02-27 17:38:57 +00:00
Andrew Dinh	b4fab70bfb	EVP_PKEY_derive_set_peer_ex(): Don't free peer on error ... In EVP_PKEY_derive_set_peer_ex, don't free peer on error. Revert to existing functionality. Bug was introduced with https://github.com/openssl/openssl/pull/26294 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26823)	2025-02-25 15:47:08 +01:00
Dmitry Belyavskiy	17bbc16383	EVP_SKEY_get_raw_key => EVP_SKEY_get0_raw_key ... Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26832)	2025-02-21 17:58:41 +01:00
Tomas Mraz	560e586371	Refactor EVP_SKEY initialization ... Enforce that skeymgmt cannot ever be NULL in EVP_SKEY. Also add missing allocation checks. Fixes multiple issues found by Coverity. Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/26795)	2025-02-20 20:35:59 +01:00
Dmitry Belyavskiy	c152a94395	Fix coverity finding ... Coverity ID: 1643094 Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26831)	2025-02-20 16:28:22 +01:00
Dmitry Belyavskiy	83ced5e6b1	Fix coverity issues ... Fixes coverity issues 1642964, 1642965, 1642966, 1642968, 1642969 Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> (Merged from https://github.com/openssl/openssl/pull/26793)	2025-02-18 18:12:10 +01:00
Frederik Wedel-Heinen	00fbc96988	Adds missing checks of return from XXX_up_ref(). ... Reviewed-by: Saša Nedvědický <sashan@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26294)	2025-02-18 16:32:59 +01:00
slontis	8f86a75fcf	SLH-DSA: Remove legacy ASN1 method tables for SLH-DSA. Update to use ... custom encoders for SLH_DSA decode_der2key. Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25882)	2025-02-18 10:17:29 +01:00
slontis	79e7c83711	SLH-DSA cleanups ... Addressed some review comments. - Ref counting has been removed from SLH_DSA_KEY (EVP_PKEY is responsible for the keys ref counting). - Moved constants and prefetched objects into SLH_DSA_KEY. - The SLH_DSA_HASH_CTX is still required since there are multiple contexts that need to propagate to a lot of functions, but it no longer contains the constants. Note that it also holds a pointer to the SLH_DSA_KEY. Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25882)	2025-02-18 10:17:29 +01:00
slontis	a25bcde26a	Add SLH-DSA encoder/decoder support. ... This required adding additional EVP_PKEY_ASN1_METHOD methods. Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Viktor Dukhovni <viktor@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/25882)	2025-02-18 10:17:29 +01:00
Simo Sorce	fc00d9b7b1	Add additional EVP_SKEY helpers ... EVP_SKEY_is_a() allows to check if a key is of a specific type. EVP_SKEY_to_provider() provides an easy way to move a key to a different provider. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/26753)	2025-02-15 18:51:31 +01:00
Simo Sorce	71debb7b84	Allow import of unknown keys via generic type ... This allows to use SKEY even w/o a specific skey managment available, however it bears the risk of allowing users to mispell the key type and not see the error of their ways until they expect a specific provider to pick this up and fail. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/26753)	2025-02-15 18:51:31 +01:00
Dmitry Belyavskiy	759570bfed	Implement EVP_MAC_init_SKEY ... Signed-off-by: Dmitry Belyavskiy <beldmit@gmail.com> Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26753)	2025-02-15 18:51:30 +01:00
Simo Sorce	787a083d42	Add skeymgmt helper to fetch from a provider ... This allows to fetch efficiently directly from the same provider that can handle the EVP_SKEY at hand. Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/26753)	2025-02-15 18:51:30 +01:00
Dmitry Belyavskiy	d46e010cd2	EVP_SKEY implementation for EVP_CIPHER ... Signed-off-by: Dmitry Belyavskiy <beldmit@gmail.com> Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26753)	2025-02-15 18:51:30 +01:00
Pauli	b6c5342613	evp: add additional functions for FIPS internal use to support hybrids KEMs ... Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26714)	2025-02-14 17:08:42 +01:00
Pauli	53e3a54b60	evp: include one shot keygen functions for internal FIPS use ... Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26714)	2025-02-14 17:08:42 +01:00
Pauli	236d5d8f72	fips: FIPS ignores property queries for internal algorithm fetches ... Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Neil Horman <nhorman@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26714)	2025-02-14 17:08:42 +01:00
Simo Sorce	d037551ee3	Change also other DRBG's algorithm fetching ... - DRBG_HASH - DRBG_HMAC Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/26542)	2025-02-11 21:48:15 +01:00
Simo Sorce	c9a2ce6111	Prefer DRBG ciphers from the same provider ... Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> (Merged from https://github.com/openssl/openssl/pull/26542)	2025-02-11 21:48:15 +01:00
Bartel Artem	93d366bea6	EVP_DigestSign(): Check pctx != NULL ... Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26551)	2025-01-28 21:03:46 +01:00
Viktor Dukhovni	a69288d04a	Clarify docs of EVP_CIPHER*_get_block_size ... Also, tolerate NULL input ctx, just like NULL cipher. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26561)	2025-01-28 23:09:15 +11:00
Dmitry Belyavskiy	40c01d8ddc	Expanding trace of providers algorithms fetching/caching/etc ... Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26543)	2025-01-27 09:07:48 +01:00
Frederik Wedel-Heinen	3ffa64cd45	Pass functions with correct signatures to the evp_generic_fetch_xxx methods ... UBSan complains about functions being called with incorrect signatures. Relates to #22896 Reviewed-by: Paul Dale <ppzgs1@gmail.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26318)	2025-01-07 21:24:13 +01:00
otherddn1978	82e7a1130a	Check whether ctx->pctx != NULL ... If it is NULL, ctx->pctx->pmeth dereference will cause a crash. Found by Linux Verification Center (linuxtesting.org) with SVACE. Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/26176)	2024-12-17 14:53:14 +01:00