From 71f437de629735e3f54eb0660e419ccc11f7cb7b Mon Sep 17 00:00:00 2001 From: kinichiro Date: Wed, 12 Jan 2022 20:04:53 +0900 Subject: Follow upstream file changes and fix build - Add asn1_lib.c - Consolidation of ASN.1 code Add asn1_item.c asn1_old.c Remove a_d2i_fp.c a_digest.c a_dup.c a_i2d_fp.c a_sign.c a_verify.c - Merge evp_asn1.c into a_type.c - Merge asn_pack.c into asn1_item.c - Rename tls13_key_share.c to tls_key_share.c - Add bio/bio_local.h dh/dh_local.h ocsp/ocsp_local.h - Add comp/comp_local.h - Add define LIBRESSL_CRYPTO_INTERNAL to regress build --- ssl/CMakeLists.txt | 2 +- ssl/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ssl') diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index f346274..a20cb04 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -35,6 +35,7 @@ set( t1_lib.c tls_buffer.c tls_content.c + tls_key_share.c tls12_key_schedule.c tls12_lib.c tls12_record_layer.c @@ -43,7 +44,6 @@ set( tls13_handshake.c tls13_handshake_msg.c tls13_key_schedule.c - tls13_key_share.c tls13_legacy.c tls13_lib.c tls13_record.c diff --git a/ssl/Makefile.am b/ssl/Makefile.am index 6f44e48..227dfdf 100644 --- a/ssl/Makefile.am +++ b/ssl/Makefile.am @@ -72,6 +72,7 @@ libssl_la_SOURCES += t1_enc.c libssl_la_SOURCES += t1_lib.c libssl_la_SOURCES += tls_buffer.c libssl_la_SOURCES += tls_content.c +libssl_la_SOURCES += tls_key_share.c libssl_la_SOURCES += tls12_key_schedule.c libssl_la_SOURCES += tls12_lib.c libssl_la_SOURCES += tls12_record_layer.c @@ -80,7 +81,6 @@ libssl_la_SOURCES += tls13_error.c libssl_la_SOURCES += tls13_handshake.c libssl_la_SOURCES += tls13_handshake_msg.c libssl_la_SOURCES += tls13_key_schedule.c -libssl_la_SOURCES += tls13_key_share.c libssl_la_SOURCES += tls13_legacy.c libssl_la_SOURCES += tls13_lib.c libssl_la_SOURCES += tls13_record.c -- cgit v1.2.3-55-g6feb