openssl.git
3 months agoQUIC: Add glossary entry for RIO
Hugo Landau [Wed, 31 Jan 2024 12:36:45 +0000 (12:36 +0000)]
QUIC: Add glossary entry for RIO

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)

3 months agoQUIC: Add polling API
Hugo Landau [Wed, 31 Jan 2024 12:35:15 +0000 (12:35 +0000)]
QUIC: Add polling API

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)

3 months agoBIO: Add SSL poll descriptor type
Hugo Landau [Wed, 31 Jan 2024 12:34:21 +0000 (12:34 +0000)]
BIO: Add SSL poll descriptor type

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23495)

3 months agoRemove unused function arguments from tls_int_new_record_layer
Frederik Wedel-Heinen [Wed, 7 Feb 2024 18:41:40 +0000 (19:41 +0100)]
Remove unused function arguments from tls_int_new_record_layer

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23514)

3 months agoTHREADING: Make CRYPTO_MUTEX and CRYPTO_CONDVAR typesafe
Hugo Landau [Thu, 8 Feb 2024 10:27:56 +0000 (10:27 +0000)]
THREADING: Make CRYPTO_MUTEX and CRYPTO_CONDVAR typesafe

There was really no need for this to be void and it made bugs very easy
to introduce accidentally, especially given that the free functions
needed to be passed a pointer to the pointer.

Also fix some bugs in the QUIC code detected immediately by this change.

.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23519)

3 months agoAmend CHANGES.md/NEWS.md to reflect DN output changes
Dmitry Belyavskiy [Wed, 7 Feb 2024 10:27:23 +0000 (11:27 +0100)]
Amend CHANGES.md/NEWS.md to reflect DN output changes

Fixes #23492

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23507)

3 months agoWindows: Add _dclass to the allowed symbols list
Hugo Landau [Thu, 8 Feb 2024 10:36:50 +0000 (10:36 +0000)]
Windows: Add _dclass to the allowed symbols list

We use isnan() and isinf() in JSON_ENC now, which is translated to a
call to Microsoft's standard library function _dclass.

.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23517)

3 months agoQUIC QLOG: Fix use of size_t and uint64_t
Hugo Landau [Thu, 8 Feb 2024 10:12:45 +0000 (10:12 +0000)]
QUIC QLOG: Fix use of size_t and uint64_t

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23517)

3 months agoQUIC QLOG: Retrieve PID correctly on Windows
Hugo Landau [Thu, 8 Feb 2024 09:55:24 +0000 (09:55 +0000)]
QUIC QLOG: Retrieve PID correctly on Windows

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23517)

3 months agoJSON_ENC: Fix unit test for MSVC
Hugo Landau [Thu, 8 Feb 2024 09:41:23 +0000 (09:41 +0000)]
JSON_ENC: Fix unit test for MSVC

Previously scripts were defined like this:

    {
        static const char *const script_name = "xxx";

        static const struct script_info script_info = {
            script_name, ...
        };

        return &script_info;
    }

MSVC cannot handle this, presumably because this technically involves a
load from a variable to determine that script_name equals "xxx" and it
is unable to do this during evaluation of a constant initializer list.
Resolve this by changing script_name and script_title to be arrays
instead, allowing the correct pointer values to be filled into
script_info as symbol addresses/relocations rather than dereferences.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23517)

3 months agoQUIC qlog: Enable qlog in Windows CI
Hugo Landau [Thu, 8 Feb 2024 09:11:46 +0000 (09:11 +0000)]
QUIC qlog: Enable qlog in Windows CI

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23517)

3 months agoFix memory leaks on error cases during drbg initializations
Tomas Mraz [Wed, 7 Feb 2024 09:27:50 +0000 (10:27 +0100)]
Fix memory leaks on error cases during drbg initializations

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23503)

3 months agoRearrange terms in gf_mul to prevent segfault
Angel Baez [Wed, 7 Feb 2024 15:34:48 +0000 (10:34 -0500)]
Rearrange terms in gf_mul to prevent segfault

