6
0
forked from pool/boringssl

Compare commits

14 Commits

Author SHA256 Message Date
bebc004aab Accepting request 1218740 from security:tls
OBS-URL: https://build.opensuse.org/request/show/1218740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=14
2024-10-28 14:22:21 +00:00
30a1ba0843 - Change version of the sources to 0.%%cd to avoid problems when
upgrading if the versioning changes.
- Added patch:
  * soname-sover.patch
    + Replace patchelf run with patch that makes cmake produce the
      shared libraries with the right SONAME and SOVER.
- Remove unnecessary dependencies on go, patchelf, ninja and
  libunwind, since they are only needed for tests we are not
  running

OBS-URL: https://build.opensuse.org/package/show/security:tls/boringssl?expand=0&rev=39
2024-10-28 08:59:55 +00:00
e9940d43bc Accepting request 1145361 from security:tls
OBS-URL: https://build.opensuse.org/request/show/1145361
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=13
2024-02-09 22:53:52 +00:00
98ba11df3f Accepting request 975340 from security:tls
OBS-URL: https://build.opensuse.org/request/show/975340
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=12
2022-05-06 16:59:48 +00:00
6e4d344b98 Accepting request 893862 from security:tls
- Update to version 20200921 (fixes bsc#1183836, bsc#1181866):
  * Add SSL_CIPHER_get_protocol_id.
  * Add TrustTokenV2.
  * Add X509_get_pathlen and X509_REVOKED_get0_extensions.
  * Add some accommodations for FreeRDP
  * Require non-NULL store in X509_STORE_CTX_init.
  * Const-correct X509V3_CONF_METHOD.
  * Avoid unions in X509_NAME logic.
  * Bump OPENSSL_VERSION_NUMBER to 1.1.1.
  * Document more of x509.h.
  * Fix potential leak in bssl::Array::Shrink.
  * Remove ASN1_STRING_length_set.
  * Revert "Check AlgorithmIdentifier parameters for RSA and ECDSA signatures."
  * Implement PSK variants of HPKE setup functions.
  * acvp: support working with files.
  * Document a few more functions in x509.h.
  * Add subject key ID and authority key ID accessors.
  * Remove sxnet and pkey_usage_period extensions.
  * Const-correct various X509 functions.
  * Make X509_set_not{Before,After} functions rather than macros.
  * Add X509_get0_uids from OpenSSL 1.1.0.
  * Bound RSA and DSA key sizes better.
  * Add set1 versions of X509 timestamp setters.
  * Consistently sort generated build files.
  * delocate: use 64-bit GOT offsets in the large memory model.
  * Update HPKE implementation and test vectors to draft-irtf-cfrg-hpke-05.
  * Handle NULL arguments in some i2d_* functions.
  * aarch64: support BTI and pointer authentication in assembly
  * Support delegated credentials verison 06
  * delocation: large memory model support. (forwarded request 893861 from mrostecki)

OBS-URL: https://build.opensuse.org/request/show/893862
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=11
2021-05-25 19:07:45 +00:00
397b2415f5 Accepting request 809934 from security:tls
OBS-URL: https://build.opensuse.org/request/show/809934
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=10
2020-05-29 19:23:50 +00:00
874a708b2d Accepting request 783547 from security:tls
OBS-URL: https://build.opensuse.org/request/show/783547
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=9
2020-03-11 17:51:34 +00:00
e490b830d6 Accepting request 753912 from security:tls
OBS-URL: https://build.opensuse.org/request/show/753912
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=8
2019-12-04 12:55:47 +00:00
528994ad7d Accepting request 740085 from security:tls
OBS-URL: https://build.opensuse.org/request/show/740085
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=7
2019-11-06 12:54:54 +00:00
9fd028c8a9 Accepting request 738259 from security:tls
- Update to version 20190916:
  * Revert "Fix VS build when assembler is enabled"
  * Only bypass the signature verification itself in fuzzer mode.
  * Move the PQ-experiment signal to SSL_CTX.
  * Name cipher suite tests in runner by IETF names.
  * Align TLS 1.3 cipher suite names with OpenSSL.
  * Prefix all the SIKE symbols.
  * Rename SIKE's params.c.
  * Add post-quantum experiment signal extension.
  * Fix shim error message endings.
  * Add initial draft of ACVP tool.
  * Implements SIKE/p434
  * Add SipHash-2-4.
  * Remove android_tools checkout
  * Support key wrap with padding in CAVP.
  * Add android_sdk checkout
  * Move fipstools/ to util/fipstools/cavp
  * Factor out TLS cipher selection to ssl_choose_tls_cipher.
  * Emit empty signerInfos in PKCS#7 bundles.
  * Clarify language about default SSL_CTX session ticket key behavior.
  * Add an API to record use of delegated credential
  * Fix runner tests with Go 1.13.
  * Add a value barrier to constant-time selects.
  * Avoid leaking intermediate states in point doubling special case.
  * Split p224-64.c multiplication functions in three.
  * Add AES-KWP
  * Discuss the doubling case in windowed Booth representation.
  * Update build tools.
  * Set a minimum CMake version of 3.0.
  * Replace addc64,subc64,mul64 in SIKE Go code with functions from math/bits

OBS-URL: https://build.opensuse.org/request/show/738259
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=6
2019-10-16 07:13:31 +00:00
80ea3018e7 Accepting request 728293 from security:tls
OBS-URL: https://build.opensuse.org/request/show/728293
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=5
2019-09-04 13:45:47 +00:00
068b8cacc1 Accepting request 728033 from security:tls
- Update to version 20190523:
  * Disable RDRAND on AMD chips before Zen.
  * Always store early data tickets.
  * Align PKCS12_parse closer to OpenSSL.
  * Support PKCS#12 KeyBags.
  * Support PKCS#8 blobs using PBES2 with HMAC-SHA256.
  * Make EVP_PKEY_keygen work for Ed25519.
  * Sync aesp8-ppc.pl with upstream.
  * Update generate_build_files.py for SIKE.
  * Fix the last casts in third_party/sike.
  * Remove no-op casts around tt1.
  * Define p503 with crypto_word_t, not uint64_t.
  * Add support for SIKE/p503 post-quantum KEM
  * tool: fix speed tests.
  * Add an option to skip crypto_test_data.cc in GN too.
  * Save and restore errors when ignoring ssl_send_alert result.
  * Reject obviously invalid DSA parameters during signing.
  * Make expect/expected flag and variable names match.
  * clang-format Flag arrays in test_config.cc.
  * Rename remnants of ticket_early_data_info.
  * Enforce the ticket_age parameter for 0-RTT.
  * Add SSL_get_early_data_reason.
  * Remove implicit -on-resume for -expect-early-data-accept.
  * Use weak symbols only on supported platforms
  * Fix spelling in comments.
  * Add functions for "raw" EVP_PKEY serializations.
  * Remove stray underscores.
  * Add a compatibility EVP_DigestFinalXOF function.
  * Fix up EVP_DigestSign implementation for Ed25519.
  * Check for errors when setting up X509_STORE_CTX.

OBS-URL: https://build.opensuse.org/request/show/728033
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=4
2019-09-04 07:34:23 +00:00
7c1a812136 Accepting request 727148 from security:tls
- Disable lto to fix build failure

OBS-URL: https://build.opensuse.org/request/show/727148
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=3
2019-08-30 12:42:07 +00:00
6f3bfb404e Accepting request 697963 from security:tls
- Add patch which fixes build on aarch64.
  * 0001-crypto-Fix-aead_test-build-on-aarch64.patch
- Update to version 20181228:
  * Use thread-local storage for PRNG states if fork-unsafe buffering is enabled.
  * Add Win64 SEH unwind codes for the ABI test trampoline.
  * Translate .L directives inside .byte too.
  * Add an ABI testing framework.
  * Use same HKDF label as TLS 1.3 for QUIC as per draft-ietf-quic-tls-17
  * Add |SSL_key_update|.
  * HRSS: omit reconstruction of ciphertext.
  * Add start of infrastructure for checking constant-time properties.
  * Don't enable intrinsics on x86 without ABI support.
  * HRSS: be strict about unused bits being zero.
  * Disable AES-GCM-SIV assembly on Windows.
  * Fix typo in AES-GCM-SIV comments.
  * Fix HRSS build error on ARM
  * Fix thread-safety bug in SSL_get_peer_cert_chain.
  * Remove HRSS confirmation hash.
  * Drop NEON assembly for HRSS.
  * Add |SSL_export_traffic_secrets|.
  * Patch out the XTS implementation in bsaes.
  * Remove .file and .loc directives from HRSS ARM asm.
  * Do not allow AES_128_GCM_SHA256 with CECPQ2.
  * Always 16-byte align |poly| elements.
  * Fix bug in HRSS tests.
  * Add initial HRSS support.
  * Forbid empty CertificateRequestsupported_signature_algorithms in TLS 1.2.
  * Eliminate |OPENSSL_ia32cap_P| in C code in the FIPS module.
  * Fix d2i_*_bio on partial reads.
  * Fix |BN_HEX_FMT2|.
  * Remove XOP code from sha512-x86_64.pl.
  * Pretend AMD XOP was never a thing.
  * Drop some explicit SSLKeyShare destructors.
  * Assume hyper-threading-like vulnerabilities are always present.
  * Replace the last CRITICAL_SECTION with SRWLOCK.
  * Validate ClientHellos in tests some more.
  * Re-enable AES-NI on 32-bit x86 too.
  * Make symbol-prefixing work on 32-bit x86.
  * Make Windows symbol-prefixing work.
  * Support Windows-style ar files.
  * Move __.SYMDEF handling to ar.go.
  * Fix stack_test.cc in the prefixed build.
  * Don't double-mangle C++ symbols on macOS.
  * Make read_symbols.go a bit more idiomatic.
  * Unexport and rename hex_to_string, string_to_hex, and name_cmp.
  * Satisfy golint.
  * Add a note that generated files are generated.
  * Work around a JDK 11 TLS 1.3 bug.
  * Move ARM cpuinfo functions to the header.
  * Regenerate obj_dat.h
  * go fmt
  * Support execute-only memory for AArch64 assembly.
  * Remove cacheline striping in copy_from_prebuf.
  * Tidy up type signature of BN_mod_exp_mont_consttime table.
  * No longer set CQ-Verified label on CQ success/failure.
  * Print a message when simulating CPUs.
  * Move JSON test results code into a common module.
  * In 0RTT mode, reverify the server certificate before sending early data.
  * Support assembly building for arm64e architecture.
  * Simulate other ARM CPUs when running tests.
  * Merge P-224 contract into serialisation.
  * Contract P-224 elements before returning them.
  * Add post-handshake support for the QUIC API.
  * Speculatively remove __STDC_*_MACROS.
  * Modernize OPENSSL_COMPILE_ASSERT, part 2.
  * Switch docs to recommending NASM.
  * Mark the |e| argument to |RSA_generate_key_ex| as const.
  * Clean up EC_POINT to byte conversions.
  * Need cpu.h for |OPENSSL_ia32cap_P|.
  * Rename EC_MAX_SCALAR_*.
  * Use EC_RAW_POINT in ECDSA.
  * Optimize EC_GFp_mont_method's cmp_x_coordinate.
  * Optimize EC_GFp_nistp256_method's cmp_x_coordinate.
  * Remove unreachable code.
  * Also accept __ARM_NEON
  * Remove some easy BN_CTXs.
  * Push BIGNUM out of the cmp_x_coordinate interface.
  * Push BIGNUM out of EC_METHOD's affine coordinates hook.
  * Fix r = p-n+epsilon ECDSA tests.
  * Don't include openssl/ec_key.h under extern "C".
  * Abstract hs_buf a little.
  * Inline ec_GFp_simple_group_get_degree.
  * Better test boundary cases of ec_cmp_x_coordinate.
  * Fix build when bcm.c is split up.
  * Revert "Revert "Speed up ECDSA verify on x86-64.""
  * Make SSL_get_current_cipher valid during QUIC callbacks.
  * Devirtualize ec_simple_{add,dbl}.
  * Refresh fuzzer corpora for changes to split-handshake serialization.
  * Serialize SSL curve list in handoff and check it on application.
  * Revert "Speed up ECDSA verify on x86-64."
  * Route the tuned add/dbl implementations out of EC_METHOD.
  * Speed up ECDSA verify on x86-64.
  * Include details about latest FIPS certification.
  * Serialize SSL configuration in handoff and check it on application.
  * Don't overflow state->calls on 16TiB RAND_bytes calls.
  * Buffer up QUIC data within a level internally.
  * Add an interface for QUIC integration.
  * Remove OPENSSL_NO_THREADS.
  * Minor fixes to bytestring.h header.
  * Test CBC padding more aggressively.
  * Restore CHECKED_CAST.
  * Fix EVP_tls_cbc_digest_record is slow using SHA-384 and short messages
  * Tidy up dsa_sign_setup.
  * Fix the build on glibc 2.15.
  * Modernize OPENSSL_COMPILE_ASSERT.
  * Fix redefinition of AEAD asserts in e_aes.c.
  * Guard sys/auxv.h include on !BORINGSSL_ANDROID.
  * Flatten EVP_AEAD_CTX
  * Implement SSL_get_tlsext_status_type
  * Fix documentation sectioning.
  * Remove support for GCC 4.7.
  * Print the name of the binary when blocking in getrandom.
  * Undo recent changes to |X509V3_EXT_conf_nid|.
  * Add a compatibility EVP_CIPH_OCB_MODE value.
  * [util] Mark srtp.h as an SSL header file
  * [rand] Disable RandTest.Fork on Fuchsia
  * Remove -fsanitize-cfi-icall-generalize-pointers.
  * Fix undefined function pointer casts in LHASH.
  * Use proper functions for lh_*.
  * Better handle AVX-512 assembly syntax.
  * Always push errors on BIO_read_asn1 failure.
  * Add a per-SSL TLS 1.3 downgrade enforcement option and improve tests.
  * Fix div.c to divide BN_ULLONG only if BN_CAN_DIVIDE_ULLONG defined.
  * Include aes.h in mode/internal.h
  * Fix section header capitalization.
  * Fix build in consumers that flag unused parameters.
  * [perlasm] Hide OPENSSL_armcap_P in assembly
  * Test the binary search more aggressively.
  * Opaquify CONF.
  * Bring Mac and iOS builders back to the CQ.
  * Remove LHASH_OF mention in X509V3_EXT_conf_nid.
  * Inline functions are apparently really complicated.
  * Actually disable RandTest.Fork on iOS.
  * Mostly fix undefined casts around STACK_OF's comparator.
  * Fix undefined casts in sk_*_pop_free and sk_*_deep_copy.
  * Take iOS builders out of the CQ rotation too.
  * Rewrite PEM_X509_INFO_read_bio.
  * Fix undefined block128_f, etc., casts.
  * Fix undefined function pointer casts in {d2i,i2d}_Foo_{bio,fp}
  * Fix undefined function pointer casts in IMPLEMENT_PEM_*.
  * Always print some diagnostic information when POST fails.
  * Disable RandTest.Fork on iOS.
  * Const-correct sk_find and sk_delete_ptr.
  * Add a test for STACK_OF(T).
  * Rename inject-hash: Bazel does not like hyphens.
  * Rename OPENSSL_NO_THREADS, part 1.
  * Fix ERR_GET_REASON checks.
  * Add a basic test for PEM_X509_INFO_read_bio.
  * Replace BIO_new + BIO_set_fp with BIO_new_fp.
  * Remove Mac try jobs from the CQ.
  * Add util/read_symbols.go
  * Tighten up getrandom handling.
  * Remove SHA384_Transform from sha.h.
  * Push an error on sigalg mismatch in X509_verify.
  * Sync bundled bits of golang.org/x/crypto.
  * Use Go modules with delocate.
  * Keep the GCM bits in one place.
  * Trim 88 bytes from each AES-GCM EVP_AEAD.
  * Set up Go modules.
  * Use sdallocx, if available, when deallocating.
  * Remove the add_alert hook.
  * Fix doc.go error capitalization.
  * Don't include quotes in heredocs.
  * Add missing bssl::UpRef overloads.
  * Roll back clang revision.
  * Update tools.
  * Fix BORINGSSL_NO_CXX.
  * Fix check of the pointer returned by BN_CTX_get
  * Include newlines at the end of generated asm.
  * Automatically disable assembly with MSAN.
  * Mark the C version of md5_block_data_order static.
  * Reorder some extensions to better match Firefox.
  * Make symbol-prefixing work on ARM.
  * Document alternative functions to BIO_f_base64.
  * Another batch of bools.
  * Add some RAND_bytes tests.
  * Support symbol prefixes
  * Fill in a fake session ID for TLS 1.3.
  * Create output directories for perlasm.
  * Fix Fiat path.
  * Fix GCC (8.2.1) build error.
  * Some more bools.
  * Flatten most of the crypto target.
  * Flatten assembly files.
  * Flatten the decrepit target.
  * Clarify "reference" and fix typo.
  * Fix corner case in cpuinfo parser.
  * Add some about ownership to API-CONVENTIONS.
  * Tidy up docs for #defines.
  * No negative moduli.
  * Document that ED25519_sign only fails on allocation failure
  * Clarify thread-safety of key objects.
  * shim: don't clear environment when invoking handshaker.
  * Switch the default TLS 1.3 variant to tls13_rfc.
  * Switch to Clang 6.0's fuzzer support.

OBS-URL: https://build.opensuse.org/request/show/697963
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/boringssl?expand=0&rev=2
2019-04-26 20:54:36 +00:00
5 changed files with 0 additions and 279 deletions

View File

@@ -1,19 +0,0 @@
commit 225886dff82c04b5f689e7fb57d75c9ec18b45d1
Author: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Mon Mar 31 12:26:24 2025 -0700
0006-gcc-disable-werror.patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d6f30e..76a3723 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ endif()
if(CMAKE_COMPILER_IS_GNUCXX OR CLANG)
# Note clang-cl is odd and sets both CLANG and MSVC. We base our configuration
# primarily on our normal Clang one.
- set(C_CXX_FLAGS "-Werror -Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
+ set(C_CXX_FLAGS "-Wformat=2 -Wsign-compare -Wmissing-field-initializers -Wwrite-strings -Wvla")
if(MSVC)
# clang-cl sets different default warnings than clang. It also treats -Wall
# as -Weverything, to match MSVC. Instead -W3 is the alias for -Wall.

View File

@@ -1,20 +0,0 @@
commit 84b3970a1a7fa419f305a833effbedb3e53690b7
Author: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Mon Mar 31 08:40:57 2025 -0700
0007-fix-go-vendor-embed_test_data.patch
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76a3723..fb2c801 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -585,7 +585,8 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt"
add_custom_command(
OUTPUT crypto_test_data.cc
- COMMAND ${GO_EXECUTABLE} run util/embed_test_data.go -file-list
+ COMMAND ${GO_EXECUTABLE} build -mod=vendor util/embed_test_data.go
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/embed_test_data -file-list
"${CMAKE_CURRENT_BINARY_DIR}/embed_test_data_args.txt" >
"${CMAKE_CURRENT_BINARY_DIR}/crypto_test_data.cc"
DEPENDS util/embed_test_data.go ${CRYPTO_TEST_DATA}

View File

@@ -1,20 +0,0 @@
commit 05f4d459a1c3495918585d5bc3531f55b12baca7
Author: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Mon Mar 31 14:25:59 2025 -0700
0008-fix-go-vendor-err_data_generate.patch
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index c06cbb7..0a5a2b7 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -167,7 +167,8 @@ perlasm(test/trampoline-x86_64.${ASM_EXT} test/asm/trampoline-x86_64.pl)
add_custom_command(
OUTPUT err_data.c
- COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
+ COMMAND ${GO_EXECUTABLE} build -mod=vendor err_data_generate.go
+ COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/err/err_data_generate > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
DEPENDS
err/err_data_generate.go
err/asn1.errordata

View File

@@ -1,217 +0,0 @@
commit ffa90ddfe8ed4436f0893f28d29a7b66d6f1f6b0
Author: Jeff Kowalczyk <jkowalczyk@suse.com>
Date: Fri Feb 28 14:57:46 2025 -0800
0009-soname-sover.patch
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 0a5a2b7..99a1306 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -198,7 +198,7 @@ add_custom_command(
)
add_library(
- crypto
+ boringssl_crypto
asn1/a_bitstr.c
asn1/a_bool.c
@@ -443,7 +443,7 @@ if(FIPS_SHARED)
# Rewrite libcrypto.so to inject the correct module hash value. This assumes
# UNIX-style library naming, but we only support FIPS mode on Linux anyway.
add_custom_command(
- TARGET crypto POST_BUILD
+ TARGET boringssl_crypto POST_BUILD
COMMAND ${GO_EXECUTABLE} run
${CMAKE_CURRENT_SOURCE_DIR}/../util/fipstools/inject_hash/inject_hash.go
-o libcrypto.so -in-object libcrypto.so ${EXTRA_INJECT_HASH_ARGS}
@@ -455,22 +455,22 @@ if(FIPS_SHARED)
)
endif()
-add_dependencies(crypto global_target)
+add_dependencies(boringssl_crypto global_target)
if(FIPS_DELOCATE OR FIPS_SHARED)
- add_dependencies(crypto bcm_o_target)
+ add_dependencies(boringssl_crypto bcm_o_target)
endif()
-SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
+SET_TARGET_PROPERTIES(boringssl_crypto PROPERTIES LINKER_LANGUAGE C)
if(NOT WIN32 AND NOT ANDROID)
- target_link_libraries(crypto pthread)
+ target_link_libraries(boringssl_crypto pthread)
endif()
# Every target depends on crypto, so we add libcxx as a dependency here to
# simplify injecting it everywhere.
if(USE_CUSTOM_LIBCXX)
- target_link_libraries(crypto libcxx)
+ target_link_libraries(boringssl_crypto libcxx)
endif()
# urandom_test is a separate binary because it needs to be able to observe the
@@ -482,11 +482,13 @@ add_executable(
fipsmodule/rand/urandom_test.cc
)
-target_link_libraries(urandom_test test_support_lib boringssl_gtest crypto)
+target_link_libraries(urandom_test test_support_lib boringssl_gtest boringssl_crypto)
add_dependencies(urandom_test global_target)
add_dependencies(all_tests urandom_test)
+set_target_properties(boringssl_crypto PROPERTIES SOVERSION 1)
+
add_executable(
crypto_test
@@ -560,7 +562,7 @@ add_executable(
add_dependencies(crypto_test global_target)
-target_link_libraries(crypto_test test_support_lib boringssl_gtest crypto)
+target_link_libraries(crypto_test test_support_lib boringssl_gtest boringssl_crypto)
if(WIN32)
target_link_libraries(crypto_test ws2_32)
endif()
diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
index ef95a6b..d1ef907 100644
--- a/decrepit/CMakeLists.txt
+++ b/decrepit/CMakeLists.txt
@@ -24,7 +24,7 @@ add_library(
add_dependencies(decrepit global_target)
-target_link_libraries(decrepit crypto ssl)
+target_link_libraries(decrepit boringssl_crypto boringssl_ssl)
add_executable(
decrepit_test
@@ -41,7 +41,7 @@ add_executable(
add_dependencies(decrepit_test global_target)
target_link_libraries(decrepit_test test_support_lib boringssl_gtest decrepit
- crypto)
+ boringssl_crypto)
if(WIN32)
target_link_libraries(decrepit_test ws2_32)
endif()
diff --git a/fuzz/CMakeLists.txt b/fuzz/CMakeLists.txt
index 62652cb..7aabbc4 100644
--- a/fuzz/CMakeLists.txt
+++ b/fuzz/CMakeLists.txt
@@ -5,7 +5,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-prototypes")
macro(fuzzer name)
add_executable(${name} ${name}.cc)
add_dependencies(${name} global_target)
- target_link_libraries(${name} crypto ${ARGN})
+ target_link_libraries(${name} boringssl_crypto ${ARGN})
if(LIBFUZZER_FROM_DEPS)
set_target_properties(${name} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer-no-link")
target_link_libraries(${name} Fuzzer)
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 38c686b..fa086c0 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -1,7 +1,7 @@
include_directories(../include)
add_library(
- ssl
+ boringssl_ssl
bio_ssl.cc
d1_both.cc
@@ -42,9 +42,11 @@ add_library(
tls13_server.cc
)
-add_dependencies(ssl global_target)
+add_dependencies(boringssl_ssl global_target)
-target_link_libraries(ssl crypto)
+target_link_libraries(boringssl_ssl boringssl_crypto)
+
+set_target_properties(boringssl_ssl PROPERTIES SOVERSION 1)
add_executable(
ssl_test
@@ -58,7 +60,7 @@ add_executable(
add_dependencies(ssl_test global_target)
-target_link_libraries(ssl_test test_support_lib boringssl_gtest ssl crypto)
+target_link_libraries(ssl_test test_support_lib boringssl_gtest boringssl_ssl boringssl_crypto)
if(WIN32)
target_link_libraries(ssl_test ws2_32)
endif()
diff --git a/ssl/test/CMakeLists.txt b/ssl/test/CMakeLists.txt
index bb9bd81..c9e353d 100644
--- a/ssl/test/CMakeLists.txt
+++ b/ssl/test/CMakeLists.txt
@@ -15,7 +15,7 @@ add_executable(
add_dependencies(bssl_shim global_target)
-target_link_libraries(bssl_shim test_support_lib ssl crypto)
+target_link_libraries(bssl_shim test_support_lib boringssl_ssl boringssl_crypto)
if(UNIX AND NOT APPLE AND NOT ANDROID)
add_executable(
@@ -33,7 +33,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
add_dependencies(handshaker global_target)
- target_link_libraries(handshaker test_support_lib ssl crypto)
+ target_link_libraries(handshaker test_support_lib boringssl_ssl boringssl_crypto)
else()
# Declare a dummy target for run_tests to depend on.
add_custom_target(handshaker)
diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index e9e387b..ae82517 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -28,12 +28,12 @@ if(WIN32)
endif()
if(APPLE OR WIN32 OR ANDROID)
- target_link_libraries(bssl ssl crypto)
+ target_link_libraries(bssl boringssl_ssl boringssl_crypto)
else()
find_library(FOUND_LIBRT rt)
if(FOUND_LIBRT)
- target_link_libraries(bssl ssl crypto -lrt)
+ target_link_libraries(bssl boringssl_ssl boringssl_crypto -lrt)
else()
- target_link_libraries(bssl ssl crypto)
+ target_link_libraries(bssl boringssl_ssl boringssl_crypto)
endif()
endif()
diff --git a/util/fipstools/acvp/modulewrapper/CMakeLists.txt b/util/fipstools/acvp/modulewrapper/CMakeLists.txt
index 267f82c..af6950b 100644
--- a/util/fipstools/acvp/modulewrapper/CMakeLists.txt
+++ b/util/fipstools/acvp/modulewrapper/CMakeLists.txt
@@ -10,5 +10,5 @@ if(FIPS)
add_dependencies(modulewrapper global_target)
- target_link_libraries(modulewrapper crypto)
+ target_link_libraries(modulewrapper boringssl_crypto)
endif()
diff --git a/util/fipstools/cavp/CMakeLists.txt b/util/fipstools/cavp/CMakeLists.txt
index a50c9ab..b3142e4 100644
--- a/util/fipstools/cavp/CMakeLists.txt
+++ b/util/fipstools/cavp/CMakeLists.txt
@@ -37,6 +37,6 @@ if(FIPS)
add_dependencies(test_fips global_target)
- target_link_libraries(cavp test_support_lib crypto)
- target_link_libraries(test_fips test_support_lib crypto)
+ target_link_libraries(cavp test_support_lib boringssl_crypto)
+ target_link_libraries(test_fips test_support_lib boringssl_crypto)
endif()

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:124cf487b9db20d403ed9803b56ae0ff7ff51b38938ae8963e1ccd381b552a54
size 1335422