Skip to content

Commit

Permalink
OSSM-4338 Upgraded BoringSSL version from b95124305 to ca1690e22
Browse files Browse the repository at this point in the history 
Many of the patch files broke as a result of the upgrade, even
though the changes in BoringSSL on the whole weren't that big.

Therefore, as part of this upgrade, the mechanism of copying
and modifying BoringSSL files into the bssl-compat build has been
changed in the hope that subsequent upgrades will be easier.

Also upgraded envoy submodule to v1.26.3

Signed-off-by: Ted Poole <tpoole@redhat.com>
  • Loading branch information
@tedjpoole
tedjpoole committed Jul 25, 2023
1 parent e70377b commit cd6ab00
Show file tree
Hide file tree
Showing 130 changed files with 1,893 additions and 34,976 deletions.
2 changes: 1 addition & 1 deletion bssl-compat/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
include/openssl/
include/openssl/aead.h
include/openssl/aes.h
include/openssl/arm_arch.h
Expand Down Expand Up @@ -90,6 +89,7 @@ source/crypto/digest_extra/digest_test.cc
source/crypto/err/err_test.cc
source/crypto/hmac_extra/hmac_test.cc
source/crypto/internal.h
source/crypto/mem.c
source/crypto/pkcs8/pkcs12_test.cc
source/crypto/rand_extra/rand_test.cc
source/crypto/rsa_extra/rsa_test.cc
Expand Down
174 changes: 87 additions & 87 deletions bssl-compat/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ add_library(bssl-compat STATIC
source/EVP_PKEY_id.cc
source/ext_SSL_get_all_async_fds.c
source/FIPS_mode.cc
source/GENERAL_NAME_cmp.cc
source/GENERAL_NAME_free.cc
source/GENERAL_NAME_new.cc
source/GENERAL_NAMES_new.cc
Expand Down Expand Up @@ -168,8 +167,93 @@ add_library(bssl-compat STATIC
source/X509_STORE_CTX_get0_untrusted.cc
source/X509_STORE_CTX_init.cc
source/X509_STORE_CTX_set0_crls.cc
source/X509_STORE_CTX_set0_trusted_stack.cc
source/X509_STORE_CTX_set_verify_cb.cc
source/X509_STORE_CTX_trusted_stack.cc
source/X509_VERIFY_PARAM_set_time_posix.cc
)

target_add_bssl_include(bssl-compat
include/openssl/aead.h
include/openssl/aes.h
include/openssl/arm_arch.h
include/openssl/asn1.h
include/openssl/asn1_mac.h
include/openssl/asn1t.h
include/openssl/base64.h
include/openssl/base.h
include/openssl/bio.h
include/openssl/blake2.h
include/openssl/blowfish.h
include/openssl/bn.h
include/openssl/buffer.h
include/openssl/buf.h
include/openssl/bytestring.h
include/openssl/cast.h
include/openssl/chacha.h
include/openssl/cipher.h
include/openssl/cmac.h
include/openssl/conf.h
include/openssl/cpu.h
include/openssl/crypto.h
include/openssl/curve25519.h
include/openssl/des.h
include/openssl/dh.h
include/openssl/digest.h
include/openssl/dsa.h
include/openssl/dtls1.h
include/openssl/ecdh.h
include/openssl/ecdsa.h
include/openssl/ec.h
include/openssl/ec_key.h
include/openssl/engine.h
include/openssl/e_os2.h
include/openssl/err.h
include/openssl/evp_errors.h
include/openssl/evp.h
include/openssl/ex_data.h
include/openssl/hkdf.h
include/openssl/hmac.h
include/openssl/hpke.h
include/openssl/hrss.h
include/openssl/is_boringssl.h
include/openssl/kdf.h
include/openssl/lhash.h
include/openssl/md4.h
include/openssl/md5.h
include/openssl/mem.h
include/openssl/nid.h
include/openssl/objects.h
include/openssl/obj.h
include/openssl/obj_mac.h
include/openssl/opensslconf.h
include/openssl/opensslv.h
include/openssl/ossl_typ.h
include/openssl/pem.h
include/openssl/pkcs12.h
include/openssl/pkcs7.h
include/openssl/pkcs8.h
include/openssl/poly1305.h
include/openssl/pool.h
include/openssl/rand.h
include/openssl/rc4.h
include/openssl/ripemd.h
include/openssl/rsa.h
include/openssl/safestack.h
include/openssl/service_indicator.h
include/openssl/sha.h
include/openssl/siphash.h
include/openssl/span.h
include/openssl/srtp.h
include/openssl/ssl3.h
include/openssl/ssl.h
include/openssl/stack.h
include/openssl/thread.h
include/openssl/tls1.h
include/openssl/trust_token.h
include/openssl/type_check.h
include/openssl/x509.h
include/openssl/x509v3.h
include/openssl/x509_vfy.h
)

target_add_bssl_function(bssl-compat
Expand Down Expand Up @@ -444,99 +528,15 @@ target_add_bssl_function(bssl-compat
X509_verify_cert_error_string
X509_VERIFY_PARAM_clear_flags
X509_VERIFY_PARAM_set_flags
X509_VERIFY_PARAM_set_time
X509_VERIFY_PARAM_set1
)

target_add_bssl_source(bssl-compat
source/crypto/internal.h
source/crypto/mem.c
source/crypto/bytestring/cbs.c
source/crypto/bytestring/cbb.c
)

target_add_bssl_include(bssl-compat
include/openssl/aead.h
include/openssl/aes.h
include/openssl/arm_arch.h
include/openssl/asn1.h
include/openssl/asn1_mac.h
include/openssl/asn1t.h
include/openssl/base64.h
include/openssl/base.h
include/openssl/bio.h
include/openssl/blake2.h
include/openssl/blowfish.h
include/openssl/bn.h
include/openssl/buffer.h
include/openssl/buf.h
include/openssl/bytestring.h
include/openssl/cast.h
include/openssl/chacha.h
include/openssl/cipher.h
include/openssl/cmac.h
include/openssl/conf.h
include/openssl/cpu.h
include/openssl/crypto.h
include/openssl/curve25519.h
include/openssl/des.h
include/openssl/dh.h
include/openssl/digest.h
include/openssl/dsa.h
include/openssl/dtls1.h
include/openssl/ecdh.h
include/openssl/ecdsa.h
include/openssl/ec.h
include/openssl/ec_key.h
include/openssl/engine.h
include/openssl/e_os2.h
include/openssl/err.h
include/openssl/evp_errors.h
include/openssl/evp.h
include/openssl/ex_data.h
include/openssl/hkdf.h
include/openssl/hmac.h
include/openssl/hpke.h
include/openssl/hrss.h
include/openssl/is_boringssl.h
include/openssl/kdf.h
include/openssl/lhash.h
include/openssl/md4.h
include/openssl/md5.h
include/openssl/mem.h
include/openssl/nid.h
include/openssl/objects.h
include/openssl/obj.h
include/openssl/obj_mac.h
include/openssl/opensslconf.h
include/openssl/opensslv.h
include/openssl/ossl_typ.h
include/openssl/pem.h
include/openssl/pkcs12.h
include/openssl/pkcs7.h
include/openssl/pkcs8.h
include/openssl/poly1305.h
include/openssl/pool.h
include/openssl/rand.h
include/openssl/rc4.h
include/openssl/ripemd.h
include/openssl/rsa.h
include/openssl/safestack.h
include/openssl/service_indicator.h
include/openssl/sha.h
include/openssl/siphash.h
include/openssl/span.h
include/openssl/srtp.h
include/openssl/ssl3.h
include/openssl/ssl.h
include/openssl/stack.h
include/openssl/thread.h
include/openssl/tls1.h
include/openssl/trust_token.h
include/openssl/type_check.h
include/openssl/x509.h
include/openssl/x509v3.h
include/openssl/x509_vfy.h
)
target_compile_definitions(bssl-compat PUBLIC ossl_OPENSSL_SUPPRESS_DEPRECATED)
target_include_directories(bssl-compat PUBLIC include)
target_link_libraries(bssl-compat INTERFACE ${CMAKE_DL_LIBS})
Expand Down
17 changes: 9 additions & 8 deletions bssl-compat/cmake/boringssl.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ add_dependencies(BoringSSL::Crypto BoringSSL)


function(_target_add_bssl_file target src-file dst-file)
set(generate-cmd "${CMAKE_CURRENT_SOURCE_DIR}/tools/generate.h.sh"
"${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}"
"${src-file}" "${dst-file}")
execute_process(COMMAND ${generate-cmd})
target_sources(${target} PRIVATE ${dst-file})
string(MAKE_C_IDENTIFIER ${dst-file} dst-file-target)
add_custom_target(${dst-file-target} COMMAND ${generate-cmd})
add_dependencies(${target} ${dst-file-target})
set(generate-cmd "${CMAKE_CURRENT_SOURCE_DIR}/tools/generate.h.sh" "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}" "${src-file}" "${dst-file}")
foreach(dependency "external/boringssl/${src-file}" "patch/${dst-file}.sh" "patch/${dst-file}.patch")
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}")
set(dependencies ${dependencies} "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}")
endif()
endforeach()
set(dependencies ${dependencies} "${CMAKE_CURRENT_SOURCE_DIR}/tools/generate.h.sh")
set(dependencies ${dependencies} "${CMAKE_CURRENT_SOURCE_DIR}/tools/uncomment.sh")
add_custom_command(COMMAND ${generate-cmd} DEPENDS ${dependencies} OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/${dst-file}")
endfunction()

function(target_add_bssl_include target)
Expand Down
2 changes: 1 addition & 1 deletion bssl-compat/external/boringssl
Submodule boringssl updated 703 files
Loading

0 comments on commit cd6ab00

Please sign in to comment.