CLA: trivial

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23512)

3 months agoRemove unneeded stuff
Frederik Wedel-Heinen [Wed, 31 Jan 2024 08:35:58 +0000 (09:35 +0100)]
Remove unneeded stuff

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoRefactor skip test statements.
Frederik Wedel-Heinen [Wed, 31 Jan 2024 08:35:27 +0000 (09:35 +0100)]
Refactor skip test statements.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoAdds some version guards for dummy proxy.
Frederik Wedel-Heinen [Wed, 31 Jan 2024 08:16:47 +0000 (09:16 +0100)]
Adds some version guards for dummy proxy.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoDon't use dtls proxy on windows.
Frederik Wedel-Heinen [Wed, 31 Jan 2024 07:39:10 +0000 (08:39 +0100)]
Don't use dtls proxy on windows.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoCheck if creating a tlsproxy instance per use allows to run the tests on windows.
Frederik Wedel-Heinen [Tue, 30 Jan 2024 13:51:32 +0000 (14:51 +0100)]
Check if creating a tlsproxy instance per use allows to run the tests on windows.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoFix test runs on builds without tls1_3
Frederik Wedel-Heinen [Tue, 30 Jan 2024 13:29:53 +0000 (14:29 +0100)]
Fix test runs on builds without tls1_3

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoSkip tests if build does not support dtls1.2 or tls1.2
Frederik Wedel-Heinen [Tue, 30 Jan 2024 09:31:00 +0000 (10:31 +0100)]
Skip tests if build does not support dtls1.2 or tls1.2

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoRemove obsolete comment.
Frederik Wedel-Heinen [Tue, 30 Jan 2024 09:09:07 +0000 (10:09 +0100)]
Remove obsolete comment.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoMerge dtls and tls records tests
Frederik Wedel-Heinen [Tue, 30 Jan 2024 09:00:39 +0000 (10:00 +0100)]
Merge dtls and tls records tests

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoDon't run dtls test on windows.
Frederik Wedel-Heinen [Fri, 26 Jan 2024 11:14:57 +0000 (12:14 +0100)]
Don't run dtls test on windows.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agochomp does not work on windows.
Frederik Wedel-Heinen [Fri, 26 Jan 2024 10:27:02 +0000 (11:27 +0100)]
chomp does not work on windows.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoHandle DTLS 1.2 in CertificateVerify messages
Frederik Wedel-Heinen [Tue, 23 Jan 2024 14:18:51 +0000 (15:18 +0100)]
Handle DTLS 1.2 in CertificateVerify messages

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoUse open2 instead of open for s_server instance
Frederik Wedel-Heinen [Mon, 22 Jan 2024 13:12:06 +0000 (14:12 +0100)]
Use open2 instead of open for s_server instance

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoSupport DTLS in TLS::Proxy.
Frederik Wedel-Heinen [Thu, 11 Jan 2024 13:18:07 +0000 (14:18 +0100)]
Support DTLS in TLS::Proxy.

Fixes #23199

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23319)

