diff options
Diffstat (limited to 'deps/boringssl/CMakeLists.txt')
| -rw-r--r-- | deps/boringssl/CMakeLists.txt | 48 |
1 files changed, 22 insertions, 26 deletions
diff --git a/deps/boringssl/CMakeLists.txt b/deps/boringssl/CMakeLists.txt index 1645a26..3795e7b 100644 --- a/deps/boringssl/CMakeLists.txt +++ b/deps/boringssl/CMakeLists.txt @@ -4,7 +4,7 @@ # This file is created by generate_build_files.py. Do not edit manually. -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(BoringSSL LANGUAGES C CXX) @@ -18,12 +18,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CLANG) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fno-common") - if((CMAKE_C_COMPILER_VERSION VERSION_GREATER "4.8.99") OR CLANG) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c11") - else() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") - endif() + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden -fno-common -std=c11") endif() # pthread_rwlock_t requires a feature flag. @@ -53,7 +48,7 @@ add_definitions(-DBORINGSSL_IMPLEMENTATION) # builds. if(NOT OPENSSL_NO_ASM AND CMAKE_OSX_ARCHITECTURES) list(LENGTH CMAKE_OSX_ARCHITECTURES NUM_ARCHES) - if(NOT ${NUM_ARCHES} EQUAL 1) + if(NOT NUM_ARCHES EQUAL 1) message(FATAL_ERROR "Universal binaries not supported.") endif() list(GET CMAKE_OSX_ARCHITECTURES 0 CMAKE_SYSTEM_PROCESSOR) @@ -62,36 +57,36 @@ endif() if(OPENSSL_NO_ASM) add_definitions(-DOPENSSL_NO_ASM) set(ARCH "generic") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64") set(ARCH "x86_64") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64") set(ARCH "x86_64") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "AMD64") # cmake reports AMD64 on Windows, but we might be building for 32-bit. if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(ARCH "x86_64") else() set(ARCH "x86") endif() -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86") set(ARCH "x86") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "i386") set(ARCH "x86") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "i686") set(ARCH "x86") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") set(ARCH "aarch64") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") set(ARCH "aarch64") # Apple A12 Bionic chipset which is added in iPhone XS/XS Max/XR uses arm64e architecture. -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "arm64e") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64e") set(ARCH "aarch64") -elseif(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm*") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^arm*") set(ARCH "arm") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "mips") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips") # Just to avoid the “unknown processor” error. set(ARCH "generic") -elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "ppc64le") +elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le") set(ARCH "ppc64le") else() message(FATAL_ERROR "Unknown processor:" ${CMAKE_SYSTEM_PROCESSOR}) @@ -344,9 +339,9 @@ set( win-x86_64/crypto/test/trampoline-x86_64.asm ) -if(APPLE AND ${ARCH} STREQUAL "aarch64") +if(APPLE AND ARCH STREQUAL "aarch64") set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_aarch64_SOURCES}) -elseif(APPLE AND ${ARCH} STREQUAL "arm") +elseif(APPLE AND ARCH STREQUAL "arm") set(CRYPTO_ARCH_SOURCES ${CRYPTO_ios_arm_SOURCES}) elseif(APPLE) set(CRYPTO_ARCH_SOURCES ${CRYPTO_mac_${ARCH}_SOURCES}) @@ -373,6 +368,7 @@ add_library( src/crypto/asn1/a_object.c src/crypto/asn1/a_octet.c src/crypto/asn1/a_print.c + src/crypto/asn1/a_strex.c src/crypto/asn1/a_strnid.c src/crypto/asn1/a_time.c src/crypto/asn1/a_type.c @@ -467,7 +463,6 @@ add_library( src/crypto/ex_data.c src/crypto/fipsmodule/bcm.c src/crypto/fipsmodule/fips_shared_support.c - src/crypto/fipsmodule/is_fips.c src/crypto/hkdf/hkdf.c src/crypto/hpke/hpke.c src/crypto/hrss/hrss.c @@ -514,13 +509,13 @@ add_library( src/crypto/trust_token/voprf.c src/crypto/x509/a_digest.c src/crypto/x509/a_sign.c - src/crypto/x509/a_strex.c src/crypto/x509/a_verify.c src/crypto/x509/algorithm.c src/crypto/x509/asn1_gen.c src/crypto/x509/by_dir.c src/crypto/x509/by_file.c src/crypto/x509/i2d_pr.c + src/crypto/x509/name_print.c src/crypto/x509/rsa_pss.c src/crypto/x509/t_crl.c src/crypto/x509/t_req.c @@ -534,7 +529,6 @@ add_library( src/crypto/x509/x509_ext.c src/crypto/x509/x509_lu.c src/crypto/x509/x509_obj.c - src/crypto/x509/x509_r2x.c src/crypto/x509/x509_req.c src/crypto/x509/x509_set.c src/crypto/x509/x509_trs.c @@ -604,6 +598,8 @@ add_library( src/ssl/d1_srtp.cc src/ssl/dtls_method.cc src/ssl/dtls_record.cc + src/ssl/encrypted_client_hello.cc + src/ssl/extensions.cc src/ssl/handoff.cc src/ssl/handshake.cc src/ssl/handshake_client.cc @@ -626,7 +622,6 @@ add_library( src/ssl/ssl_versions.cc src/ssl/ssl_x509.cc src/ssl/t1_enc.cc - src/ssl/t1_lib.cc src/ssl/tls13_both.cc src/ssl/tls13_client.cc src/ssl/tls13_enc.cc @@ -645,6 +640,7 @@ add_executable( src/tool/digest.cc src/tool/fd.cc src/tool/file.cc + src/tool/generate_ech.cc src/tool/generate_ed25519.cc src/tool/genrsa.cc src/tool/pkcs12.cc |