Skip to content

Commit 051c7d3

Browse files
committed
Build: Update mbedtls to 3.6.5
1 parent c2f49a6 commit 051c7d3

2 files changed

Lines changed: 20 additions & 15 deletions

File tree

library/CMakeLists.txt

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -325,19 +325,22 @@ target_include_directories(zstd
325325
PRIVATE
326326
src/main/jni/external/zstd/lib/common)
327327

328-
# https://github.com/Mbed-TLS/mbedtls/blob/v2.28.4/CMakeLists.txt
329-
# https://github.com/Mbed-TLS/mbedtls/blob/v2.28.4/library/CMakeLists.txt
328+
# https://github.com/Mbed-TLS/mbedtls/blob/v3.6.5/CMakeLists.txt
329+
# https://github.com/Mbed-TLS/mbedtls/blob/v3.6.5/library/CMakeLists.txt
330330
add_library(mbedcrypto STATIC
331331
# src_crypto
332332
src/main/jni/external/mbedtls/library/aes.c
333333
src/main/jni/external/mbedtls/library/aesni.c
334-
src/main/jni/external/mbedtls/library/arc4.c
334+
src/main/jni/external/mbedtls/library/aesce.c
335335
src/main/jni/external/mbedtls/library/aria.c
336336
src/main/jni/external/mbedtls/library/asn1parse.c
337337
src/main/jni/external/mbedtls/library/asn1write.c
338338
src/main/jni/external/mbedtls/library/base64.c
339339
src/main/jni/external/mbedtls/library/bignum.c
340-
src/main/jni/external/mbedtls/library/blowfish.c
340+
src/main/jni/external/mbedtls/library/bignum_core.c
341+
src/main/jni/external/mbedtls/library/bignum_mod.c
342+
src/main/jni/external/mbedtls/library/bignum_mod_raw.c
343+
src/main/jni/external/mbedtls/library/block_cipher.c
341344
src/main/jni/external/mbedtls/library/camellia.c
342345
src/main/jni/external/mbedtls/library/ccm.c
343346
src/main/jni/external/mbedtls/library/chacha20.c
@@ -354,25 +357,24 @@ add_library(mbedcrypto STATIC
354357
src/main/jni/external/mbedtls/library/ecjpake.c
355358
src/main/jni/external/mbedtls/library/ecp.c
356359
src/main/jni/external/mbedtls/library/ecp_curves.c
360+
src/main/jni/external/mbedtls/library/ecp_curves_new.c
357361
src/main/jni/external/mbedtls/library/entropy.c
358362
src/main/jni/external/mbedtls/library/entropy_poll.c
359363
src/main/jni/external/mbedtls/library/error.c
360364
src/main/jni/external/mbedtls/library/gcm.c
361-
src/main/jni/external/mbedtls/library/havege.c
362365
src/main/jni/external/mbedtls/library/hkdf.c
363366
src/main/jni/external/mbedtls/library/hmac_drbg.c
367+
src/main/jni/external/mbedtls/library/lmots.c
368+
src/main/jni/external/mbedtls/library/lms.c
364369
src/main/jni/external/mbedtls/library/md.c
365-
src/main/jni/external/mbedtls/library/md2.c
366-
src/main/jni/external/mbedtls/library/md4.c
367370
src/main/jni/external/mbedtls/library/md5.c
368371
src/main/jni/external/mbedtls/library/memory_buffer_alloc.c
369-
src/main/jni/external/mbedtls/library/mps_reader.c
370-
src/main/jni/external/mbedtls/library/mps_trace.c
371372
src/main/jni/external/mbedtls/library/nist_kw.c
372373
src/main/jni/external/mbedtls/library/oid.c
373374
src/main/jni/external/mbedtls/library/padlock.c
374375
src/main/jni/external/mbedtls/library/pem.c
375376
src/main/jni/external/mbedtls/library/pk.c
377+
src/main/jni/external/mbedtls/library/pk_ecc.c
376378
src/main/jni/external/mbedtls/library/pk_wrap.c
377379
src/main/jni/external/mbedtls/library/pkcs12.c
378380
src/main/jni/external/mbedtls/library/pkcs5.c
@@ -385,31 +387,35 @@ add_library(mbedcrypto STATIC
385387
src/main/jni/external/mbedtls/library/psa_crypto_aead.c
386388
src/main/jni/external/mbedtls/library/psa_crypto_cipher.c
387389
src/main/jni/external/mbedtls/library/psa_crypto_client.c
388-
src/main/jni/external/mbedtls/library/psa_crypto_driver_wrappers.c
390+
src/main/jni/external/mbedtls/library/psa_crypto_driver_wrappers_no_static.c
389391
src/main/jni/external/mbedtls/library/psa_crypto_ecp.c
392+
src/main/jni/external/mbedtls/library/psa_crypto_ffdh.c
390393
src/main/jni/external/mbedtls/library/psa_crypto_hash.c
391394
src/main/jni/external/mbedtls/library/psa_crypto_mac.c
395+
src/main/jni/external/mbedtls/library/psa_crypto_pake.c
392396
src/main/jni/external/mbedtls/library/psa_crypto_rsa.c
393397
src/main/jni/external/mbedtls/library/psa_crypto_se.c
394398
src/main/jni/external/mbedtls/library/psa_crypto_slot_management.c
395399
src/main/jni/external/mbedtls/library/psa_crypto_storage.c
396400
src/main/jni/external/mbedtls/library/psa_its_file.c
401+
src/main/jni/external/mbedtls/library/psa_util.c
397402
src/main/jni/external/mbedtls/library/ripemd160.c
398403
src/main/jni/external/mbedtls/library/rsa.c
399-
src/main/jni/external/mbedtls/library/rsa_internal.c
404+
src/main/jni/external/mbedtls/library/rsa_alt_helpers.c
400405
src/main/jni/external/mbedtls/library/sha1.c
401406
src/main/jni/external/mbedtls/library/sha256.c
402407
src/main/jni/external/mbedtls/library/sha512.c
408+
src/main/jni/external/mbedtls/library/sha3.c
403409
src/main/jni/external/mbedtls/library/threading.c
404410
src/main/jni/external/mbedtls/library/timing.c
405411
src/main/jni/external/mbedtls/library/version.c
406-
src/main/jni/external/mbedtls/library/version_features.c
407-
src/main/jni/external/mbedtls/library/xtea.c)
412+
src/main/jni/external/mbedtls/library/version_features.c)
408413
target_compile_options(mbedcrypto
409414
PRIVATE
410415
-Wall
411416
-Wextra
412417
-Wwrite-strings
418+
-Wmissing-prototypes
413419
-Wpointer-arith
414420
-Wimplicit-fallthrough
415421
-Wshadow
@@ -418,7 +424,6 @@ target_compile_options(mbedcrypto
418424
-Wno-format-nonliteral
419425
-Werror
420426
-Wmissing-declarations
421-
-Wmissing-prototypes
422427
-Wdocumentation
423428
-Wno-documentation-deprecated-sync
424429
-Wunreachable-code)
Submodule mbedtls updated 1598 files

0 commit comments

Comments
 (0)