Merge branch 'master' into ENGINE-953

buildcode/sequoia.code

@@ -10,13 +10,10 @@ if [ ! -d "${SEQUOIA_DIR}" ]; then
     git clone -b ${VERSION} --depth 1 https://gitlab.com/sequoia-pgp/sequoia.git
 fi
 
-NETTLE_BINDINGS="${SCRIPT_DIR}/buildcode/sequoia_resources/nettle-bindings.rs"
 build_ios()
 {
-#TODO: change according to build_macos. Nightly and pregenerated bindings might not be required any more 
     cargo update
-    rustup run nightly cargo update
-    NETTLE_PREGENERATED_BINDINGS="${NETTLE_BINDINGS}" PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$OUTPUT_DIR/${ARCH}/lib/pkgconfig RUSTFLAGS="-L ${PREFIX}/lib" rustup run nightly cargo build --target ${TARGET} -p sequoia-openpgp-ffi --release -Z build-std=core,alloc,std
+    PKG_CONFIG_ALLOW_CROSS=1 RUST_BACKTRACE=1 PKG_CONFIG_PATH=$OUTPUT_DIR/${ARCH}/lib/pkgconfig RUSTFLAGS="-L ${PREFIX}/lib" cargo build --target ${TARGET} -p sequoia-openpgp-ffi --release
     # copy artefacts
     cp "${SEQUOIA_DIR}/target/${TARGET}/release"/*.a "${CURRENT_LIB_DIR}/lib"
 }