Skip to content

Commit

Permalink
Move ktls.c into the record layer
Browse files Browse the repository at this point in the history
Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #18132)
  • Loading branch information
mattcaswell committed Aug 18, 2022
1 parent 7c29399 commit 5b24990
Show file tree
Hide file tree
Showing 4 changed files with 343 additions and 356 deletions.
7 changes: 1 addition & 6 deletions ssl/build.info
Expand Up @@ -6,11 +6,6 @@ IF[{- !$disabled{quic} -}]
SUBDIRS=quic
ENDIF

$KTLSSRC=
IF[{- !$disabled{ktls} -}]
$KTLSSRC=ktls.c
ENDIF

SOURCE[../libssl]=\
pqueue.c time.c \
statem/statem_srvr.c statem/statem_clnt.c s3_lib.c s3_enc.c \
Expand All @@ -24,7 +19,7 @@ SOURCE[../libssl]=\
ssl_asn1.c ssl_txt.c ssl_init.c ssl_conf.c ssl_mcnf.c \
bio_ssl.c ssl_err.c ssl_err_legacy.c tls_srp.c t1_trce.c ssl_utst.c \
statem/statem.c \
tls_depr.c $KTLSSRC
tls_depr.c

# For shared builds we need to include the libcrypto packet.c and quic_vlint.c
# in libssl as well.
Expand Down
344 changes: 0 additions & 344 deletions ssl/ktls.c

This file was deleted.

12 changes: 7 additions & 5 deletions ssl/record/methods/build.info
@@ -1,14 +1,16 @@
$KTLSSRC=
IF[{- !$disabled{ktls} -}]
$KTLSSRC=ktls_meth.c
ENDIF

SOURCE[../../../libssl]=\
tls_common.c ssl3_meth.c tls1_meth.c tls13_meth.c tlsany_meth.c
tls_common.c ssl3_meth.c tls1_meth.c tls13_meth.c tlsany_meth.c \
$KTLSSRC

# For shared builds we need to include the sources needed in providers
# (ssl3_cbc.c) in libssl as well.
IF[{- !$disabled{'deprecated-3.0'} -}]
SHARED_SOURCE[../../../libssl]=ssl3_cbc.c
ENDIF

IF[{- !$disabled{'ktls'} -}]
SOURCE[../../../libssl]=ktls_meth.c
ENDIF

SOURCE[../../../providers/libdefault.a ../../../providers/libfips.a]=ssl3_cbc.c

0 comments on commit 5b24990

Please sign in to comment.