New upstream

bibledit/cloud#944

gradle/app/src/main/assets/asset.external

@@ -282,6 +282,8 @@ locale/id.po
 locale/bibledit.pot
 locale/af.po
 locale/pt.po
+bootstrap/loading.css
+bootstrap/loading.html
 bb/order.html
 bb/css.html
 bb/manage.html
@@ -364,7 +366,6 @@ utf8proc/LICENSE.md
 utf8proc/NEWS.md
 utf8proc/MANIFEST
 utf8proc/README.md
-mbedtls/Makefile
 mbedtls/0readme.txt
 nicedit/nicedit.js
 nicedit/nicEditorIcons.gif
@@ -452,6 +453,8 @@ dialog/yes.html
 dialog/upload.html
 dialog/color.html
 dialog/entry.html
+mbedtls_2.x/Makefile
+mbedtls_2.x/0readme.txt
 edit/preview.html
 edit/index.html
 edit/keys.js
@@ -531,9 +534,9 @@ microtar/readme.txt
 consultations/gitflag
 .github/workflows/build.yml
 pkgdata/files.txt
-pkgdata/.!16152!files.txt
 pkgdata/install.sh
 pkgdata/create.sh
+pkgdata/.!72340!files.txt
 book/books.js
 compare/index.html
 sources/etcbc4.txt
@@ -567,19 +570,13 @@ pugixml/pugixml.hpp
 pugixml/00readme.txt
 pugixml/readme.txt
 revisions/gitflag
-build/Makefile
-build/stamp-h1
-build/config.status
-build/config.log
-build/confyLGTNU/subs1.awk
-build/confyLGTNU/defines.awk
-build/confyLGTNU/subs.awk
 filter/cas.crt
 filter/passage.js
 filter/focus.js
 filter/usfm.js
 filter/string.hpp
 filter/url.js
+filter/UriCodec.hpp
 slip/slip.js
 slip/example.html
 slip/readme.txt

gradle/app/src/main/assets/external/.gitignore

@@ -19,3 +19,5 @@ server
 *.in~
 *.tar.gz
 configure~
+libbibledit.a.*
+

gradle/app/src/main/assets/external/Makefile.am

@@ -359,73 +359,114 @@ libbibledit_a_SOURCES = \
 	public/comment.cpp \
 	utf8proc/utf8proc.c \
 	search/logic.cpp \