3 months agoMinor updates
Hugo Landau [Wed, 7 Feb 2024 12:43:02 +0000 (12:43 +0000)]
Minor updates

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC APL: Move NULL pointer check to quic_impl.c
Hugo Landau [Wed, 7 Feb 2024 08:54:21 +0000 (08:54 +0000)]
QUIC APL: Move NULL pointer check to quic_impl.c

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC CHANNEL: Optimise struct packing
Hugo Landau [Wed, 7 Feb 2024 08:49:30 +0000 (08:49 +0000)]
QUIC CHANNEL: Optimise struct packing

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoFixup multistream test
Hugo Landau [Fri, 2 Feb 2024 09:14:26 +0000 (09:14 +0000)]
Fixup multistream test

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoFix error code collision
Hugo Landau [Tue, 30 Jan 2024 08:02:39 +0000 (08:02 +0000)]
Fix error code collision

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoMinor fixes after rebase
Hugo Landau [Mon, 29 Jan 2024 15:39:42 +0000 (15:39 +0000)]
Minor fixes after rebase

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoMinor fix
Hugo Landau [Mon, 29 Jan 2024 15:35:24 +0000 (15:35 +0000)]
Minor fix

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC MULTISTREAM TEST: Make test resilient on stochastic platforms
Hugo Landau [Mon, 22 Jan 2024 14:29:26 +0000 (14:29 +0000)]
QUIC MULTISTREAM TEST: Make test resilient on stochastic platforms

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQuiet false warning about uninitialised variable
Hugo Landau [Mon, 22 Jan 2024 14:17:24 +0000 (14:17 +0000)]
Quiet false warning about uninitialised variable

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC MULTISTREAM TEST: Test available stream count API
Hugo Landau [Mon, 22 Jan 2024 14:08:37 +0000 (14:08 +0000)]
QUIC MULTISTREAM TEST: Test available stream count API

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC MULTISTREAM TEST: Test idle timeout configuration
Hugo Landau [Mon, 22 Jan 2024 14:00:45 +0000 (14:00 +0000)]
QUIC MULTISTREAM TEST: Test idle timeout configuration

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC CHANNEL: Fix idle timeout computation bug
Hugo Landau [Mon, 22 Jan 2024 14:00:05 +0000 (14:00 +0000)]
QUIC CHANNEL: Fix idle timeout computation bug

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC CHANNEL: Defer transport parameter generation
Hugo Landau [Mon, 22 Jan 2024 13:53:30 +0000 (13:53 +0000)]
QUIC CHANNEL: Defer transport parameter generation

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoAdd CHANGES entry
Hugo Landau [Mon, 22 Jan 2024 13:31:41 +0000 (13:31 +0000)]
Add CHANGES entry

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC APL: Add feature query implementation
Hugo Landau [Mon, 22 Jan 2024 13:16:58 +0000 (13:16 +0000)]
QUIC APL: Add feature query implementation

Fixes https://github.com/openssl/project/issues/412
Fixes https://github.com/openssl/project/issues/415

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC CHANNEL: Add idle timeout configuration and stream count APIs
Hugo Landau [Mon, 22 Jan 2024 13:16:25 +0000 (13:16 +0000)]
QUIC CHANNEL: Add idle timeout configuration and stream count APIs

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC RXFC: Add accessor for credit
Hugo Landau [Mon, 22 Jan 2024 13:15:08 +0000 (13:15 +0000)]
QUIC RXFC: Add accessor for credit

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC: Add new error codes for tuning API
Hugo Landau [Mon, 22 Jan 2024 13:14:53 +0000 (13:14 +0000)]
QUIC: Add new error codes for tuning API

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoQUIC: Add documentation for tuning API
Hugo Landau [Mon, 22 Jan 2024 11:42:41 +0000 (11:42 +0000)]
QUIC: Add documentation for tuning API

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23360)

3 months agoWrong release version for EVP_DigestSqueeze() in documentation
Shakti Shah [Sat, 3 Feb 2024 19:57:12 +0000 (01:27 +0530)]
Wrong release version for EVP_DigestSqueeze() in documentation

The mentioned function is targeted for 3.3.0 and EVP_MD_CTX_dup()
was added in 3.1.

Fixes #23461

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23467)

3 months agoConfigure: Fix ordering bug when processing split DEPENDs
Richard Levitte [Wed, 7 Feb 2024 03:38:28 +0000 (04:38 +0100)]
Configure: Fix ordering bug when processing split DEPENDs

Configure was recently made to process this sort of line:

    DEPEND[generated]=util/perl|OpenSSL/something.pm

Unfortunately, in processing such lines, the order in which paths
were recomputed caused some resulting paths to be faulty under some
circumstances.  This change fixes that.

Fixes #22853

Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23500)

(cherry picked from commit 64cae4064405384cf7fe130a1e0189725db5e877)

