openharmony/tee_tee_os_framework
1
0
Fork 0
mirror of https://github.com/openharmony/tee_tee_os_framework.git synced 2026-07-19 19:53:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix teeos compilation issue when upgrading to openssl 3.0.9

Browse Source 
Signed-off-by: Ma Zhan <mazhan1@huawei.com>
This commit is contained in:
qazplmmz
2024-06-04 11:24:56 +08:00
committed by qazplmmz
parent ae2d356e9a
commit 20cc532896
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/teelib/libcrypto_hal/src/boringssl/gmssl_internal.h
+2
View File
@@ -19,7 +19,9 @@
#else
#include <crypto/sm3.h>
#endif
#ifndef OPENSSL_NO_SM4
#include <crypto/sm4.h>
#endif
#include <crypto/evp.h>
#include <openssl/evp.h>
#ifdef CRYPTO_SUPPORT_SOFT_ECC
lib/teelib/libopenssl/include/preprocess-openssl3.patch
+3 -4
View File
@@ -27,10 +27,6 @@
+# error OPENSSL_ALGORITHM_DEFINES no longer supported
+#endif
+
+/*
+ * OpenSSL was configured with the following options:
+ */
+
+#ifdef linux
+# undef linux
+#endif
@@ -64,6 +60,9 @@
+#ifndef OPENSSL_NO_SM4_XTS
+# define OPENSSL_NO_SM4_XTS
+#endif
+#ifndef OPENSSL_NO_SM4
+# define OPENSSL_NO_SM4
+#endif
+#ifndef OPENSSL_NO_PQCHYBRID
+# define OPENSSL_NO_PQCHYBRID
+#endif
lib/teelib/libopenssl/openssl3.mk
-11
View File
@@ -137,7 +137,6 @@ LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/bn_sqrt.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/bn_srp.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/bn_word.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/bn_x931p.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/rsa_sup_mul.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/bn/rsaz_exp.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/buffer/buf_err.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/buffer/buffer.c
@@ -204,7 +203,6 @@ LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_null.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_old.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_rc5.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_seed.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_sm4.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/e_xcbc_d.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/encode.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/evp/evp_cnf.c
@@ -355,7 +353,6 @@ LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/sha/sha512.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/siphash/siphash.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/sm3/legacy_sm3.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/sm3/sm3.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/sm4/sm4.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/stack/stack.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/store/store_init.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/crypto/store/store_meth.c
@@ -472,14 +469,6 @@ LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_aes_xts_hw.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_cts.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_null.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_hw.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_ccm.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_ccm_hw.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_gcm.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_gcm_hw.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_xts.c
#LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_sm4_xts_hw.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_tdes.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_tdes_common.c
LOCAL_SRC_FILES += $(OPENSSL_FILE_PATH)/providers/implementations/ciphers/cipher_tdes_default.c