diff --git a/Makefile b/Makefile index f69d7ae4d..ae2e94970 100644 --- a/Makefile +++ b/Makefile @@ -187,11 +187,11 @@ ifdef TERMINAL endif ifdef BEARSSL - BUILD_DIRS += $(BUILD_DIR)/third_party/bearssl/src - BEARSSL_SOURCES = $(wildcard third_party/bearssl/src/*.c) + BUILD_DIRS += $(BUILD_DIR)/third_party/bearssl + BEARSSL_SOURCES = $(wildcard third_party/bearssl/*.c) BEARSSL_OBJECTS = $(patsubst %.c, $(BUILD_DIR)/%.o, $(BEARSSL_SOURCES)) OBJECTS += $(BEARSSL_OBJECTS) - CFLAGS += -Ithird_party/bearssl/inc -DCC_SSL_BACKEND=CC_SSL_BACKEND_BEARSSL -DCC_NET_BACKEND=CC_NET_BACKEND_BUILTIN + CFLAGS += -DCC_SSL_BACKEND=CC_SSL_BACKEND_BEARSSL -DCC_NET_BACKEND=CC_NET_BACKEND_BUILTIN endif ifdef RELEASE diff --git a/android/app/CMakeLists.txt b/android/app/CMakeLists.txt index 70100b5af..9c068a42d 100644 --- a/android/app/CMakeLists.txt +++ b/android/app/CMakeLists.txt @@ -108,128 +108,126 @@ add_library(classicube SHARED ../../src/Queue.c ../../src/SSL.c ../../src/Certs.c - ../../third_party/bearssl/src/aes_big_cbcdec.c - ../../third_party/bearssl/src/aes_big_cbcenc.c - ../../third_party/bearssl/src/aes_big_ctr.c - ../../third_party/bearssl/src/aes_big_ctrcbc.c - ../../third_party/bearssl/src/aes_big_dec.c - ../../third_party/bearssl/src/aes_big_enc.c - ../../third_party/bearssl/src/aes_common.c - ../../third_party/bearssl/src/aesctr_drbg.c - ../../third_party/bearssl/src/aes_x86ni.c - ../../third_party/bearssl/src/aes_x86ni_cbcdec.c - ../../third_party/bearssl/src/aes_x86ni_cbcenc.c - ../../third_party/bearssl/src/aes_x86ni_ctr.c - ../../third_party/bearssl/src/aes_x86ni_ctrcbc.c - ../../third_party/bearssl/src/asn1enc.c - ../../third_party/bearssl/src/ccm.c - ../../third_party/bearssl/src/ccopy.c - ../../third_party/bearssl/src/chacha20_ct.c - ../../third_party/bearssl/src/chacha20_sse2.c - ../../third_party/bearssl/src/dec32be.c - ../../third_party/bearssl/src/dec32le.c - ../../third_party/bearssl/src/dec64be.c - ../../third_party/bearssl/src/dec64le.c - ../../third_party/bearssl/src/dig_oid.c - ../../third_party/bearssl/src/dig_size.c - ../../third_party/bearssl/src/ec_all_m31.c - ../../third_party/bearssl/src/ec_c25519_i31.c - ../../third_party/bearssl/src/ec_c25519_m31.c - ../../third_party/bearssl/src/ec_c25519_m62.c - ../../third_party/bearssl/src/ec_c25519_m64.c - ../../third_party/bearssl/src/ec_curve25519.c - ../../third_party/bearssl/src/ec_default.c - ../../third_party/bearssl/src/ecdsa_atr.c - ../../third_party/bearssl/src/ecdsa_default_vrfy_asn1.c - ../../third_party/bearssl/src/ecdsa_default_vrfy_raw.c - ../../third_party/bearssl/src/ecdsa_i31_bits.c - ../../third_party/bearssl/src/ecdsa_i31_vrfy_asn1.c - ../../third_party/bearssl/src/ecdsa_i31_vrfy_raw.c - ../../third_party/bearssl/src/ec_p256_m31.c - ../../third_party/bearssl/src/ec_p256_m62.c - ../../third_party/bearssl/src/ec_p256_m64.c - ../../third_party/bearssl/src/ec_prime_i31.c - ../../third_party/bearssl/src/ec_secp256r1.c - ../../third_party/bearssl/src/ec_secp384r1.c - ../../third_party/bearssl/src/ec_secp521r1.c - ../../third_party/bearssl/src/enc32be.c - ../../third_party/bearssl/src/enc32le.c - ../../third_party/bearssl/src/enc64be.c - ../../third_party/bearssl/src/enc64le.c - ../../third_party/bearssl/src/gcm.c - ../../third_party/bearssl/src/ghash_ctmul64.c - ../../third_party/bearssl/src/ghash_ctmul.c - ../../third_party/bearssl/src/ghash_pclmul.c - ../../third_party/bearssl/src/hmac.c - ../../third_party/bearssl/src/hmac_ct.c - ../../third_party/bearssl/src/hmac_drbg.c - ../../third_party/bearssl/src/i31_add.c - ../../third_party/bearssl/src/i31_bitlen.c - ../../third_party/bearssl/src/i31_decmod.c - ../../third_party/bearssl/src/i31_decode.c - ../../third_party/bearssl/src/i31_decred.c - ../../third_party/bearssl/src/i31_encode.c - ../../third_party/bearssl/src/i31_fmont.c - ../../third_party/bearssl/src/i31_iszero.c - ../../third_party/bearssl/src/i31_moddiv.c - ../../third_party/bearssl/src/i31_modpow2.c - ../../third_party/bearssl/src/i31_modpow.c - ../../third_party/bearssl/src/i31_montmul.c - ../../third_party/bearssl/src/i31_mulacc.c - ../../third_party/bearssl/src/i31_muladd.c - ../../third_party/bearssl/src/i31_ninv31.c - ../../third_party/bearssl/src/i31_reduce.c - ../../third_party/bearssl/src/i31_rshift.c - ../../third_party/bearssl/src/i31_sub.c - ../../third_party/bearssl/src/i31_tmont.c - ../../third_party/bearssl/src/i32_div32.c - ../../third_party/bearssl/src/i62_modpow2.c - ../../third_party/bearssl/src/md5.c - ../../third_party/bearssl/src/md5sha1.c - ../../third_party/bearssl/src/multihash.c - ../../third_party/bearssl/src/poly1305_ctmul.c - ../../third_party/bearssl/src/poly1305_ctmulq.c - ../../third_party/bearssl/src/prf.c - ../../third_party/bearssl/src/prf_md5sha1.c - ../../third_party/bearssl/src/prf_sha256.c - ../../third_party/bearssl/src/prf_sha384.c - ../../third_party/bearssl/src/rsa_default_pkcs1_vrfy.c - ../../third_party/bearssl/src/rsa_default_priv.c - ../../third_party/bearssl/src/rsa_default_pub.c - ../../third_party/bearssl/src/rsa_i31_pkcs1_vrfy.c - ../../third_party/bearssl/src/rsa_i31_priv.c - ../../third_party/bearssl/src/rsa_i31_pub.c - ../../third_party/bearssl/src/rsa_i62_pkcs1_vrfy.c - ../../third_party/bearssl/src/rsa_i62_priv.c - ../../third_party/bearssl/src/rsa_i62_pub.c - ../../third_party/bearssl/src/rsa_pkcs1_sig_unpad.c - ../../third_party/bearssl/src/sha1.c - ../../third_party/bearssl/src/sha2big.c - ../../third_party/bearssl/src/sha2small.c - ../../third_party/bearssl/src/ssl_client.c - ../../third_party/bearssl/src/ssl_client_default_rsapub.c - ../../third_party/bearssl/src/ssl_client_full.c - ../../third_party/bearssl/src/ssl_engine.c - ../../third_party/bearssl/src/ssl_engine_default_aescbc.c - ../../third_party/bearssl/src/ssl_engine_default_aesccm.c - ../../third_party/bearssl/src/ssl_engine_default_aesgcm.c - ../../third_party/bearssl/src/ssl_engine_default_chapol.c - ../../third_party/bearssl/src/ssl_engine_default_ec.c - ../../third_party/bearssl/src/ssl_engine_default_ecdsa.c - ../../third_party/bearssl/src/ssl_engine_default_rsavrfy.c - ../../third_party/bearssl/src/ssl_hashes.c - ../../third_party/bearssl/src/ssl_hs_client.c - ../../third_party/bearssl/src/ssl_io.c - ../../third_party/bearssl/src/ssl_rec_cbc.c - ../../third_party/bearssl/src/ssl_rec_ccm.c - ../../third_party/bearssl/src/ssl_rec_chapol.c - ../../third_party/bearssl/src/ssl_rec_gcm.c - ../../third_party/bearssl/src/x509_minimal.c - ../../third_party/bearssl/src/x509_minimal_full.c + ../../third_party/bearssl/aes_big_cbcdec.c + ../../third_party/bearssl/aes_big_cbcenc.c + ../../third_party/bearssl/aes_big_ctr.c + ../../third_party/bearssl/aes_big_ctrcbc.c + ../../third_party/bearssl/aes_big_dec.c + ../../third_party/bearssl/aes_big_enc.c + ../../third_party/bearssl/aes_common.c + ../../third_party/bearssl/aesctr_drbg.c + ../../third_party/bearssl/aes_x86ni.c + ../../third_party/bearssl/aes_x86ni_cbcdec.c + ../../third_party/bearssl/aes_x86ni_cbcenc.c + ../../third_party/bearssl/aes_x86ni_ctr.c + ../../third_party/bearssl/aes_x86ni_ctrcbc.c + ../../third_party/bearssl/asn1enc.c + ../../third_party/bearssl/ccm.c + ../../third_party/bearssl/ccopy.c + ../../third_party/bearssl/chacha20_ct.c + ../../third_party/bearssl/chacha20_sse2.c + ../../third_party/bearssl/dec32be.c + ../../third_party/bearssl/dec32le.c + ../../third_party/bearssl/dec64be.c + ../../third_party/bearssl/dec64le.c + ../../third_party/bearssl/dig_oid.c + ../../third_party/bearssl/dig_size.c + ../../third_party/bearssl/ec_all_m31.c + ../../third_party/bearssl/ec_c25519_i31.c + ../../third_party/bearssl/ec_c25519_m31.c + ../../third_party/bearssl/ec_c25519_m62.c + ../../third_party/bearssl/ec_c25519_m64.c + ../../third_party/bearssl/ec_curve25519.c + ../../third_party/bearssl/ec_default.c + ../../third_party/bearssl/ecdsa_atr.c + ../../third_party/bearssl/ecdsa_default_vrfy_asn1.c + ../../third_party/bearssl/ecdsa_default_vrfy_raw.c + ../../third_party/bearssl/ecdsa_i31_bits.c + ../../third_party/bearssl/ecdsa_i31_vrfy_asn1.c + ../../third_party/bearssl/ecdsa_i31_vrfy_raw.c + ../../third_party/bearssl/ec_p256_m31.c + ../../third_party/bearssl/ec_p256_m62.c + ../../third_party/bearssl/ec_p256_m64.c + ../../third_party/bearssl/ec_prime_i31.c + ../../third_party/bearssl/ec_secp256r1.c + ../../third_party/bearssl/ec_secp384r1.c + ../../third_party/bearssl/ec_secp521r1.c + ../../third_party/bearssl/enc32be.c + ../../third_party/bearssl/enc32le.c + ../../third_party/bearssl/enc64be.c + ../../third_party/bearssl/enc64le.c + ../../third_party/bearssl/gcm.c + ../../third_party/bearssl/ghash_ctmul64.c + ../../third_party/bearssl/ghash_ctmul.c + ../../third_party/bearssl/ghash_pclmul.c + ../../third_party/bearssl/hmac.c + ../../third_party/bearssl/hmac_ct.c + ../../third_party/bearssl/hmac_drbg.c + ../../third_party/bearssl/i31_add.c + ../../third_party/bearssl/i31_bitlen.c + ../../third_party/bearssl/i31_decmod.c + ../../third_party/bearssl/i31_decode.c + ../../third_party/bearssl/i31_decred.c + ../../third_party/bearssl/i31_encode.c + ../../third_party/bearssl/i31_fmont.c + ../../third_party/bearssl/i31_iszero.c + ../../third_party/bearssl/i31_moddiv.c + ../../third_party/bearssl/i31_modpow2.c + ../../third_party/bearssl/i31_modpow.c + ../../third_party/bearssl/i31_montmul.c + ../../third_party/bearssl/i31_mulacc.c + ../../third_party/bearssl/i31_muladd.c + ../../third_party/bearssl/i31_ninv31.c + ../../third_party/bearssl/i31_reduce.c + ../../third_party/bearssl/i31_rshift.c + ../../third_party/bearssl/i31_sub.c + ../../third_party/bearssl/i31_tmont.c + ../../third_party/bearssl/i32_div32.c + ../../third_party/bearssl/i62_modpow2.c + ../../third_party/bearssl/md5.c + ../../third_party/bearssl/md5sha1.c + ../../third_party/bearssl/multihash.c + ../../third_party/bearssl/poly1305_ctmul.c + ../../third_party/bearssl/poly1305_ctmulq.c + ../../third_party/bearssl/prf.c + ../../third_party/bearssl/prf_md5sha1.c + ../../third_party/bearssl/prf_sha256.c + ../../third_party/bearssl/prf_sha384.c + ../../third_party/bearssl/rsa_default_pkcs1_vrfy.c + ../../third_party/bearssl/rsa_default_priv.c + ../../third_party/bearssl/rsa_default_pub.c + ../../third_party/bearssl/rsa_i31_pkcs1_vrfy.c + ../../third_party/bearssl/rsa_i31_priv.c + ../../third_party/bearssl/rsa_i31_pub.c + ../../third_party/bearssl/rsa_i62_pkcs1_vrfy.c + ../../third_party/bearssl/rsa_i62_priv.c + ../../third_party/bearssl/rsa_i62_pub.c + ../../third_party/bearssl/rsa_pkcs1_sig_unpad.c + ../../third_party/bearssl/sha1.c + ../../third_party/bearssl/sha2big.c + ../../third_party/bearssl/sha2small.c + ../../third_party/bearssl/ssl_client.c + ../../third_party/bearssl/ssl_client_default_rsapub.c + ../../third_party/bearssl/ssl_client_full.c + ../../third_party/bearssl/ssl_engine.c + ../../third_party/bearssl/ssl_engine_default_aescbc.c + ../../third_party/bearssl/ssl_engine_default_aesccm.c + ../../third_party/bearssl/ssl_engine_default_aesgcm.c + ../../third_party/bearssl/ssl_engine_default_chapol.c + ../../third_party/bearssl/ssl_engine_default_ec.c + ../../third_party/bearssl/ssl_engine_default_ecdsa.c + ../../third_party/bearssl/ssl_engine_default_rsavrfy.c + ../../third_party/bearssl/ssl_hashes.c + ../../third_party/bearssl/ssl_hs_client.c + ../../third_party/bearssl/ssl_io.c + ../../third_party/bearssl/ssl_rec_cbc.c + ../../third_party/bearssl/ssl_rec_ccm.c + ../../third_party/bearssl/ssl_rec_chapol.c + ../../third_party/bearssl/ssl_rec_gcm.c + ../../third_party/bearssl/x509_minimal.c + ../../third_party/bearssl/x509_minimal_full.c ) -target_include_directories(classicube PRIVATE - ../../third_party/bearssl/inc) target_link_libraries(classicube android EGL diff --git a/misc/3ds/Makefile b/misc/3ds/Makefile index f7ae03b45..0aae01ae7 100644 --- a/misc/3ds/Makefile +++ b/misc/3ds/Makefile @@ -9,11 +9,11 @@ endif # Name of the final output TARGET = ClassiCube-3ds # List of directories containing source code -SOURCE_DIRS = src src/3ds third_party/bearssl/src +SOURCE_DIRS = src src/3ds third_party/bearssl # List of directories containing shader files SHDR_DIRS = misc/3ds # List of directories containing more header files -INCLUDES = -Ithird_party/bearssl/inc +INCLUDES = # Directory where object files are placed BUILD_DIR = build/3ds @@ -109,7 +109,7 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/3ds/%.c $(ARM_CC) $(CFLAGS) $(INCLUDES) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c $(ARM_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ $(BUILD_DIR)/%.shbin: misc/3ds/%.v.pica diff --git a/misc/dreamcast/Makefile b/misc/dreamcast/Makefile index f0725b258..dc6a37c7b 100644 --- a/misc/dreamcast/Makefile +++ b/misc/dreamcast/Makefile @@ -11,13 +11,13 @@ endif # Directory where object files are placed BUILD_DIR := build/dc # List of directories containing source code -SOURCE_DIRS := src third_party/bearssl/src misc/dreamcast +SOURCE_DIRS := src third_party/bearssl misc/dreamcast # Name of the final output TARGET := ClassiCube-dc # Additional libraries to link against LIBS = -lm -lppp -lkosfat # List of directories containing more header files -INCLUDES = -Ithird_party/bearssl/inc +INCLUDES = #--------------------------------------------------------------------------------- @@ -81,7 +81,7 @@ $(TARGET).cdi: $(TARGET).iso $(BUILD_DIR)/%.o: src/%.c kos-cc $(CFLAGS) $(INCLUDES) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c kos-cc $(CFLAGS) $(INCLUDES) -c $< -o $@ $(BUILD_DIR)/%.o: misc/dreamcast/%.S diff --git a/misc/gc/Makefile b/misc/gc/Makefile index 3718c46d4..9ec6c2a7b 100644 --- a/misc/gc/Makefile +++ b/misc/gc/Makefile @@ -9,9 +9,9 @@ endif # Name of the final output TARGET = ClassiCube-gc # List of directories containing source code -SOURCE_DIRS = src src/gcwii third_party/bearssl/src +SOURCE_DIRS = src src/gcwii third_party/bearssl # List of directories containing more header files -INCLUDES = -Ithird_party/bearssl/inc +INCLUDES = # Directory where object files are placed BUILD_DIR = build/gc @@ -77,7 +77,7 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/gcwii/%.c $(PPC_CC) $(CFLAGS) $(INCLUDES) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c $(PPC_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ diff --git a/misc/ios/CCIOS.xcodeproj/project.pbxproj b/misc/ios/CCIOS.xcodeproj/project.pbxproj index f6f86c0d3..7030ccb3a 100644 --- a/misc/ios/CCIOS.xcodeproj/project.pbxproj +++ b/misc/ios/CCIOS.xcodeproj/project.pbxproj @@ -681,7 +681,7 @@ 9AC3D0AA2E1166AB00A38E91 /* i31_moddiv.c */, ); name = src; - path = ../../third_party/bearssl/src; + path = ../../third_party/bearssl; sourceTree = ""; }; /* End PBXGroup section */ @@ -1081,7 +1081,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - HEADER_SEARCH_PATHS = ../../third_party/bearssl/inc; INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = ( @@ -1099,7 +1098,6 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - HEADER_SEARCH_PATHS = ../../third_party/bearssl/inc; INFOPLIST_FILE = Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 6.0; LD_RUNPATH_SEARCH_PATHS = ( diff --git a/misc/macOS/CCMAC.xcodeproj/project.pbxproj b/misc/macOS/CCMAC.xcodeproj/project.pbxproj index 4f7cbadaf..db9da3048 100644 --- a/misc/macOS/CCMAC.xcodeproj/project.pbxproj +++ b/misc/macOS/CCMAC.xcodeproj/project.pbxproj @@ -690,7 +690,7 @@ 9AC3D45C2E12921400A38E91 /* x509_minimal.c */, ); name = src; - path = ../../third_party/bearssl/src; + path = ../../third_party/bearssl; sourceTree = ""; }; /* End PBXGroup section */ @@ -1079,7 +1079,6 @@ buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; CODE_SIGN_STYLE = Automatic; - HEADER_SEARCH_PATHS = ../../third_party/bearssl/inc; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -1090,7 +1089,6 @@ buildSettings = { CLANG_ENABLE_OBJC_ARC = NO; CODE_SIGN_STYLE = Automatic; - HEADER_SEARCH_PATHS = ../../third_party/bearssl/inc; MACOSX_DEPLOYMENT_TARGET = 10.13; PRODUCT_NAME = "$(TARGET_NAME)"; }; diff --git a/misc/ps2/Makefile b/misc/ps2/Makefile index fcd7a3c20..9873bc662 100644 --- a/misc/ps2/Makefile +++ b/misc/ps2/Makefile @@ -9,7 +9,7 @@ endif # Name of the final output TARGET = ClassiCube-ps2 # List of directories containing source code -SOURCE_DIRS := src src/ps2 third_party/bearssl/src +SOURCE_DIRS := src src/ps2 third_party/bearssl # Directory where object files are placed BUILD_DIR = build/ps2 @@ -26,7 +26,7 @@ IOP_MODS := DEV9_irx.o NETMAN_irx.o SMAP_irx.o USBD_irx.o BDM_irx.o BDMFS_FATFS_ EE_OBJS = $(OBJS) $(patsubst %.o, $(BUILD_DIR)/%.o, $(IOP_MODS)) EE_LIBS = -lpatches -lpad -lpacket -ldma -lgraph -ldraw -lc -lps2ip -lnetman -lmc -lmouse -lkbd -EE_INCS := -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include -Ithird_party/bearssl/inc +EE_INCS := -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include EE_CFLAGS := -D_EE -G0 -O2 -Wall -gdwarf-2 -gz -DPLAT_PS2 EE_LDFLAGS := -L$(PS2SDK)/ee/lib -Wl,-zmax-page-size=128 EE_LINKFILE := $(PS2SDK)/ee/startup/linkfile @@ -111,7 +111,7 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/ps2/%.c $(EE_CC) $(DEPFLAGS) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c $(EE_CC) $(DEPFLAGS) $(EE_CFLAGS) $(EE_INCS) -c $< -o $@ $(BUILD_DIR)/%.o: src/ps2/%.S diff --git a/misc/ps3/Makefile b/misc/ps3/Makefile index e28411b5a..ec40625be 100644 --- a/misc/ps3/Makefile +++ b/misc/ps3/Makefile @@ -20,8 +20,8 @@ include $(PS3DEV)/ppu_rules #--------------------------------------------------------------------------------- TARGET := ClassiCube-PS3 BUILD := build-ps3 -SOURCES := src third_party/bearssl/src -INCLUDES := third_party/bearssl/inc +SOURCES := src third_party/bearssl +INCLUDES := SHADERS := misc/ps3 TITLE := ClassiCube diff --git a/misc/psp/Makefile b/misc/psp/Makefile index 73dd5a810..be00410bd 100644 --- a/misc/psp/Makefile +++ b/misc/psp/Makefile @@ -10,7 +10,7 @@ endif # Name of the final output TARGET = ClassiCube-psp # List of directories containing source code -SOURCE_DIRS = src third_party/bearssl/src +SOURCE_DIRS = src third_party/bearssl # Directory where object files are placed BUILD_DIR = build/psp @@ -24,7 +24,7 @@ PSP_EBOOT_ICON = misc/psp/ICON0.png C_FILES := $(foreach dir,$(SOURCE_DIRS),$(wildcard $(dir)/*.c)) OBJS := $(addprefix $(BUILD_DIR)/, $(notdir $(C_FILES:%.c=%.o))) -INCDIR = third_party/bearssl/inc +INCDIR = third_party/bearssl CFLAGS = -g -O1 -fno-math-errno ASFLAGS = $(CFLAGS) @@ -55,7 +55,7 @@ $(BUILD_DIR): $(BUILD_DIR)/%.o : src/%.c $(CC) $(CFLAGS) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o : third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o : third_party/bearssl/%.c $(CC) $(CFLAGS) -c $< -o $@ diff --git a/misc/switch/Makefile b/misc/switch/Makefile index b12d7d2fa..adf47c967 100644 --- a/misc/switch/Makefile +++ b/misc/switch/Makefile @@ -9,9 +9,9 @@ endif # Name of the final output TARGET = ClassiCube-switch # List of directories containing source code -SOURCE_DIRS = src src/switch third_party/bearssl/src +SOURCE_DIRS = src src/switch third_party/bearssl # List of directories containing more header files -INCLUDES = -Ithird_party/bearssl/inc +INCLUDES = # Directory where object files are placed BUILD_DIR = build/switch @@ -94,7 +94,7 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/switch/%.c $(A64_CC) $(CFLAGS) $(INCLUDES) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c $(A64_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ diff --git a/misc/symbian/ClassiCube_common.mmh b/misc/symbian/ClassiCube_common.mmh index f9b1c161f..62a6ad94f 100644 --- a/misc/symbian/ClassiCube_common.mmh +++ b/misc/symbian/ClassiCube_common.mmh @@ -15,8 +15,7 @@ SYSTEMINCLUDE /epoc32/include/stdapis/sys USERINCLUDE ../../src USERINCLUDE ../../src/freetype -USERINCLUDE ../../third_party/bearssl/inc -USERINCLUDE ../../third_party/bearssl/src +USERINCLUDE ../../third_party/bearssl MACRO SYMBIAN_OE_POSIX_SIGNALS @@ -46,7 +45,7 @@ OPTION_REPLACE ARMCC -O2 -O3 SOURCEPATH ../../src SOURCE Animations.c Audio.c Audio_Null.c AxisLinesRenderer.c Bitmap.c Block.c BlockPhysics.c Builder.c Camera.c Certs.c Chat.c Commands.c Deflate.c Drawer.c Drawer2D.c Entity.c EntityComponents.c EntityRenderers.c EnvRenderer.c Event.c ExtMath.c FancyLighting.c Formats.c Game.c GameVersion.c Generator.c Graphics_GL1.c Graphics_SoftGPU.c Gui.c HeldBlockRenderer.c Http_Web.c Http_Worker.c Input.c InputHandler.c Inventory.c IsometricDrawer.c LBackend.c LScreens.c LWeb.c LWidgets.c Launcher.c Lighting.c Logger.c MapRenderer.c MenuOptions.c Menus.c Model.c Options.c PackedCol.c Particle.c Physics.c Picking.c Platform_Posix.c Protocol.c Queue.c Resources.c SSL.c Screens.c SelOutlineRenderer.c SelectionBox.c Server.c Stream.c String.c SystemFonts.c TexturePack.c TouchUI.c Utils.c Vectors.c Widgets.c World.c _autofit.c _cff.c _ftbase.c _ftbitmap.c _ftglyph.c _ftinit.c _ftsynth.c _psaux.c _pshinter.c _psmodule.c _sfnt.c _smooth.c _truetype.c _type1.c Vorbis.c Platform_Symbian.cpp Graphics_GL2.c Window_Symbian.cpp Audio_Symbian.cpp -SOURCEPATH ../../third_party/bearssl/src +SOURCEPATH ../../third_party/bearssl SOURCE aes_big_cbcdec.c aes_big_cbcenc.c aes_big_ctr.c aes_big_ctrcbc.c aes_big_dec.c aes_big_enc.c aes_common.c aesctr_drbg.c aes_x86ni.c aes_x86ni_cbcdec.c aes_x86ni_cbcenc.c aes_x86ni_ctr.c aes_x86ni_ctrcbc.c asn1enc.c ccm.c ccopy.c chacha20_ct.c chacha20_sse2.c dec32be.c dec32le.c dec64be.c dec64le.c dig_oid.c dig_size.c ec_all_m31.c ec_c25519_i31.c ec_c25519_m31.c ec_c25519_m62.c ec_c25519_m64.c ec_curve25519.c ec_default.c ecdsa_atr.c ecdsa_default_vrfy_asn1.c ecdsa_default_vrfy_raw.c ecdsa_i31_bits.c ecdsa_i31_vrfy_asn1.c ecdsa_i31_vrfy_raw.c ec_p256_m31.c ec_p256_m62.c ec_p256_m64.c ec_prime_i31.c ec_secp256r1.c ec_secp384r1.c ec_secp521r1.c enc32be.c enc32le.c enc64be.c enc64le.c gcm.c ghash_ctmul64.c ghash_ctmul.c ghash_pclmul.c hmac.c hmac_ct.c hmac_drbg.c i31_add.c i31_bitlen.c i31_decmod.c i31_decode.c i31_decred.c i31_encode.c i31_fmont.c i31_iszero.c i31_moddiv.c i31_modpow2.c i31_modpow.c i31_montmul.c i31_mulacc.c i31_muladd.c i31_ninv31.c i31_reduce.c i31_rshift.c i31_sub.c i31_tmont.c i32_div32.c i62_modpow2.c md5.c md5sha1.c multihash.c poly1305_ctmul.c poly1305_ctmulq.c prf.c prf_md5sha1.c prf_sha256.c prf_sha384.c rsa_default_pkcs1_vrfy.c rsa_default_priv.c rsa_default_pub.c rsa_i31_pkcs1_vrfy.c rsa_i31_priv.c rsa_i31_pub.c rsa_i62_pkcs1_vrfy.c rsa_i62_priv.c rsa_i62_pub.c rsa_pkcs1_sig_unpad.c sha1.c sha2big.c sha2small.c ssl_client.c ssl_client_default_rsapub.c ssl_client_full.c ssl_engine.c ssl_engine_default_aescbc.c ssl_engine_default_aesccm.c ssl_engine_default_aesgcm.c ssl_engine_default_chapol.c ssl_engine_default_ec.c ssl_engine_default_ecdsa.c ssl_engine_default_rsavrfy.c ssl_hashes.c ssl_hs_client.c ssl_io.c ssl_rec_cbc.c ssl_rec_ccm.c ssl_rec_chapol.c ssl_rec_gcm.c x509_minimal.c x509_minimal_full.c CAPABILITY NetworkServices ReadUserData UserEnvironment WriteUserData diff --git a/misc/vita/Makefile b/misc/vita/Makefile index 8b03eefb6..98f7bdd94 100644 --- a/misc/vita/Makefile +++ b/misc/vita/Makefile @@ -11,7 +11,7 @@ endif # Name of the final output TARGET := ClassiCube-vita # List of directories containing source code -SOURCE_DIRS := src src/psvita third_party/bearssl/src +SOURCE_DIRS := src src/psvita third_party/bearssl # Directory where object files are placed BUILD_DIR := build/vita @@ -25,7 +25,7 @@ PROJECT_TITLEID := CUBE00200 C_FILES = $(foreach dir,$(SOURCE_DIRS),$(wildcard $(dir)/*.c)) OBJS = $(addprefix $(BUILD_DIR)/, $(notdir $(C_FILES:%.c=%.o))) -CFLAGS = -Ithird_party/bearssl/inc -O1 +CFLAGS = -O1 LDFLAGS = -Wl,-q LIBS = -lm -lSceDisplay_stub -lSceCtrl_stub -lSceTouch_stub -lSceGxm_stub -lSceCommonDialog_stub -lSceAppUtil_stub @@ -91,7 +91,7 @@ $(BUILD_DIR)/%.o : src/%.c $(BUILD_DIR)/%.o : src/psvita/%.c $(VITA_CC) $(CFLAGS) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o : third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o : third_party/bearssl/%.c $(VITA_CC) $(CFLAGS) -c $< -o $@ diff --git a/misc/wii/Makefile b/misc/wii/Makefile index 400872fd4..86bd1cf94 100644 --- a/misc/wii/Makefile +++ b/misc/wii/Makefile @@ -9,9 +9,9 @@ endif # Name of the final output TARGET = ClassiCube-wii # List of directories containing source code -SOURCE_DIRS = src src/gcwii third_party/bearssl/src +SOURCE_DIRS = src src/gcwii third_party/bearssl # List of directories containing more header files -INCLUDES = -Ithird_party/bearssl/inc +INCLUDES = # Directory where object files are placed BUILD_DIR = build/wii @@ -77,7 +77,7 @@ $(BUILD_DIR)/%.o: src/%.c $(BUILD_DIR)/%.o: src/gcwii/%.c $(PPC_CC) $(CFLAGS) $(INCLUDES) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c $(PPC_CC) $(CFLAGS) $(INCLUDES) -c $< -o $@ diff --git a/misc/wiiu/Makefile b/misc/wiiu/Makefile index 53ab0da4b..5e8424dea 100644 --- a/misc/wiiu/Makefile +++ b/misc/wiiu/Makefile @@ -32,10 +32,10 @@ include $(DEVKITPRO)/wut/share/wut_rules #------------------------------------------------------------------------------- TARGET := ClassiCube-wiiu BUILD := build-wiiu -SOURCES := src third_party/bearssl/src +SOURCES := src third_party/bearssl SHADERS := misc/wiiu DATA := data -INCLUDES := third_party/bearssl/inc +INCLUDES := CONTENT := ICON := TV_SPLASH := diff --git a/misc/xbox/Makefile b/misc/xbox/Makefile index baccada27..21d2722ee 100644 --- a/misc/xbox/Makefile +++ b/misc/xbox/Makefile @@ -10,7 +10,7 @@ TARGET = ClassiCube-xbox # Application name/title XBE_TITLE = ClassiCube # List of directories containing source code -SOURCE_DIRS = src src/xbox third_party/bearssl/src +SOURCE_DIRS = src src/xbox third_party/bearssl # Shader objects SHADER_OBJS = misc/xbox/vs_coloured.inl misc/xbox/vs_textured.inl misc/xbox/ps_coloured.inl misc/xbox/ps_textured.inl # Directory where object files are placed @@ -24,7 +24,7 @@ S_FILES = $(foreach dir,$(SOURCE_DIRS),$(wildcard $(dir)/*.S)) C_FILES = $(foreach dir,$(SOURCE_DIRS),$(wildcard $(dir)/*.c)) OBJS = $(addprefix $(BUILD_DIR)/, $(notdir $(C_FILES:%.c=%.o) $(S_FILES:%.S=%.o))) -CFLAGS = -Ithird_party/bearssl/inc -O1 -fno-math-errno -Wno-builtin-macro-redefined \ +CFLAGS = -O1 -fno-math-errno -Wno-builtin-macro-redefined \ -I$(NXDK_DIR)/lib/net/lwip/src/include \ -I$(NXDK_DIR)/lib/net/nforceif/include \ -I$(NXDK_DIR)/lib/net/nvnetdrv \ @@ -101,7 +101,7 @@ $(BUILD_DIR)/%.o: src/xbox/%.c $(BUILD_DIR)/%.o: src/xbox/%.S nxdk-as $(NXDK_ASFLAGS) $(ASFLAGS) $(DEPFLAGS) -c $< -o $@ -$(BUILD_DIR)/%.o: third_party/bearssl/src/%.c +$(BUILD_DIR)/%.o: third_party/bearssl/%.c nxdk-cc $(NXDK_CFLAGS) $(CFLAGS) -c $< -o $@ %.inl: %.vs.cg diff --git a/misc/xbox360/Makefile b/misc/xbox360/Makefile index f4f26c4eb..9bcb2a25c 100644 --- a/misc/xbox360/Makefile +++ b/misc/xbox360/Makefile @@ -29,7 +29,7 @@ export AR := xenon-ar #--------------------------------------------------------------------------------- TARGET := ClassiCube-xbox360 BUILD := build-360 -SOURCES := src third_party/bearssl/src +SOURCES := src third_party/bearssl #--------------------------------------------------------------------------------- # options for code generation @@ -68,7 +68,7 @@ export OFILES := $(CFILES:.c=.o) $(sFILES:.s=.o) $(SFILES:.S=.o) #--------------------------------------------------------------------------------- # build a list of include paths #--------------------------------------------------------------------------------- -export INCLUDE := -I$(LIBXENON_INC) -Ithird_party/bearssl/inc +export INCLUDE := -I$(LIBXENON_INC) #--------------------------------------------------------------------------------- # build a list of library paths diff --git a/src/SSL.c b/src/SSL.c index 07f6cf471..9c665035b 100644 --- a/src/SSL.c +++ b/src/SSL.c @@ -407,7 +407,7 @@ cc_result SSL_Free(void* ctx_) { #elif CC_SSL_BACKEND == CC_SSL_BACKEND_BEARSSL #include "String.h" #include "Certs.h" -#include "bearssl.h" +#include "../third_party/bearssl/bearssl.h" #include "../misc/certs/certs.h" // https://github.com/unkaktus/bearssl/blob/master/samples/client_basic.c#L283 diff --git a/third_party/bearssl/src/aes_big_cbcdec.c b/third_party/bearssl/aes_big_cbcdec.c similarity index 100% rename from third_party/bearssl/src/aes_big_cbcdec.c rename to third_party/bearssl/aes_big_cbcdec.c diff --git a/third_party/bearssl/src/aes_big_cbcenc.c b/third_party/bearssl/aes_big_cbcenc.c similarity index 100% rename from third_party/bearssl/src/aes_big_cbcenc.c rename to third_party/bearssl/aes_big_cbcenc.c diff --git a/third_party/bearssl/src/aes_big_ctr.c b/third_party/bearssl/aes_big_ctr.c similarity index 100% rename from third_party/bearssl/src/aes_big_ctr.c rename to third_party/bearssl/aes_big_ctr.c diff --git a/third_party/bearssl/src/aes_big_ctrcbc.c b/third_party/bearssl/aes_big_ctrcbc.c similarity index 100% rename from third_party/bearssl/src/aes_big_ctrcbc.c rename to third_party/bearssl/aes_big_ctrcbc.c diff --git a/third_party/bearssl/src/aes_big_dec.c b/third_party/bearssl/aes_big_dec.c similarity index 100% rename from third_party/bearssl/src/aes_big_dec.c rename to third_party/bearssl/aes_big_dec.c diff --git a/third_party/bearssl/src/aes_big_enc.c b/third_party/bearssl/aes_big_enc.c similarity index 100% rename from third_party/bearssl/src/aes_big_enc.c rename to third_party/bearssl/aes_big_enc.c diff --git a/third_party/bearssl/src/aes_common.c b/third_party/bearssl/aes_common.c similarity index 100% rename from third_party/bearssl/src/aes_common.c rename to third_party/bearssl/aes_common.c diff --git a/third_party/bearssl/src/aes_x86ni.c b/third_party/bearssl/aes_x86ni.c similarity index 100% rename from third_party/bearssl/src/aes_x86ni.c rename to third_party/bearssl/aes_x86ni.c diff --git a/third_party/bearssl/src/aes_x86ni_cbcdec.c b/third_party/bearssl/aes_x86ni_cbcdec.c similarity index 100% rename from third_party/bearssl/src/aes_x86ni_cbcdec.c rename to third_party/bearssl/aes_x86ni_cbcdec.c diff --git a/third_party/bearssl/src/aes_x86ni_cbcenc.c b/third_party/bearssl/aes_x86ni_cbcenc.c similarity index 100% rename from third_party/bearssl/src/aes_x86ni_cbcenc.c rename to third_party/bearssl/aes_x86ni_cbcenc.c diff --git a/third_party/bearssl/src/aes_x86ni_ctr.c b/third_party/bearssl/aes_x86ni_ctr.c similarity index 100% rename from third_party/bearssl/src/aes_x86ni_ctr.c rename to third_party/bearssl/aes_x86ni_ctr.c diff --git a/third_party/bearssl/src/aes_x86ni_ctrcbc.c b/third_party/bearssl/aes_x86ni_ctrcbc.c similarity index 100% rename from third_party/bearssl/src/aes_x86ni_ctrcbc.c rename to third_party/bearssl/aes_x86ni_ctrcbc.c diff --git a/third_party/bearssl/src/aesctr_drbg.c b/third_party/bearssl/aesctr_drbg.c similarity index 100% rename from third_party/bearssl/src/aesctr_drbg.c rename to third_party/bearssl/aesctr_drbg.c diff --git a/third_party/bearssl/src/asn1enc.c b/third_party/bearssl/asn1enc.c similarity index 100% rename from third_party/bearssl/src/asn1enc.c rename to third_party/bearssl/asn1enc.c diff --git a/third_party/bearssl/inc/bearssl.h b/third_party/bearssl/bearssl.h similarity index 100% rename from third_party/bearssl/inc/bearssl.h rename to third_party/bearssl/bearssl.h diff --git a/third_party/bearssl/inc/bearssl_aead.h b/third_party/bearssl/bearssl_aead.h similarity index 100% rename from third_party/bearssl/inc/bearssl_aead.h rename to third_party/bearssl/bearssl_aead.h diff --git a/third_party/bearssl/inc/bearssl_block.h b/third_party/bearssl/bearssl_block.h similarity index 100% rename from third_party/bearssl/inc/bearssl_block.h rename to third_party/bearssl/bearssl_block.h diff --git a/third_party/bearssl/inc/bearssl_ec.h b/third_party/bearssl/bearssl_ec.h similarity index 100% rename from third_party/bearssl/inc/bearssl_ec.h rename to third_party/bearssl/bearssl_ec.h diff --git a/third_party/bearssl/inc/bearssl_hash.h b/third_party/bearssl/bearssl_hash.h similarity index 100% rename from third_party/bearssl/inc/bearssl_hash.h rename to third_party/bearssl/bearssl_hash.h diff --git a/third_party/bearssl/inc/bearssl_hmac.h b/third_party/bearssl/bearssl_hmac.h similarity index 100% rename from third_party/bearssl/inc/bearssl_hmac.h rename to third_party/bearssl/bearssl_hmac.h diff --git a/third_party/bearssl/inc/bearssl_prf.h b/third_party/bearssl/bearssl_prf.h similarity index 100% rename from third_party/bearssl/inc/bearssl_prf.h rename to third_party/bearssl/bearssl_prf.h diff --git a/third_party/bearssl/inc/bearssl_rand.h b/third_party/bearssl/bearssl_rand.h similarity index 100% rename from third_party/bearssl/inc/bearssl_rand.h rename to third_party/bearssl/bearssl_rand.h diff --git a/third_party/bearssl/inc/bearssl_rsa.h b/third_party/bearssl/bearssl_rsa.h similarity index 100% rename from third_party/bearssl/inc/bearssl_rsa.h rename to third_party/bearssl/bearssl_rsa.h diff --git a/third_party/bearssl/inc/bearssl_ssl.h b/third_party/bearssl/bearssl_ssl.h similarity index 100% rename from third_party/bearssl/inc/bearssl_ssl.h rename to third_party/bearssl/bearssl_ssl.h diff --git a/third_party/bearssl/inc/bearssl_x509.h b/third_party/bearssl/bearssl_x509.h similarity index 100% rename from third_party/bearssl/inc/bearssl_x509.h rename to third_party/bearssl/bearssl_x509.h diff --git a/third_party/bearssl/src/ccm.c b/third_party/bearssl/ccm.c similarity index 100% rename from third_party/bearssl/src/ccm.c rename to third_party/bearssl/ccm.c diff --git a/third_party/bearssl/src/ccopy.c b/third_party/bearssl/ccopy.c similarity index 100% rename from third_party/bearssl/src/ccopy.c rename to third_party/bearssl/ccopy.c diff --git a/third_party/bearssl/src/chacha20_ct.c b/third_party/bearssl/chacha20_ct.c similarity index 100% rename from third_party/bearssl/src/chacha20_ct.c rename to third_party/bearssl/chacha20_ct.c diff --git a/third_party/bearssl/src/chacha20_sse2.c b/third_party/bearssl/chacha20_sse2.c similarity index 100% rename from third_party/bearssl/src/chacha20_sse2.c rename to third_party/bearssl/chacha20_sse2.c diff --git a/third_party/bearssl/src/config.h b/third_party/bearssl/config.h similarity index 100% rename from third_party/bearssl/src/config.h rename to third_party/bearssl/config.h diff --git a/third_party/bearssl/src/dec32be.c b/third_party/bearssl/dec32be.c similarity index 100% rename from third_party/bearssl/src/dec32be.c rename to third_party/bearssl/dec32be.c diff --git a/third_party/bearssl/src/dec32le.c b/third_party/bearssl/dec32le.c similarity index 100% rename from third_party/bearssl/src/dec32le.c rename to third_party/bearssl/dec32le.c diff --git a/third_party/bearssl/src/dec64be.c b/third_party/bearssl/dec64be.c similarity index 100% rename from third_party/bearssl/src/dec64be.c rename to third_party/bearssl/dec64be.c diff --git a/third_party/bearssl/src/dec64le.c b/third_party/bearssl/dec64le.c similarity index 100% rename from third_party/bearssl/src/dec64le.c rename to third_party/bearssl/dec64le.c diff --git a/third_party/bearssl/src/dig_oid.c b/third_party/bearssl/dig_oid.c similarity index 100% rename from third_party/bearssl/src/dig_oid.c rename to third_party/bearssl/dig_oid.c diff --git a/third_party/bearssl/src/dig_size.c b/third_party/bearssl/dig_size.c similarity index 100% rename from third_party/bearssl/src/dig_size.c rename to third_party/bearssl/dig_size.c diff --git a/third_party/bearssl/src/ec_all_m31.c b/third_party/bearssl/ec_all_m31.c similarity index 100% rename from third_party/bearssl/src/ec_all_m31.c rename to third_party/bearssl/ec_all_m31.c diff --git a/third_party/bearssl/src/ec_c25519_i31.c b/third_party/bearssl/ec_c25519_i31.c similarity index 100% rename from third_party/bearssl/src/ec_c25519_i31.c rename to third_party/bearssl/ec_c25519_i31.c diff --git a/third_party/bearssl/src/ec_c25519_m31.c b/third_party/bearssl/ec_c25519_m31.c similarity index 100% rename from third_party/bearssl/src/ec_c25519_m31.c rename to third_party/bearssl/ec_c25519_m31.c diff --git a/third_party/bearssl/src/ec_c25519_m62.c b/third_party/bearssl/ec_c25519_m62.c similarity index 100% rename from third_party/bearssl/src/ec_c25519_m62.c rename to third_party/bearssl/ec_c25519_m62.c diff --git a/third_party/bearssl/src/ec_c25519_m64.c b/third_party/bearssl/ec_c25519_m64.c similarity index 100% rename from third_party/bearssl/src/ec_c25519_m64.c rename to third_party/bearssl/ec_c25519_m64.c diff --git a/third_party/bearssl/src/ec_curve25519.c b/third_party/bearssl/ec_curve25519.c similarity index 100% rename from third_party/bearssl/src/ec_curve25519.c rename to third_party/bearssl/ec_curve25519.c diff --git a/third_party/bearssl/src/ec_default.c b/third_party/bearssl/ec_default.c similarity index 100% rename from third_party/bearssl/src/ec_default.c rename to third_party/bearssl/ec_default.c diff --git a/third_party/bearssl/src/ec_p256_m31.c b/third_party/bearssl/ec_p256_m31.c similarity index 100% rename from third_party/bearssl/src/ec_p256_m31.c rename to third_party/bearssl/ec_p256_m31.c diff --git a/third_party/bearssl/src/ec_p256_m62.c b/third_party/bearssl/ec_p256_m62.c similarity index 100% rename from third_party/bearssl/src/ec_p256_m62.c rename to third_party/bearssl/ec_p256_m62.c diff --git a/third_party/bearssl/src/ec_p256_m64.c b/third_party/bearssl/ec_p256_m64.c similarity index 100% rename from third_party/bearssl/src/ec_p256_m64.c rename to third_party/bearssl/ec_p256_m64.c diff --git a/third_party/bearssl/src/ec_prime_i31.c b/third_party/bearssl/ec_prime_i31.c similarity index 100% rename from third_party/bearssl/src/ec_prime_i31.c rename to third_party/bearssl/ec_prime_i31.c diff --git a/third_party/bearssl/src/ec_secp256r1.c b/third_party/bearssl/ec_secp256r1.c similarity index 100% rename from third_party/bearssl/src/ec_secp256r1.c rename to third_party/bearssl/ec_secp256r1.c diff --git a/third_party/bearssl/src/ec_secp384r1.c b/third_party/bearssl/ec_secp384r1.c similarity index 100% rename from third_party/bearssl/src/ec_secp384r1.c rename to third_party/bearssl/ec_secp384r1.c diff --git a/third_party/bearssl/src/ec_secp521r1.c b/third_party/bearssl/ec_secp521r1.c similarity index 100% rename from third_party/bearssl/src/ec_secp521r1.c rename to third_party/bearssl/ec_secp521r1.c diff --git a/third_party/bearssl/src/ecdsa_atr.c b/third_party/bearssl/ecdsa_atr.c similarity index 100% rename from third_party/bearssl/src/ecdsa_atr.c rename to third_party/bearssl/ecdsa_atr.c diff --git a/third_party/bearssl/src/ecdsa_default_vrfy_asn1.c b/third_party/bearssl/ecdsa_default_vrfy_asn1.c similarity index 100% rename from third_party/bearssl/src/ecdsa_default_vrfy_asn1.c rename to third_party/bearssl/ecdsa_default_vrfy_asn1.c diff --git a/third_party/bearssl/src/ecdsa_default_vrfy_raw.c b/third_party/bearssl/ecdsa_default_vrfy_raw.c similarity index 100% rename from third_party/bearssl/src/ecdsa_default_vrfy_raw.c rename to third_party/bearssl/ecdsa_default_vrfy_raw.c diff --git a/third_party/bearssl/src/ecdsa_i31_bits.c b/third_party/bearssl/ecdsa_i31_bits.c similarity index 100% rename from third_party/bearssl/src/ecdsa_i31_bits.c rename to third_party/bearssl/ecdsa_i31_bits.c diff --git a/third_party/bearssl/src/ecdsa_i31_vrfy_asn1.c b/third_party/bearssl/ecdsa_i31_vrfy_asn1.c similarity index 100% rename from third_party/bearssl/src/ecdsa_i31_vrfy_asn1.c rename to third_party/bearssl/ecdsa_i31_vrfy_asn1.c diff --git a/third_party/bearssl/src/ecdsa_i31_vrfy_raw.c b/third_party/bearssl/ecdsa_i31_vrfy_raw.c similarity index 100% rename from third_party/bearssl/src/ecdsa_i31_vrfy_raw.c rename to third_party/bearssl/ecdsa_i31_vrfy_raw.c diff --git a/third_party/bearssl/src/enc32be.c b/third_party/bearssl/enc32be.c similarity index 100% rename from third_party/bearssl/src/enc32be.c rename to third_party/bearssl/enc32be.c diff --git a/third_party/bearssl/src/enc32le.c b/third_party/bearssl/enc32le.c similarity index 100% rename from third_party/bearssl/src/enc32le.c rename to third_party/bearssl/enc32le.c diff --git a/third_party/bearssl/src/enc64be.c b/third_party/bearssl/enc64be.c similarity index 100% rename from third_party/bearssl/src/enc64be.c rename to third_party/bearssl/enc64be.c diff --git a/third_party/bearssl/src/enc64le.c b/third_party/bearssl/enc64le.c similarity index 100% rename from third_party/bearssl/src/enc64le.c rename to third_party/bearssl/enc64le.c diff --git a/third_party/bearssl/src/gcm.c b/third_party/bearssl/gcm.c similarity index 100% rename from third_party/bearssl/src/gcm.c rename to third_party/bearssl/gcm.c diff --git a/third_party/bearssl/src/ghash_ctmul.c b/third_party/bearssl/ghash_ctmul.c similarity index 100% rename from third_party/bearssl/src/ghash_ctmul.c rename to third_party/bearssl/ghash_ctmul.c diff --git a/third_party/bearssl/src/ghash_ctmul64.c b/third_party/bearssl/ghash_ctmul64.c similarity index 100% rename from third_party/bearssl/src/ghash_ctmul64.c rename to third_party/bearssl/ghash_ctmul64.c diff --git a/third_party/bearssl/src/ghash_pclmul.c b/third_party/bearssl/ghash_pclmul.c similarity index 100% rename from third_party/bearssl/src/ghash_pclmul.c rename to third_party/bearssl/ghash_pclmul.c diff --git a/third_party/bearssl/src/hmac.c b/third_party/bearssl/hmac.c similarity index 100% rename from third_party/bearssl/src/hmac.c rename to third_party/bearssl/hmac.c diff --git a/third_party/bearssl/src/hmac_ct.c b/third_party/bearssl/hmac_ct.c similarity index 100% rename from third_party/bearssl/src/hmac_ct.c rename to third_party/bearssl/hmac_ct.c diff --git a/third_party/bearssl/src/hmac_drbg.c b/third_party/bearssl/hmac_drbg.c similarity index 100% rename from third_party/bearssl/src/hmac_drbg.c rename to third_party/bearssl/hmac_drbg.c diff --git a/third_party/bearssl/src/i31_add.c b/third_party/bearssl/i31_add.c similarity index 100% rename from third_party/bearssl/src/i31_add.c rename to third_party/bearssl/i31_add.c diff --git a/third_party/bearssl/src/i31_bitlen.c b/third_party/bearssl/i31_bitlen.c similarity index 100% rename from third_party/bearssl/src/i31_bitlen.c rename to third_party/bearssl/i31_bitlen.c diff --git a/third_party/bearssl/src/i31_decmod.c b/third_party/bearssl/i31_decmod.c similarity index 100% rename from third_party/bearssl/src/i31_decmod.c rename to third_party/bearssl/i31_decmod.c diff --git a/third_party/bearssl/src/i31_decode.c b/third_party/bearssl/i31_decode.c similarity index 100% rename from third_party/bearssl/src/i31_decode.c rename to third_party/bearssl/i31_decode.c diff --git a/third_party/bearssl/src/i31_decred.c b/third_party/bearssl/i31_decred.c similarity index 100% rename from third_party/bearssl/src/i31_decred.c rename to third_party/bearssl/i31_decred.c diff --git a/third_party/bearssl/src/i31_encode.c b/third_party/bearssl/i31_encode.c similarity index 100% rename from third_party/bearssl/src/i31_encode.c rename to third_party/bearssl/i31_encode.c diff --git a/third_party/bearssl/src/i31_fmont.c b/third_party/bearssl/i31_fmont.c similarity index 100% rename from third_party/bearssl/src/i31_fmont.c rename to third_party/bearssl/i31_fmont.c diff --git a/third_party/bearssl/src/i31_iszero.c b/third_party/bearssl/i31_iszero.c similarity index 100% rename from third_party/bearssl/src/i31_iszero.c rename to third_party/bearssl/i31_iszero.c diff --git a/third_party/bearssl/src/i31_moddiv.c b/third_party/bearssl/i31_moddiv.c similarity index 100% rename from third_party/bearssl/src/i31_moddiv.c rename to third_party/bearssl/i31_moddiv.c diff --git a/third_party/bearssl/src/i31_modpow.c b/third_party/bearssl/i31_modpow.c similarity index 100% rename from third_party/bearssl/src/i31_modpow.c rename to third_party/bearssl/i31_modpow.c diff --git a/third_party/bearssl/src/i31_modpow2.c b/third_party/bearssl/i31_modpow2.c similarity index 100% rename from third_party/bearssl/src/i31_modpow2.c rename to third_party/bearssl/i31_modpow2.c diff --git a/third_party/bearssl/src/i31_montmul.c b/third_party/bearssl/i31_montmul.c similarity index 100% rename from third_party/bearssl/src/i31_montmul.c rename to third_party/bearssl/i31_montmul.c diff --git a/third_party/bearssl/src/i31_mulacc.c b/third_party/bearssl/i31_mulacc.c similarity index 100% rename from third_party/bearssl/src/i31_mulacc.c rename to third_party/bearssl/i31_mulacc.c diff --git a/third_party/bearssl/src/i31_muladd.c b/third_party/bearssl/i31_muladd.c similarity index 100% rename from third_party/bearssl/src/i31_muladd.c rename to third_party/bearssl/i31_muladd.c diff --git a/third_party/bearssl/src/i31_ninv31.c b/third_party/bearssl/i31_ninv31.c similarity index 100% rename from third_party/bearssl/src/i31_ninv31.c rename to third_party/bearssl/i31_ninv31.c diff --git a/third_party/bearssl/src/i31_reduce.c b/third_party/bearssl/i31_reduce.c similarity index 100% rename from third_party/bearssl/src/i31_reduce.c rename to third_party/bearssl/i31_reduce.c diff --git a/third_party/bearssl/src/i31_rshift.c b/third_party/bearssl/i31_rshift.c similarity index 100% rename from third_party/bearssl/src/i31_rshift.c rename to third_party/bearssl/i31_rshift.c diff --git a/third_party/bearssl/src/i31_sub.c b/third_party/bearssl/i31_sub.c similarity index 100% rename from third_party/bearssl/src/i31_sub.c rename to third_party/bearssl/i31_sub.c diff --git a/third_party/bearssl/src/i31_tmont.c b/third_party/bearssl/i31_tmont.c similarity index 100% rename from third_party/bearssl/src/i31_tmont.c rename to third_party/bearssl/i31_tmont.c diff --git a/third_party/bearssl/src/i32_div32.c b/third_party/bearssl/i32_div32.c similarity index 100% rename from third_party/bearssl/src/i32_div32.c rename to third_party/bearssl/i32_div32.c diff --git a/third_party/bearssl/src/i62_modpow2.c b/third_party/bearssl/i62_modpow2.c similarity index 100% rename from third_party/bearssl/src/i62_modpow2.c rename to third_party/bearssl/i62_modpow2.c diff --git a/third_party/bearssl/src/inner.h b/third_party/bearssl/inner.h similarity index 100% rename from third_party/bearssl/src/inner.h rename to third_party/bearssl/inner.h diff --git a/third_party/bearssl/src/md5.c b/third_party/bearssl/md5.c similarity index 100% rename from third_party/bearssl/src/md5.c rename to third_party/bearssl/md5.c diff --git a/third_party/bearssl/src/md5sha1.c b/third_party/bearssl/md5sha1.c similarity index 100% rename from third_party/bearssl/src/md5sha1.c rename to third_party/bearssl/md5sha1.c diff --git a/third_party/bearssl/src/multihash.c b/third_party/bearssl/multihash.c similarity index 100% rename from third_party/bearssl/src/multihash.c rename to third_party/bearssl/multihash.c diff --git a/third_party/bearssl/src/poly1305_ctmul.c b/third_party/bearssl/poly1305_ctmul.c similarity index 100% rename from third_party/bearssl/src/poly1305_ctmul.c rename to third_party/bearssl/poly1305_ctmul.c diff --git a/third_party/bearssl/src/poly1305_ctmulq.c b/third_party/bearssl/poly1305_ctmulq.c similarity index 100% rename from third_party/bearssl/src/poly1305_ctmulq.c rename to third_party/bearssl/poly1305_ctmulq.c diff --git a/third_party/bearssl/src/prf.c b/third_party/bearssl/prf.c similarity index 100% rename from third_party/bearssl/src/prf.c rename to third_party/bearssl/prf.c diff --git a/third_party/bearssl/src/prf_md5sha1.c b/third_party/bearssl/prf_md5sha1.c similarity index 100% rename from third_party/bearssl/src/prf_md5sha1.c rename to third_party/bearssl/prf_md5sha1.c diff --git a/third_party/bearssl/src/prf_sha256.c b/third_party/bearssl/prf_sha256.c similarity index 100% rename from third_party/bearssl/src/prf_sha256.c rename to third_party/bearssl/prf_sha256.c diff --git a/third_party/bearssl/src/prf_sha384.c b/third_party/bearssl/prf_sha384.c similarity index 100% rename from third_party/bearssl/src/prf_sha384.c rename to third_party/bearssl/prf_sha384.c diff --git a/third_party/bearssl/src/rsa_default_pkcs1_vrfy.c b/third_party/bearssl/rsa_default_pkcs1_vrfy.c similarity index 100% rename from third_party/bearssl/src/rsa_default_pkcs1_vrfy.c rename to third_party/bearssl/rsa_default_pkcs1_vrfy.c diff --git a/third_party/bearssl/src/rsa_default_priv.c b/third_party/bearssl/rsa_default_priv.c similarity index 100% rename from third_party/bearssl/src/rsa_default_priv.c rename to third_party/bearssl/rsa_default_priv.c diff --git a/third_party/bearssl/src/rsa_default_pub.c b/third_party/bearssl/rsa_default_pub.c similarity index 100% rename from third_party/bearssl/src/rsa_default_pub.c rename to third_party/bearssl/rsa_default_pub.c diff --git a/third_party/bearssl/src/rsa_i31_pkcs1_vrfy.c b/third_party/bearssl/rsa_i31_pkcs1_vrfy.c similarity index 100% rename from third_party/bearssl/src/rsa_i31_pkcs1_vrfy.c rename to third_party/bearssl/rsa_i31_pkcs1_vrfy.c diff --git a/third_party/bearssl/src/rsa_i31_priv.c b/third_party/bearssl/rsa_i31_priv.c similarity index 100% rename from third_party/bearssl/src/rsa_i31_priv.c rename to third_party/bearssl/rsa_i31_priv.c diff --git a/third_party/bearssl/src/rsa_i31_pub.c b/third_party/bearssl/rsa_i31_pub.c similarity index 100% rename from third_party/bearssl/src/rsa_i31_pub.c rename to third_party/bearssl/rsa_i31_pub.c diff --git a/third_party/bearssl/src/rsa_i62_pkcs1_vrfy.c b/third_party/bearssl/rsa_i62_pkcs1_vrfy.c similarity index 100% rename from third_party/bearssl/src/rsa_i62_pkcs1_vrfy.c rename to third_party/bearssl/rsa_i62_pkcs1_vrfy.c diff --git a/third_party/bearssl/src/rsa_i62_priv.c b/third_party/bearssl/rsa_i62_priv.c similarity index 100% rename from third_party/bearssl/src/rsa_i62_priv.c rename to third_party/bearssl/rsa_i62_priv.c diff --git a/third_party/bearssl/src/rsa_i62_pub.c b/third_party/bearssl/rsa_i62_pub.c similarity index 100% rename from third_party/bearssl/src/rsa_i62_pub.c rename to third_party/bearssl/rsa_i62_pub.c diff --git a/third_party/bearssl/src/rsa_pkcs1_sig_unpad.c b/third_party/bearssl/rsa_pkcs1_sig_unpad.c similarity index 100% rename from third_party/bearssl/src/rsa_pkcs1_sig_unpad.c rename to third_party/bearssl/rsa_pkcs1_sig_unpad.c diff --git a/third_party/bearssl/src/sha1.c b/third_party/bearssl/sha1.c similarity index 100% rename from third_party/bearssl/src/sha1.c rename to third_party/bearssl/sha1.c diff --git a/third_party/bearssl/src/sha2big.c b/third_party/bearssl/sha2big.c similarity index 100% rename from third_party/bearssl/src/sha2big.c rename to third_party/bearssl/sha2big.c diff --git a/third_party/bearssl/src/sha2small.c b/third_party/bearssl/sha2small.c similarity index 100% rename from third_party/bearssl/src/sha2small.c rename to third_party/bearssl/sha2small.c diff --git a/third_party/bearssl/src/ssl_client.c b/third_party/bearssl/ssl_client.c similarity index 100% rename from third_party/bearssl/src/ssl_client.c rename to third_party/bearssl/ssl_client.c diff --git a/third_party/bearssl/src/ssl_client_default_rsapub.c b/third_party/bearssl/ssl_client_default_rsapub.c similarity index 100% rename from third_party/bearssl/src/ssl_client_default_rsapub.c rename to third_party/bearssl/ssl_client_default_rsapub.c diff --git a/third_party/bearssl/src/ssl_client_full.c b/third_party/bearssl/ssl_client_full.c similarity index 100% rename from third_party/bearssl/src/ssl_client_full.c rename to third_party/bearssl/ssl_client_full.c diff --git a/third_party/bearssl/src/ssl_engine.c b/third_party/bearssl/ssl_engine.c similarity index 100% rename from third_party/bearssl/src/ssl_engine.c rename to third_party/bearssl/ssl_engine.c diff --git a/third_party/bearssl/src/ssl_engine_default_aescbc.c b/third_party/bearssl/ssl_engine_default_aescbc.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_aescbc.c rename to third_party/bearssl/ssl_engine_default_aescbc.c diff --git a/third_party/bearssl/src/ssl_engine_default_aesccm.c b/third_party/bearssl/ssl_engine_default_aesccm.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_aesccm.c rename to third_party/bearssl/ssl_engine_default_aesccm.c diff --git a/third_party/bearssl/src/ssl_engine_default_aesgcm.c b/third_party/bearssl/ssl_engine_default_aesgcm.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_aesgcm.c rename to third_party/bearssl/ssl_engine_default_aesgcm.c diff --git a/third_party/bearssl/src/ssl_engine_default_chapol.c b/third_party/bearssl/ssl_engine_default_chapol.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_chapol.c rename to third_party/bearssl/ssl_engine_default_chapol.c diff --git a/third_party/bearssl/src/ssl_engine_default_ec.c b/third_party/bearssl/ssl_engine_default_ec.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_ec.c rename to third_party/bearssl/ssl_engine_default_ec.c diff --git a/third_party/bearssl/src/ssl_engine_default_ecdsa.c b/third_party/bearssl/ssl_engine_default_ecdsa.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_ecdsa.c rename to third_party/bearssl/ssl_engine_default_ecdsa.c diff --git a/third_party/bearssl/src/ssl_engine_default_rsavrfy.c b/third_party/bearssl/ssl_engine_default_rsavrfy.c similarity index 100% rename from third_party/bearssl/src/ssl_engine_default_rsavrfy.c rename to third_party/bearssl/ssl_engine_default_rsavrfy.c diff --git a/third_party/bearssl/src/ssl_hashes.c b/third_party/bearssl/ssl_hashes.c similarity index 100% rename from third_party/bearssl/src/ssl_hashes.c rename to third_party/bearssl/ssl_hashes.c diff --git a/third_party/bearssl/src/ssl_hs_client.c b/third_party/bearssl/ssl_hs_client.c similarity index 100% rename from third_party/bearssl/src/ssl_hs_client.c rename to third_party/bearssl/ssl_hs_client.c diff --git a/third_party/bearssl/src/ssl_io.c b/third_party/bearssl/ssl_io.c similarity index 100% rename from third_party/bearssl/src/ssl_io.c rename to third_party/bearssl/ssl_io.c diff --git a/third_party/bearssl/src/ssl_rec_cbc.c b/third_party/bearssl/ssl_rec_cbc.c similarity index 100% rename from third_party/bearssl/src/ssl_rec_cbc.c rename to third_party/bearssl/ssl_rec_cbc.c diff --git a/third_party/bearssl/src/ssl_rec_ccm.c b/third_party/bearssl/ssl_rec_ccm.c similarity index 100% rename from third_party/bearssl/src/ssl_rec_ccm.c rename to third_party/bearssl/ssl_rec_ccm.c diff --git a/third_party/bearssl/src/ssl_rec_chapol.c b/third_party/bearssl/ssl_rec_chapol.c similarity index 100% rename from third_party/bearssl/src/ssl_rec_chapol.c rename to third_party/bearssl/ssl_rec_chapol.c diff --git a/third_party/bearssl/src/ssl_rec_gcm.c b/third_party/bearssl/ssl_rec_gcm.c similarity index 100% rename from third_party/bearssl/src/ssl_rec_gcm.c rename to third_party/bearssl/ssl_rec_gcm.c diff --git a/third_party/bearssl/src/x509_minimal.c b/third_party/bearssl/x509_minimal.c similarity index 100% rename from third_party/bearssl/src/x509_minimal.c rename to third_party/bearssl/x509_minimal.c diff --git a/third_party/bearssl/src/x509_minimal_full.c b/third_party/bearssl/x509_minimal_full.c similarity index 100% rename from third_party/bearssl/src/x509_minimal_full.c rename to third_party/bearssl/x509_minimal_full.c