-	mbedtls/aes.c \
-	mbedtls/arc4.c \
-	mbedtls/asn1parse.c \
-	mbedtls/asn1write.c \
-	mbedtls/base64.c \
-	mbedtls/bignum.c \
-	mbedtls/blowfish.c \
-	mbedtls/camellia.c \
-	mbedtls/ccm.c \
-	mbedtls/certs.c \
-	mbedtls/chacha20.c \
-	mbedtls/chachapoly.c \
-	mbedtls/cipher.c \
-	mbedtls/cipher_wrap.c \
-	mbedtls/ctr_drbg.c \
-	mbedtls/debug.c \
-	mbedtls/des.c \
-	mbedtls/dhm.c \
-	mbedtls/ecdh.c \
-	mbedtls/ecdsa.c \
-	mbedtls/ecp.c \
-	mbedtls/ecp_curves.c \
-	mbedtls/entropy.c \
-	mbedtls/entropy_poll.c \
-	mbedtls/error.c \
-	mbedtls/gcm.c \
-	mbedtls/hmac_drbg.c \
-	mbedtls/md.c \
-	mbedtls/md5.c \
-	mbedtls/md_wrap.c \
-	mbedtls/net_sockets.c \
-	mbedtls/oid.c \
-	mbedtls/pem.c \
-	mbedtls/pk.c \
-	mbedtls/pk_wrap.c \
-	mbedtls/pkcs12.c \
-	mbedtls/pkcs5.c \
-	mbedtls/pkparse.c \
-	mbedtls/pkwrite.c \
-	mbedtls/platform_util.c \
-	mbedtls/platform.c \
-	mbedtls/poly1305.c \
-	mbedtls/ripemd160.c \
-	mbedtls/rsa.c \
-	mbedtls/rsa_internal.c \
-	mbedtls/sha1.c \
-	mbedtls/sha256.c \
-	mbedtls/sha512.c \
-	mbedtls/ssl_cache.c \
-	mbedtls/ssl_ciphersuites.c \
-	mbedtls/ssl_cli.c \
-	mbedtls/ssl_cookie.c \
-	mbedtls/ssl_srv.c \
-	mbedtls/ssl_ticket.c \
-	mbedtls/ssl_tls.c \
-	mbedtls/threading.c \
-	mbedtls/timing.c \
-	mbedtls/version.c \
-	mbedtls/version_features.c \
-	mbedtls/x509.c \
-	mbedtls/x509_create.c \
-	mbedtls/x509_crl.c \
-	mbedtls/x509_crt.c \
-	mbedtls/x509_csr.c \
-	mbedtls/x509write_crt.c \
-	mbedtls/x509write_csr.c \
-	mbedtls/xtea.c \
+  mbedtls/aes.c \
+  mbedtls/aesce.c \
+  mbedtls/aesni.c \
+  mbedtls/aria.c \
+  mbedtls/asn1parse.c \
+  mbedtls/asn1write.c \
+  mbedtls/base64.c \
+  mbedtls/bignum.c \
+  mbedtls/bignum_core.c \
+  mbedtls/bignum_mod.c \
+  mbedtls/bignum_mod_raw.c \
+  mbedtls/block_cipher.c \
+  mbedtls/camellia.c \
+  mbedtls/ccm.c \
+  mbedtls/chacha20.c \
+  mbedtls/chachapoly.c \
+  mbedtls/cipher.c \
+  mbedtls/cipher_wrap.c \
+  mbedtls/cmac.c \
+  mbedtls/constant_time.c \
+  mbedtls/ctr_drbg.c \
+  mbedtls/debug.c \
+  mbedtls/des.c \
+  mbedtls/dhm.c \
+  mbedtls/ecdh.c \
+  mbedtls/ecdsa.c \
+  mbedtls/ecjpake.c \
+  mbedtls/ecp.c \
+  mbedtls/ecp_curves.c \
+  mbedtls/ecp_curves_new.c \
+  mbedtls/entropy.c \
+  mbedtls/entropy_poll.c \
+  mbedtls/error.c \
+  mbedtls/gcm.c \
+  mbedtls/hkdf.c \
+  mbedtls/hmac_drbg.c \
+  mbedtls/lmots.c \
+  mbedtls/lms.c \
+  mbedtls/md.c \
+  mbedtls/md5.c \
+  mbedtls/memory_buffer_alloc.c \
+  mbedtls/mps_reader.c \
+  mbedtls/mps_trace.c \
+  mbedtls/net_sockets.c \
+  mbedtls/nist_kw.c \
+  mbedtls/oid.c \
+  mbedtls/padlock.c \
+  mbedtls/pem.c \
+  mbedtls/pk.c \
+  mbedtls/pk_ecc.c \
+  mbedtls/pk_wrap.c \
+  mbedtls/pkcs12.c \
+  mbedtls/pkcs5.c \
+  mbedtls/pkcs7.c \
+  mbedtls/pkparse.c \
+  mbedtls/pkwrite.c \
+  mbedtls/platform.c \
+  mbedtls/platform_util.c \
+  mbedtls/poly1305.c \
+  mbedtls/psa_crypto.c \
+  mbedtls/psa_crypto_aead.c \
+  mbedtls/psa_crypto_cipher.c \
+  mbedtls/psa_crypto_client.c \
+  mbedtls/psa_crypto_driver_wrappers_no_static.c \
+  mbedtls/psa_crypto_ecp.c \
+  mbedtls/psa_crypto_ffdh.c \
+  mbedtls/psa_crypto_hash.c \
+  mbedtls/psa_crypto_mac.c \
+  mbedtls/psa_crypto_pake.c \
+  mbedtls/psa_crypto_rsa.c \
+  mbedtls/psa_crypto_se.c \
+  mbedtls/psa_crypto_slot_management.c \
+  mbedtls/psa_crypto_storage.c \
+  mbedtls/psa_its_file.c \
+  mbedtls/psa_util.c \
+  mbedtls/ripemd160.c \
+  mbedtls/rsa.c \
+  mbedtls/rsa_alt_helpers.c \
+  mbedtls/sha1.c \
+  mbedtls/sha256.c \
+  mbedtls/sha3.c \
+  mbedtls/sha512.c \
+  mbedtls/ssl_cache.c \
+  mbedtls/ssl_ciphersuites.c \
+  mbedtls/ssl_client.c \
+  mbedtls/ssl_cookie.c \
+  mbedtls/ssl_debug_helpers_generated.c \
+  mbedtls/ssl_msg.c \
+  mbedtls/ssl_ticket.c \
+  mbedtls/ssl_tls.c \
+  mbedtls/ssl_tls12_client.c \
+  mbedtls/ssl_tls12_server.c \
+  mbedtls/ssl_tls13_client.c \
+  mbedtls/ssl_tls13_generic.c \
+  mbedtls/ssl_tls13_keys.c \
+  mbedtls/ssl_tls13_server.c \
+  mbedtls/threading.c \
+  mbedtls/timing.c \
+  mbedtls/version.c \
+  mbedtls/version_features.c \
+  mbedtls/x509.c \
+  mbedtls/x509_create.c \
+  mbedtls/x509_crl.c \
+  mbedtls/x509_crt.c \
+  mbedtls/x509_csr.c \
+  mbedtls/x509write.c \
+  mbedtls/x509write_crt.c \
+  mbedtls/x509write_csr.c \
 	related/logic.cpp \
 	sqlite/sqlite3.c \
 	ldap/logic.cpp \