3 months agoFix sm4-xts aarch64 assembly implementation bug
Liu-Ermeng [Wed, 17 Jan 2024 02:04:32 +0000 (18:04 -0800)]
Fix sm4-xts aarch64 assembly implementation bug

Tested on kunpeng920, to turn on 'VPSM4_EX_CAPABLE'.

Signed-off-by: Liu-Ermeng <liuermeng2@huawei.com>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23317)

3 months agoFix testcases to run on duplicated keys
Tomas Mraz [Fri, 12 Jan 2024 17:47:56 +0000 (18:47 +0100)]
Fix testcases to run on duplicated keys

The existing loop pattern did not really run the expected
tests on the duplicated keys.

Fixes #23129

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23292)

3 months agoCONTRIBUTING.md: add missing "on"
James Muir [Tue, 6 Feb 2024 00:01:28 +0000 (19:01 -0500)]
CONTRIBUTING.md: add missing "on"

"Guidelines how to" -> "Guidelines on how to"

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23488)

3 months agoFix SM2 test failures on Apple Silicon
Xu Yizhou [Sun, 4 Feb 2024 08:30:02 +0000 (16:30 +0800)]
Fix SM2 test failures on Apple Silicon

This patch is to fix #23368.

Signed-off-by: Xu Yizhou <xuyizhou1@huawei.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23472)

3 months agoAdd a missing space in an error message
Vincent Lefèvre [Mon, 5 Feb 2024 09:45:20 +0000 (10:45 +0100)]
Add a missing space in an error message

CLA: trivial

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23481)

3 months agos390x: Fix build on s390x with 'disable-asm'
Ingo Franzki [Fri, 2 Feb 2024 09:20:55 +0000 (10:20 +0100)]
s390x: Fix build on s390x with 'disable-asm'

Do not define S390X_MOD_EXP for a NO_ASM build, this would result in
unresolved externals for s390x_mod_exp and s390x_crt.

Signed-off-by: Ingo Franzki <ifranzki@linux.ibm.com>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23458)

3 months agoClarify X509_STORE_CTX_init() documentation in the man page
Shakti Shah [Tue, 30 Jan 2024 19:44:34 +0000 (01:14 +0530)]
Clarify X509_STORE_CTX_init() documentation in the man page

Fixes #21203
CLA: trivial

Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23435)

3 months agoAIX: Implement shared_target = "aix-solib" support
John Kohl [Fri, 21 Jul 2023 14:31:34 +0000 (10:31 -0400)]
AIX: Implement shared_target = "aix-solib" support

This builds shared libraries as libxxx.so, libxxx.so.ver and static
libraries as libxxx.a.  For shlib_variant builds, it builds libxxx.so,
libxxxvariant.so.ver, and libxxxx.a.  libxxx.so is a linker import
library that directs the linker to embed a run-time dependency
reference to libxxxvariant.so.ver.  Only libxxxvariant.so.ver is needed
at runtime.

Fixes #21518

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21540)

3 months agoAdd support in configuration for android-riscv64
Prashanth Swaminathan [Mon, 29 Jan 2024 21:20:54 +0000 (13:20 -0800)]
Add support in configuration for android-riscv64

Android is enabling support for the riscv64 ISA. Add a configuration
option to support building for it, aligned with the existing
linux-riscv64 configuration.

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/23427)

3 months agoFix a few incorrect paths in some build.info files
Richard Levitte [Thu, 1 Feb 2024 09:57:51 +0000 (10:57 +0100)]
Fix a few incorrect paths in some build.info files

The following files referred to ../liblegacy.a when they should have
referred to ../../liblegacy.a.  This cause the creation of a mysterious
directory 'crypto/providers', and because of an increased strictness
with regards to where directories are created, configuration failure
on some platforms.

