openssl/crypto, branch openssl-3.3.1

Copyright year updates

2024-06-04T12:50:58Z

Reviewed-by: Neil Horman Release: yes

uefi: move variables

2024-05-30T16:38:39Z

Fixes "unused variable" warnings with OPENSSL_SYS_UEFI. Signed-off-by: Gerd Hoffmann Reviewed-by: Matt Caswell Reviewed-by: Todd Short Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24459) (cherry picked from commit 7bc10f6ce2f91714d39a0410bfc545d79913e343)

threads_pthread.c: change inline to ossl_inline

2024-05-28T15:19:49Z

Reviewed-by: Neil Horman Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/24502) (cherry picked from commit 36ba419286843bcaeb497b3451540ab7587cf9d2)

Check DSA parameters for excessive sizes before validating

2024-05-16T13:45:07Z

This avoids overly long computation of various validation checks. Fixes CVE-2024-4603 Reviewed-by: Paul Dale Reviewed-by: Matt Caswell Reviewed-by: Neil Horman Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/24346) (cherry picked from commit 85ccbab216da245cf9a6503dd327072f21950d9b)

fix sm2 encryption implementation bug.

2024-05-15T09:17:42Z

According to the "GB/T 32918.4-2016" section 6.1 encryption, step A5: If result of the "KDF" is all zeros, we should go back to the begin(step A1). section 7.1 decryption, step B4: If result of the "KDF" is all zeros, we should raise error and exit. Signed-off-by: Liu-Ermeng Reviewed-by: Neil Horman Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/23210) (cherry picked from commit 170620675dfd74f34bdcf8aba71dffeb07f3d533)

Add reason codes with the correct offset for two alerts

2024-05-14T13:27:42Z

Fixes #24300. The current values of SSL_R_NO_APPLICATION_PROTOCOL and SSL_R_PSK_IDENTITY_NOT_FOUND don't allow for a correct lookup of the corresponding reason strings. CLA: trivial Reviewed-by: Matt Caswell Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24351) (cherry picked from commit a401aaf9ed6eb34842cdedfcc35448bdc4174df3)

threads_win: fix build error with VS2010

2024-05-14T13:26:03Z

VC 2010 or earlier compilers do not support static inline. To work around this problem, we can use the ossl_inline macro. Fixes: crypto\threads_win.c(171) : error C2054: expected '(' to follow 'inline' crypto\threads_win.c(172) : error C2085: 'get_hold_current_qp' : not in formal parameter list crypto\threads_win.c(172) : error C2143: syntax error : missing ';' before '{' crypto\threads_win.c(228) : warning C4013: 'get_hold_current_qp' undefined; assuming extern returning int crypto\threads_win.c(228) : warning C4047: '=' : 'rcu_qp *' differs in levels of indirection from 'int' Signed-off-by: Georgi Valkov Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24370) (cherry picked from commit d8dd1dfdf5cf2343f6afd43dad4ce37045218624)

Implement riscv_vlen_asm for riscv32

2024-05-10T15:03:14Z

riscvcap.c: undefined reference to 'riscv_vlen_asm' Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24270) (cherry picked from commit 87314d24c4f025df1ebf47dc527cc8a96bef354a)

Coverity found the following issues:

2024-05-06T14:17:14Z

1591471 1591474 1591476 which pertain to memory leaks in the conf_mod code If an error is encountered after the module STACK_OF is duplicated or created in the new_modules variable, we need to remember to free it in the error path Reviewed-by: Tomas Mraz Reviewed-by: Paul Dale Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/24337)

Fix error handling in CMS_EncryptedData_encrypt

2024-05-06T08:13:40Z

That caused several memory leaks in case of error. Also when the CMS object that is created by CMS_EncryptedData_encrypt is not used in the normal way, but instead just deleted by CMS_ContentInfo_free some memory was lost. Fixes #21985 Reviewed-by: Todd Short Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/22031) (cherry picked from commit 6d2a01cdfb56fdb8ea5d5dd417724e6906c8b8e2)