From c89c21f8f59d4973b7ccda6d6aaa2756636e2121 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 1 Nov 2022 15:57:56 +0000 Subject: [PATCH] Move tls_pad.c into ssl/record/methods This file is used by libssl record layer methods and therefore should now be in the methods subdir Reviewed-by: Hugo Landau Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/19586) --- ssl/record/build.info | 6 ------ ssl/record/methods/build.info | 7 +++++++ ssl/record/{ => methods}/tls_pad.c | 0 3 files changed, 7 insertions(+), 6 deletions(-) rename ssl/record/{ => methods}/tls_pad.c (100%) diff --git a/ssl/record/build.info b/ssl/record/build.info index 13238863a6a..42bc3f36118 100644 --- a/ssl/record/build.info +++ b/ssl/record/build.info @@ -13,11 +13,5 @@ ENDIF SOURCE[../../libssl]=\ rec_layer_s3.c rec_layer_d1.c ssl3_record.c -# For shared builds we need to include the sources needed in providers -# (tls_pad.c) in libssl as well. -SHARED_SOURCE[../../libssl]=tls_pad.c - -SOURCE[../../providers/libcommon.a]=tls_pad.c - DEFINE[../../libssl]=$AESDEF diff --git a/ssl/record/methods/build.info b/ssl/record/methods/build.info index f31acd10b92..8b1af5dd5d5 100644 --- a/ssl/record/methods/build.info +++ b/ssl/record/methods/build.info @@ -14,3 +14,10 @@ IF[{- !$disabled{'deprecated-3.0'} -}] ENDIF SOURCE[../../../providers/libdefault.a ../../../providers/libfips.a]=ssl3_cbc.c + +# For shared builds we need to include the sources needed in providers +# (tls_pad.c) in libssl as well. +SHARED_SOURCE[../../../libssl]=tls_pad.c + +SOURCE[../../../providers/libcommon.a]=tls_pad.c + diff --git a/ssl/record/tls_pad.c b/ssl/record/methods/tls_pad.c similarity index 100% rename from ssl/record/tls_pad.c rename to ssl/record/methods/tls_pad.c -- 2.47.3