Skip to content

Commit

Permalink
3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
@Fsu0413
Fsu0413 committed Nov 9, 2024
1 parent a916709 commit 75bb942
Show file tree
Hide file tree
Showing 15 changed files with 426 additions and 343 deletions.
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ unset(OPENSSL_KNOWN_RAND_SEED)

# no-<cipher>
set(OPENSSL_DEFAULT_DISABLED_CIPHERS asan buildtest-c++ crypto-mdebug crypto-mdebug-backtrace devcryptoeng ec_nistp_64_gcc_128 egd external-tests fuzz-afl fuzz-libfuzzer ktls md2
msan rc5 sctp ssl3 ssl3-method trace ubsan unit-test weak-ssl-ciphers brotli brotli-dynamic tfo zstd zstd-dynamic zlib zlib-dynamic
msan rc5 sctp ssl3 ssl3-method trace ubsan unit-test weak-ssl-ciphers brotli brotli-dynamic tfo zstd zstd-dynamic zlib zlib-dynamic jitter
demos h3demo pie jitter
)

set(OPENSSL_MIN_API_LEVEL "3.0.0" CACHE STRING "OpenSSL SSL minimum API LEVEL")
Expand Down Expand Up @@ -327,13 +328,13 @@ foreach (_CIPHER IN ITEMS
bulk ssl des ec sock dgram dtls tls engine stdio tests sm3 unit-test msan cmac legacy cmp comp brotli-dynamic zstd-dynamic zlib-dynamic thread-pool blake2 # dependent
dtls1_2-method dtls1-method tls1_2-method tls1_1-method tls1-method ssl3-method # method
aes asn1 bio bn buffer conf crmf encode_decode ess evp ffc hmac hpke http kdf lhash md5 modes objects pem pkcs7 pkcs12 property rand rsa sha stack store thread txt_db
x509 # directories
x509 hashtable # directories
dtls1_2 dtls1 tls1_3 tls1_2 tls1_1 tls1 ssl3 # TLS protocol
acvp-tests afalgeng aria apps argon2 asan async atexit autoalginit autoerrinit autoload-config bf brotli buildtest-c++ cached-fetch camellia capieng winstore cast chacha cms
crypto-mdebug ct default-thread-pool devcryptoeng dh dsa docs ec2m ec_nistp_64_gcc_128 ecdh ecdsa ecx egd external-tests filenames fips fips-securitychecks fuzz-afl
fuzz-libfuzzer gost idea ktls loadereng makedepend md2 md4 mdc2 multiblock nextprotoneg ocb ocsp padlockeng pinshared poly1305 posix-io psk quic unstable-qlog qlog rc2 rc4 rc5
rdrand rfc3779 rmd160 scrypt sctp secure-memory seed siphash siv sm2 sm2-precomp sm4 srp srtp ssl-trace tfo trace ts ubsan ui-console uplink weak-ssl-ciphers whirlpool zlib
zstd
zstd jitter demos h3demo fips-post pie integrity-only-ciphers
)

