From 3649feacdc4b2c80740a9f8cd00d0251610616a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Br=C3=A5then=20Solem?= Date: Thu, 4 Sep 2025 03:23:27 +0200 Subject: [PATCH] 3.4.2 --- crypto/_cryptoDir/objects.cmake | 2 ++ openssl | 2 +- ssl/CMakeLists.txt | 2 -- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/_cryptoDir/objects.cmake b/crypto/_cryptoDir/objects.cmake index be0a9e6..4636be5 100644 --- a/crypto/_cryptoDir/objects.cmake +++ b/crypto/_cryptoDir/objects.cmake @@ -65,6 +65,8 @@ set(LIBCRYPTO_CURRENTDIR_SOURCES ${CMAKE_SOURCE_DIR}/openssl/crypto/vms_rms.h ${CMAKE_SOURCE_DIR}/openssl/crypto/time.c ${CMAKE_SOURCE_DIR}/openssl/crypto/sleep.c + ${CMAKE_SOURCE_DIR}/openssl/crypto/sslerr.h + ${CMAKE_SOURCE_DIR}/openssl/crypto/ssl_err.c ${CMAKE_SOURCE_DIR}/openssl/crypto/deterministic_nonce.c ${CMAKE_SOURCE_DIR}/openssl/crypto/quic_vlint.c ${CMAKE_SOURCE_DIR}/openssl/crypto/defaults.c diff --git a/openssl b/openssl index a26d853..4292b5f 160000 --- a/openssl +++ b/openssl @@ -1 +1 @@ -Subproject commit a26d85337dbdcd33c971f38eb3fa5150e75cea87 +Subproject commit 4292b5fd3dabb278c0094d53bf3a852593811417 diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt index 6b46c45..9ab8d74 100644 --- a/ssl/CMakeLists.txt +++ b/ssl/CMakeLists.txt @@ -32,7 +32,6 @@ set(LIBSSL_SOURCES ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_conf.c ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_mcnf.c ${CMAKE_SOURCE_DIR}/openssl/ssl/bio_ssl.c - ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_err.c ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_err_legacy.c ${CMAKE_SOURCE_DIR}/openssl/ssl/tls_srp.c ${CMAKE_SOURCE_DIR}/openssl/ssl/t1_trce.c @@ -43,7 +42,6 @@ set(LIBSSL_SOURCES ${CMAKE_SOURCE_DIR}/openssl/crypto/packet.c ${CMAKE_SOURCE_DIR}/openssl/crypto/quic_vlint.c ${CMAKE_SOURCE_DIR}/openssl/crypto/time.c - ${CMAKE_SOURCE_DIR}/openssl/ssl/sslerr.h ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_cert_table.h ${CMAKE_SOURCE_DIR}/openssl/ssl/ssl_local.h ${CMAKE_SOURCE_DIR}/openssl/ssl/statem/statem_local.h