Fixes #23436

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
(Merged from https://github.com/openssl/openssl/pull/23452)

(cherry picked from commit 667b45454a47959ce2934b74c899662e686993de)

3 months agoQUIC QLOG: Fix indentation
Hugo Landau [Thu, 1 Feb 2024 11:02:22 +0000 (11:02 +0000)]
QUIC QLOG: Fix indentation

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Namespace the RUN_CI_TESTS variable
Hugo Landau [Thu, 1 Feb 2024 11:01:44 +0000 (11:01 +0000)]
QUIC QLOG: Namespace the RUN_CI_TESTS variable

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Use set0
Hugo Landau [Thu, 1 Feb 2024 11:00:55 +0000 (11:00 +0000)]
QUIC QLOG: Use set0

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Minor manpage updates
Hugo Landau [Thu, 1 Feb 2024 10:59:10 +0000 (10:59 +0000)]
QUIC QLOG: Minor manpage updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Minor doc updates
Hugo Landau [Thu, 1 Feb 2024 10:31:25 +0000 (10:31 +0000)]
QUIC QLOG: Minor doc updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoMinor fixes
Hugo Landau [Mon, 29 Jan 2024 15:00:33 +0000 (15:00 +0000)]
Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoMinor fixes
Hugo Landau [Mon, 29 Jan 2024 14:49:09 +0000 (14:49 +0000)]
Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoMinor fixes
Hugo Landau [Mon, 29 Jan 2024 14:35:16 +0000 (14:35 +0000)]
Minor fixes

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Don't build QLOG test if QLOG is disabled
Hugo Landau [Mon, 29 Jan 2024 14:28:06 +0000 (14:28 +0000)]
QUIC QLOG: Don't build QLOG test if QLOG is disabled

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Record implementation version
Hugo Landau [Mon, 29 Jan 2024 14:20:01 +0000 (14:20 +0000)]
QUIC QLOG: Record implementation version

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Add unit test
Hugo Landau [Mon, 29 Jan 2024 13:58:40 +0000 (13:58 +0000)]
QUIC QLOG: Add unit test

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Allow PID to be overridden
Hugo Landau [Mon, 29 Jan 2024 13:58:18 +0000 (13:58 +0000)]
QUIC QLOG: Allow PID to be overridden

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: CI-only test
Hugo Landau [Mon, 29 Jan 2024 13:09:49 +0000 (13:09 +0000)]
QUIC QLOG: CI-only test

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoAdd CI-only tests to workflow files
Hugo Landau [Wed, 24 Jan 2024 13:11:56 +0000 (13:11 +0000)]
Add CI-only tests to workflow files

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Fix filter lexing
Hugo Landau [Mon, 29 Jan 2024 12:37:35 +0000 (12:37 +0000)]
QLOG: Fix filter lexing

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoJSON_ENC: Fix initial value of error
Hugo Landau [Mon, 29 Jan 2024 12:37:10 +0000 (12:37 +0000)]
JSON_ENC: Fix initial value of error

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC CHANNEL: Ensure QLOG instance is used correctly on server side
Hugo Landau [Mon, 29 Jan 2024 12:36:52 +0000 (12:36 +0000)]
QUIC CHANNEL: Ensure QLOG instance is used correctly on server side

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QTX: Refactor to enable qlog logging of injected frames
Hugo Landau [Mon, 29 Jan 2024 12:36:29 +0000 (12:36 +0000)]
QUIC QTX: Refactor to enable qlog logging of injected frames

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC TXP: Allow QLOG instance to be changed after instantiation
Hugo Landau [Mon, 29 Jan 2024 12:36:11 +0000 (12:36 +0000)]
QUIC TXP: Allow QLOG instance to be changed after instantiation

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QTX: Allow QLOG instance to be changed after instantiation
Hugo Landau [Mon, 29 Jan 2024 12:35:49 +0000 (12:35 +0000)]
QUIC QTX: Allow QLOG instance to be changed after instantiation

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC FIFD: Allow QLOG instance to be changed after instantiation
Hugo Landau [Mon, 29 Jan 2024 12:34:54 +0000 (12:34 +0000)]
QUIC FIFD: Allow QLOG instance to be changed after instantiation

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Minor updates
Hugo Landau [Wed, 24 Jan 2024 11:00:53 +0000 (11:00 +0000)]
QLOG: Minor updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoMinor updates
Hugo Landau [Tue, 23 Jan 2024 16:24:59 +0000 (16:24 +0000)]
Minor updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Treat empty environment variable as default filter
Hugo Landau [Tue, 23 Jan 2024 14:19:05 +0000 (14:19 +0000)]
QLOG: Treat empty environment variable as default filter

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Editorial fixes (QLOG is spelled 'qlog')
Hugo Landau [Tue, 23 Jan 2024 14:13:49 +0000 (14:13 +0000)]
QLOG: Editorial fixes (QLOG is spelled 'qlog')

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Add manpage openssl-qlog(7)
Hugo Landau [Tue, 23 Jan 2024 14:06:47 +0000 (14:06 +0000)]
QLOG: Add manpage openssl-qlog(7)

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Adjust CHANGES.md for editorial consistency
Hugo Landau [Tue, 23 Jan 2024 13:03:08 +0000 (13:03 +0000)]
QLOG: Adjust CHANGES.md for editorial consistency

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoMention QLOG in INSTALL.md
Hugo Landau [Tue, 23 Jan 2024 13:02:56 +0000 (13:02 +0000)]
Mention QLOG in INSTALL.md

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoConfigure: Add warning when enabling QLOG
Hugo Landau [Tue, 23 Jan 2024 12:50:39 +0000 (12:50 +0000)]
Configure: Add warning when enabling QLOG

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoJSON_ENC: Minor tweaks
Hugo Landau [Mon, 22 Jan 2024 14:45:00 +0000 (14:45 +0000)]
JSON_ENC: Minor tweaks

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Clarify filter docs
Hugo Landau [Mon, 22 Jan 2024 14:41:44 +0000 (14:41 +0000)]
QUIC QLOG: Clarify filter docs

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQUIC QLOG: Rename QFILTER to OSSL_QFILTER
Hugo Landau [Mon, 22 Jan 2024 14:41:32 +0000 (14:41 +0000)]
QUIC QLOG: Rename QFILTER to OSSL_QFILTER

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Add CHANGES entry
Hugo Landau [Thu, 18 Jan 2024 10:39:12 +0000 (10:39 +0000)]
QLOG: Add CHANGES entry

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Remove vestigial abort code
Hugo Landau [Thu, 18 Jan 2024 10:39:03 +0000 (10:39 +0000)]
QLOG: Remove vestigial abort code

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Fix bit_set
Hugo Landau [Wed, 17 Jan 2024 12:06:14 +0000 (12:06 +0000)]
QLOG: Fix bit_set

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Minor updates
Hugo Landau [Wed, 17 Jan 2024 10:01:46 +0000 (10:01 +0000)]
QLOG: Minor updates

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Minor fixes after port refactor
Hugo Landau [Wed, 10 Jan 2024 08:29:28 +0000 (08:29 +0000)]
QLOG: Minor fixes after port refactor

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: JSON Encoder: Rename JSON_ENC
Hugo Landau [Tue, 12 Sep 2023 11:21:44 +0000 (12:21 +0100)]
QLOG: JSON Encoder: Rename JSON_ENC

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Add debugging guide
Hugo Landau [Fri, 8 Sep 2023 14:13:51 +0000 (15:13 +0100)]
QLOG: Add debugging guide

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Events: Implement transport:packet_received
Hugo Landau [Fri, 8 Sep 2023 13:10:06 +0000 (14:10 +0100)]
QLOG: Events: Implement transport:packet_received

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Events: Implement transport:packet_sent
Hugo Landau [Fri, 8 Sep 2023 12:58:41 +0000 (13:58 +0100)]
QLOG: Events: Implement transport:packet_sent

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)

3 months agoQLOG: Wiring: QUIC QTX
Hugo Landau [Fri, 8 Sep 2023 12:56:32 +0000 (13:56 +0100)]
QLOG: Wiring: QUIC QTX

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22037)