root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity
34,572 Commits 32 Branches 398 Tags 545 MiB
Commit Graph

5253 Commits

Author SHA1 Message Date
Dimitri Papadopoulos 164a541b93 Fix new typos found by codespell 
Reviewed-by: Paul Yang <kaishen.yy@antfin.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23133)
 2023-12-29 10:12:05 +01:00
Hugo Landau d59c3febdc QUIC: Move CID generation to quic_types.c 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau fdd60dacc4 Minor updates 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 04c561ce4b QUIC PORT: Add explicit cast to get_time wrapper 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 33ca076372 Minor fixes 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau b71046b4a4 Minor updates 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 22739cc3ac QUIC APL, TSERVER: Start using a QUIC_ENGINE object 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 53f78eb721 QUIC ENGINE: Add unused QUIC_ENGINE object 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 3e4b8e8c53 QUIC CHANNEL: Remove obsolete SRT definitions 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau f61a37d17b QUIC PORT: Add missing copyright header 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 3051339887 QUIC PORT: Fix BIO_dgram usage under Winsock due to bind requirement 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 4df4add22d QUIC PORT: Allow errors to be tracked at port level 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 0225d42bce QUIC PORT: Formalise states of a port 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 963cf3a49a QUIC PORT: Resolve TODOs 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 6d76d13e54 QUIC DEMUX: Remove obsolete SRT handling code 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:06 +00:00
Hugo Landau 29fbdfafaf QUIC CHANNEL, LCIDM: Factor duplicate CID generation function 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau 4760116f5a QUIC CHANNEL: Finish cleanup of LCIDM integration 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau 5f86ae32c2 QUIC CHANNEL: Finish moving SRT handling to SRTM 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau da15093a31 QUIC DEMUX: Remove legacy routing code 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau ef95d8ddca QUIC QRX: Remove legacy DEMUX-QRX routing code 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau 52dfe6f1c1 QUIC CHANNEL: Phase out use of QRX-DEMUX routing in favour of PORT-LCIDM routing 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:12:00 +00:00
Hugo Landau cce6fccd4e QUIC CHANNEL: Keep a reference to our LCIDM 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 0df897321d QUIC PORT: Enable injection of incoming URXEs into a channel via default handler rather than DEMUX routing 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau d743afe7e8 QUIC DEMUX: Allow parsed DCID to be learnt in default packet handler 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau bbae4bb325 QUIC PORT: Create a LCIDM 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 6107619899 QUIC PORT: Partially move stateless reset handling to port 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau a4be37b8ce QUIC PORT: Add SRTM wiring 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 073e5bc781 QUIC CHANNEL: Remove legacy calls for functionality moved to QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 632b0c7e8c QUIC PORT, CHANNEL: Move ticking code into QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 4ed6b48d9d QUIC PORT, CHANNEL: Move DEMUX and default packet handling out of CHANNEL 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 2d80e45901 QUIC PORT: Make QUIC_PORT responsible for creation of all channels 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 2954287041 QUIC PORT: Record a SSL_CTX for use when creating handshake layer objects 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau ce503f5c85 QUIC PORT: Keep a list of all child channels 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau f98bc5c95b QUIC CHANNEL, PORT: Abstract time retrieval 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 34fa182e1d QUIC CHANNEL, TSERVER: Move to using libctx/propq/mutex/now_cb via QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 496f0beb99 QUIC CHANNEL: Make a QUIC_PORT mandatory 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 167e5f34c8 QUIC TSERVER: Provide a TSERVER's QUIC_CHANNEL with a currently unused QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau f767101225 QUIC APL: Provide the QUIC_CHANNEL with a currently unused QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 12ab8afceb QUIC CHANNEL: Keep a reference to a QUIC_PORT 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau 154131da11 QUIC PORT: Add basic unwired QUIC_PORT object 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
Hugo Landau e801455446 QUIC CHANNEL: Consolidate forward object declarations in a single header 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22674)
 2023-12-21 08:11:59 +00:00
lan1120 e8e95f20a9 Make SSL_clear_options pass new options to record layer 
Signed-off-by: lan1120 <lanming@huawei.com>

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23045)
 2023-12-20 13:38:45 +00:00
Tomas Mraz 430dcbd046 Consolidate raising errors in SSL_CONF_cmd() 
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/23048)
 2023-12-19 12:03:02 +01:00
Tomas Mraz 69c067ffbc Always apply all configuration settings from the ssl section 
Even if some configuration entry is incorrect, do not
skip the remaining ones.

Fixes #20789

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/23048)
 2023-12-19 12:03:02 +01:00
Matt Caswell e07b5e1a0a Ensure the default length calculation includes the content type byte 
TLSv1.3 includes an extra byte after the payload for the content type.
We should incorporate that in the calculation of the default buffer length.

Fixes #23015

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23021)
 2023-12-19 10:47:29 +00:00
Frederik Wedel-Heinen 78ef740999 Remove redundant logic for DTLS server version selection 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22989)
 2023-12-18 09:56:34 +00:00
Frederik Wedel-Heinen f4ad7c2f73 Handle tls and dtls server version selection similarly 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22989)
 2023-12-18 09:56:34 +00:00
Hugo Landau 708b4fb708 QUIC LCIDM: Fix usage of LHASH 
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22981)
 2023-12-13 15:26:59 +00:00
Matt Caswell e46a6b1a5d Remove some redundant code 
We remove a function that was left behind and is no longer called after the
record layer refactor

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/22864)
 2023-12-12 16:06:54 +00:00
Matt Caswell afcc12c41a Don't attempt to set provider params on an ENGINE based cipher 
If an ENGINE has been loaded after the SSL_CTX has been created then
the cipher we have cached might be provider based, but the cipher we
actually end up using might not be. Don't try to set provider params on
a cipher that is actually ENGINE based.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
(Merged from https://github.com/openssl/openssl/pull/22864)
 2023-12-12 16:06:54 +00:00