list(FIND OPENSSL_DEFAULT_DISABLED_CIPHERS ${_CIPHER} _CIPHER_IS_DEFAULT_DISABLED)
Expand Down
7 changes: 6 additions & 1 deletion apps/fipskey.h.cmake.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Generated by CMake
* via fipskey.h.cmake.in
*
* Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 2020-2024 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand All @@ -30,6 +30,11 @@ extern "C" {
*/
#define FIPS_KEY_STRING "@OPENSSL_FIPS_KEY@"

/*
* The FIPS provider vendor name, as a string.
*/
#define FIPS_VENDOR "OpenSSL-externalCMake @OPENSSL_VERSION_STR@ non-compliant FIPS Provider for OpenSSL"

# ifdef __cplusplus
}
# endif
Expand Down
115 changes: 65 additions & 50 deletions crypto/CMakeLists.txt
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions crypto/_cryptoDir/objects.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ set(LIBCRYPTO_CURRENTDIR_SOURCES
${CMAKE_SOURCE_DIR}/openssl/crypto/core_namemap.c
${CMAKE_SOURCE_DIR}/openssl/crypto/self_test_core.c
${CMAKE_SOURCE_DIR}/openssl/crypto/provider_conf.c
${CMAKE_SOURCE_DIR}/openssl/crypto/indicator_core.c
${CMAKE_SOURCE_DIR}/openssl/crypto/cryptlib.c
${CMAKE_SOURCE_DIR}/openssl/crypto/params.c
${CMAKE_SOURCE_DIR}/openssl/crypto/params_from_text.c
Expand All @@ -40,6 +41,7 @@ set(LIBCRYPTO_CURRENTDIR_SOURCES
${CMAKE_SOURCE_DIR}/openssl/crypto/params_dup.c
${CMAKE_SOURCE_DIR}/openssl/crypto/mem.c
${CMAKE_SOURCE_DIR}/openssl/crypto/mem_sec.c
${CMAKE_SOURCE_DIR}/openssl/crypto/comp_methods.c
${CMAKE_SOURCE_DIR}/openssl/crypto/cversion.c
${CMAKE_SOURCE_DIR}/openssl/crypto/info.c
${CMAKE_SOURCE_DIR}/openssl/crypto/cpt_err.c
Expand All @@ -65,6 +67,7 @@ set(LIBCRYPTO_CURRENTDIR_SOURCES
${CMAKE_SOURCE_DIR}/openssl/crypto/sleep.c
${CMAKE_SOURCE_DIR}/openssl/crypto/deterministic_nonce.c
${CMAKE_SOURCE_DIR}/openssl/crypto/quic_vlint.c
${CMAKE_SOURCE_DIR}/openssl/crypto/defaults.c
params_idx.c
buildinf.h
)
Expand Down
14 changes: 12 additions & 2 deletions crypto/configuration.h.cmake.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ extern "C"
#cmakedefine OPENSSL_NO_ASM
#cmakedefine OPENSSL_NO_ASN1
#cmakedefine OPENSSL_NO_ASYNC
#cmakedefine OPENSSL_NO_ATEXIT
#cmakedefine OPENSSL_NO_AUTOALGINIT
#cmakedefine OPENSSL_NO_AUTOERRINIT
#cmakedefine OPENSSL_NO_AUTOLOAD_CONFIG
Expand All @@ -87,6 +88,7 @@ extern "C"
#cmakedefine OPENSSL_NO_CRYPTO_MDEBUG
#cmakedefine OPENSSL_NO_CT
#cmakedefine OPENSSL_NO_DEFAULT_THREAD_POOL
#cmakedefine OPENSSL_NO_DEMOS
#cmakedefine OPENSSL_NO_DEPRECATED
#cmakedefine OPENSSL_NO_DEPRECATED_0_9_8
#cmakedefine OPENSSL_NO_DEPRECATED_1_0_0
Expand All @@ -113,8 +115,8 @@ extern "C"
#cmakedefine OPENSSL_NO_EC2M
#cmakedefine OPENSSL_NO_ECDH
#cmakedefine OPENSSL_NO_ECDSA
#cmakedefine OPENSSL_NO_EC_NISTP_64_GCC_128
#cmakedefine OPENSSL_NO_ECX
#cmakedefine OPENSSL_NO_EC_NISTP_64_GCC_128
#cmakedefine OPENSSL_NO_EGD
#cmakedefine OPENSSL_NO_ENCODE_DECODE
#cmakedefine OPENSSL_NO_ENGINE
Expand All @@ -125,15 +127,20 @@ extern "C"
#cmakedefine OPENSSL_NO_FFC
#cmakedefine OPENSSL_NO_FILENAMES
#cmakedefine OPENSSL_NO_FIPS
#cmakedefine OPENSSL_NO_FIPS_POST
#cmakedefine OPENSSL_NO_FIPS_SECURITYCHECKS
#cmakedefine OPENSSL_NO_FUZZ_AFL
#cmakedefine OPENSSL_NO_FUZZ_LIBFUZZER
#cmakedefine OPENSSL_NO_GOST
#cmakedefine OPENSSL_NO_H3DEMO
#cmakedefine OPENSSL_NO_HASHTABLE
#cmakedefine OPENSSL_NO_HMAC
#cmakedefine OPENSSL_NO_HPKE
#cmakedefine OPENSSL_NO_HTTP
#cmakedefine OPENSSL_NO_HW
#cmakedefine OPENSSL_NO_IDEA
#cmakedefine OPENSSL_NO_INTEGRITY_ONLY_CIPHERS
#cmakedefine OPENSSL_NO_JITTER
#cmakedefine OPENSSL_NO_KDF
#cmakedefine OPENSSL_NO_KTLS
#cmakedefine OPENSSL_NO_LEGACY
Expand All @@ -154,13 +161,15 @@ extern "C"
#cmakedefine OPENSSL_NO_OCSP
#cmakedefine OPENSSL_NO_PADLOCKENG
#cmakedefine OPENSSL_NO_PEM
#cmakedefine OPENSSL_NO_PIE
#cmakedefine OPENSSL_NO_PINSHARED
#cmakedefine OPENSSL_NO_PKCS12
#cmakedefine OPENSSL_NO_PKCS7
#cmakedefine OPENSSL_NO_POLY1305
#cmakedefine OPENSSL_NO_POSIX_IO
#cmakedefine OPENSSL_NO_PROPERTY
#cmakedefine OPENSSL_NO_PSK
#cmakedefine OPENSSL_NO_QLOG
#cmakedefine OPENSSL_NO_QUIC
#cmakedefine OPENSSL_NO_RAND
#cmakedefine OPENSSL_NO_RC2
Expand Down Expand Up @@ -195,8 +204,8 @@ extern "C"
#cmakedefine OPENSSL_NO_TESTS
#cmakedefine OPENSSL_NO_TFO
#cmakedefine OPENSSL_NO_THREAD
#cmakedefine OPENSSL_NO_THREAD_POOL
#cmakedefine OPENSSL_NO_THREADS
#cmakedefine OPENSSL_NO_THREAD_POOL
#cmakedefine OPENSSL_NO_TLS
#cmakedefine OPENSSL_NO_TLS1
#cmakedefine OPENSSL_NO_TLS1_1
Expand All @@ -211,6 +220,7 @@ extern "C"
#cmakedefine OPENSSL_NO_UBSAN
#cmakedefine OPENSSL_NO_UI_CONSOLE
#cmakedefine OPENSSL_NO_UNIT_TEST
#cmakedefine OPENSSL_NO_UNSTABLE_QLOG
#cmakedefine OPENSSL_NO_UPLINK
#cmakedefine OPENSSL_NO_WEAK_SSL_CIPHERS
#cmakedefine OPENSSL_NO_WHIRLPOOL
Expand Down
5 changes: 5 additions & 0 deletions crypto/hashtable/objects.cmake
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# SPDX-License-Identifier: Unlicense

set(LIBCRYPTO_CURRENTDIR_SOURCES
${CMAKE_SOURCE_DIR}/openssl/crypto/hashtable/hashtable.c
)
Loading

0 comments on commit 75bb942

Please sign in to comment.