randombit · huven · Sep 12, 2025 · Oct 19, 2025 · Oct 20, 2025 · Oct 20, 2025
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,20 +115,26 @@ jobs:
 
       matrix:
         include:
+        # - target: shared
+        #   compiler: xcode
+        #   os: macos-13 # x86
+        # - target: amalgamation
+        #   compiler: xcode
+        #   os: macos-13 # x86
+        #   make_tool: ninja
+        # - target: shared
+        #   compiler: xcode
+        #   os: macos-14
+        #   make_tool: ninja
+        # - target: amalgamation
+        #   compiler: xcode
+        #   os: macos-14
           - target: shared
             compiler: xcode
-            os: macos-13
+            os: macos-26
           - target: amalgamation
             compiler: xcode
-            os: macos-13
-            make_tool: ninja
-          - target: shared
-            compiler: xcode
-            os: macos-14 # uses Apple Silicon
-            make_tool: ninja
-          - target: amalgamation
-            compiler: xcode
-            os: macos-14 # uses Apple Silicon
+            os: macos-26
 
     runs-on: ${{ matrix.os }}
 
@@ -330,7 +336,7 @@ jobs:
             make_tool: make
           - target: cross-ios-arm64
             compiler: xcode
-            host_os: macos-13
+            host_os: macos-26
           - target: cross-arm32-baremetal
             compiler: gcc
             host_os: ubuntu-24.04

diff --git a/src/configs/repo_config.env b/src/configs/repo_config.env
@@ -19,7 +19,7 @@ BORINGSSL_REPO="randombit/boringssl"
 BORINGSSL_BRANCH="rene/runner-20241016"
 
 # The Android NDK to for the cross platform builds to Android
-ANDROID_NDK="android-ndk-r28"
+ANDROID_NDK="android-ndk-r29"
 
 # Jitterentropy library version to be used for testing the 'jitter_rng' module
 JITTERENTROPY_VERSION="3.6.2"

diff --git a/src/lib/pbkdf/argon2/argon2.cpp b/src/lib/pbkdf/argon2/argon2.cpp
@@ -279,7 +279,8 @@ void process_block(secure_vector<uint64_t>& B,
                    size_t threads,
                    uint8_t mode,
                    size_t memory,
-                   size_t time) {
+                   size_t time,
+                   const std::optional<std::stop_token>& stop_token) {
    uint64_t T[128];
    size_t index = 0;
    if(n == 0 && slice == 0) {
@@ -296,6 +297,9 @@ void process_block(secure_vector<uint64_t>& B,
    }
 
    while(index < segments) {
+      if ((index & 63) == 0 && stop_token.has_value() && stop_token->stop_requested())
+         throw Botan::Invalid_State("Cancelled");
+
       const size_t offset = lane * lanes + slice * segments + index;
 
       size_t prev = offset - 1;
@@ -326,7 +330,7 @@ void process_block(secure_vector<uint64_t>& B,
    }
 }
 
-void process_blocks(secure_vector<uint64_t>& B, size_t t, size_t memory, size_t threads, uint8_t mode) {
+void process_blocks(secure_vector<uint64_t>& B, size_t t, size_t memory, size_t threads, uint8_t mode, const std::optional<std::stop_token>& stop_token) {
    const size_t lanes = memory / threads;
    const size_t segments = lanes / SYNC_POINTS;
 
@@ -341,7 +345,7 @@ void process_blocks(secure_vector<uint64_t>& B, size_t t, size_t memory, size_t
 
             for(size_t lane = 0; lane != threads; ++lane) {
                fut_results.push_back(thread_pool.run(
-                  process_block, std::ref(B), n, slice, lane, lanes, segments, threads, mode, memory, t));
+                  process_block, std::ref(B), n, slice, lane, lanes, segments, threads, mode, memory, t, stop_token));
             }
 
             for(auto& fut : fut_results) {
@@ -357,7 +361,7 @@ void process_blocks(secure_vector<uint64_t>& B, size_t t, size_t memory, size_t
    for(size_t n = 0; n != t; ++n) {
       for(size_t slice = 0; slice != SYNC_POINTS; ++slice) {
          for(size_t lane = 0; lane != threads; ++lane) {
-            process_block(B, n, slice, lane, lanes, segments, threads, mode, memory, t);
+            process_block(B, n, slice, lane, lanes, segments, threads, mode, memory, t, stop_token);
          }
       }
    }
@@ -374,7 +378,8 @@ void Argon2::argon2(uint8_t output[],
                     const uint8_t key[],
                     size_t key_len,
                     const uint8_t ad[],
-                    size_t ad_len) const {
+                    size_t ad_len,
+                    const std::optional<std::stop_token>& stop_token) const {
    BOTAN_ARG_CHECK(output_len >= 4 && output_len <= std::numeric_limits<uint32_t>::max(),
                    "Invalid Argon2 output length");
    BOTAN_ARG_CHECK(password_len <= std::numeric_limits<uint32_t>::max(), "Invalid Argon2 password length");
@@ -406,7 +411,7 @@ void Argon2::argon2(uint8_t output[],
    secure_vector<uint64_t> B(memory * 1024 / 8);
 
    init_blocks(B, *blake2, H0, memory, m_p);
-   process_blocks(B, m_t, memory, m_p, m_family);
+   process_blocks(B, m_t, memory, m_p, m_family, stop_token);
 
    clear_mem(output, output_len);
    extract_key(output, output_len, B, memory, m_p);

diff --git a/src/lib/pbkdf/argon2/argon2.h b/src/lib/pbkdf/argon2/argon2.h
@@ -35,7 +35,8 @@ class BOTAN_PUBLIC_API(2, 11) Argon2 final : public PasswordHash {
                       const char* password,
                       size_t password_len,
                       const uint8_t salt[],
-                      size_t salt_len) const override;
+                      size_t salt_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
       void derive_key(uint8_t out[],
                       size_t out_len,
@@ -46,7 +47,8 @@ class BOTAN_PUBLIC_API(2, 11) Argon2 final : public PasswordHash {
                       const uint8_t ad[],
                       size_t ad_len,
                       const uint8_t key[],
-                      size_t key_len) const override;
+                      size_t key_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
       std::string to_string() const override;
 
@@ -60,6 +62,8 @@ class BOTAN_PUBLIC_API(2, 11) Argon2 final : public PasswordHash {
 
       bool supports_associated_data() const override { return true; }
 
+      bool supports_cooperative_cancellation() const override { return true; }
+
       size_t iterations() const override { return t(); }
 
       size_t parallelism() const override { return p(); }
@@ -91,7 +95,8 @@ class BOTAN_PUBLIC_API(2, 11) Argon2 final : public PasswordHash {
                   const uint8_t key[],
                   size_t key_len,
                   const uint8_t ad[],
-                  size_t ad_len) const;
+                  size_t ad_len,
+                  const std::optional<std::stop_token>& stop_token) const;
 
       uint8_t m_family;
       size_t m_M, m_t, m_p;

diff --git a/src/lib/pbkdf/argon2/argon2pwhash.cpp b/src/lib/pbkdf/argon2/argon2pwhash.cpp
@@ -26,8 +26,9 @@ void Argon2::derive_key(uint8_t output[],
                         const char* password,
                         size_t password_len,
                         const uint8_t salt[],
-                        size_t salt_len) const {
-   argon2(output, output_len, password, password_len, salt, salt_len, nullptr, 0, nullptr, 0);
+                        size_t salt_len,
+                        const std::optional<std::stop_token>& stop_token) const {
+   argon2(output, output_len, password, password_len, salt, salt_len, nullptr, 0, nullptr, 0, stop_token);
 }
 
 void Argon2::derive_key(uint8_t output[],
@@ -39,8 +40,9 @@ void Argon2::derive_key(uint8_t output[],
                         const uint8_t ad[],
                         size_t ad_len,
                         const uint8_t key[],
-                        size_t key_len) const {
-   argon2(output, output_len, password, password_len, salt, salt_len, key, key_len, ad, ad_len);
+                        size_t key_len,
+                        const std::optional<std::stop_token>& stop_token) const {
+   argon2(output, output_len, password, password_len, salt, salt_len, key, key_len, ad, ad_len, stop_token);
 }
 
 namespace {

diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.cpp
@@ -117,7 +117,8 @@ void Bcrypt_PBKDF::derive_key(uint8_t output[],
                               const char* password,
                               size_t password_len,
                               const uint8_t salt[],
-                              size_t salt_len) const {
+                              size_t salt_len,
+                              [[maybe_unused]] const std::optional<std::stop_token>& stop_token) const {
    // No output desired, so we are all done already...
    if(output_len == 0) {
       return;

diff --git a/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h b/src/lib/pbkdf/bcrypt_pbkdf/bcrypt_pbkdf.h
@@ -29,7 +29,8 @@ class BOTAN_PUBLIC_API(2, 11) Bcrypt_PBKDF final : public PasswordHash {
                       const char* password,
                       size_t password_len,
                       const uint8_t salt[],
-                      size_t salt_len) const override;
+                      size_t salt_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
       std::string to_string() const override;
 

diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
@@ -83,7 +83,7 @@ size_t pbkdf2(MessageAuthenticationCode& prf,
 
    PBKDF2 pbkdf2(prf, iterations);
 
-   pbkdf2.derive_key(out, out_len, password.data(), password.size(), salt, salt_len);
+   pbkdf2.derive_key(out, out_len, password.data(), password.size(), salt, salt_len, std::nullopt);
 
    return iterations;
 }
@@ -144,7 +144,7 @@ size_t PKCS5_PBKDF2::pbkdf(uint8_t key[],
 
    PBKDF2 pbkdf2(*m_mac, iterations);
 
-   pbkdf2.derive_key(key, key_len, password.data(), password.size(), salt, salt_len);
+   pbkdf2.derive_key(key, key_len, password.data(), password.size(), salt, salt_len, std::nullopt);
 
    return iterations;
 }
@@ -171,7 +171,8 @@ void PBKDF2::derive_key(uint8_t out[],
                         const char* password,
                         const size_t password_len,
                         const uint8_t salt[],
-                        size_t salt_len) const {
+                        size_t salt_len,
+                        [[maybe_unused]] const std::optional<std::stop_token>& stop_token) const {
    pbkdf2_set_key(*m_prf, password, password_len);
    pbkdf2(*m_prf, out, out_len, salt, salt_len, m_iterations);
 }

diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h
@@ -58,7 +58,8 @@ class BOTAN_PUBLIC_API(2, 8) PBKDF2 final : public PasswordHash {
                       const char* password,
                       size_t password_len,
                       const uint8_t salt[],
-                      size_t salt_len) const override;
+                      size_t salt_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
    private:
       std::unique_ptr<MessageAuthenticationCode> m_prf;

diff --git a/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp b/src/lib/pbkdf/pgp_s2k/pgp_s2k.cpp
@@ -140,7 +140,8 @@ void RFC4880_S2K::derive_key(uint8_t out[],
                              const char* password,
                              const size_t password_len,
                              const uint8_t salt[],
-                             size_t salt_len) const {
+                             size_t salt_len,
+                             [[maybe_unused]] const std::optional<std::stop_token>& stop_token) const {
    pgp_s2k(*m_hash, out, out_len, password, password_len, salt, salt_len, m_iterations);
 }
 

diff --git a/src/lib/pbkdf/pgp_s2k/pgp_s2k.h b/src/lib/pbkdf/pgp_s2k/pgp_s2k.h
@@ -94,7 +94,8 @@ class BOTAN_PUBLIC_API(2, 8) RFC4880_S2K final : public PasswordHash {
                       const char* password,
                       size_t password_len,
                       const uint8_t salt[],
-                      size_t salt_len) const override;
+                      size_t salt_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
    private:
       std::unique_ptr<HashFunction> m_hash;

diff --git a/src/lib/pbkdf/pwdhash.cpp b/src/lib/pbkdf/pwdhash.cpp
@@ -41,7 +41,8 @@ void PasswordHash::derive_key(uint8_t out[],
                               const uint8_t ad[],
                               size_t ad_len,
                               const uint8_t key[],
-                              size_t key_len) const {
+                              size_t key_len,
+                              [[maybe_unused]] const std::optional<std::stop_token>& stop_token) const {
    BOTAN_UNUSED(ad, key);
 
    if(ad_len == 0 && key_len == 0) {

diff --git a/src/lib/pbkdf/pwdhash.h b/src/lib/pbkdf/pwdhash.h
@@ -13,6 +13,8 @@
 #include <span>
 #include <string>
 #include <vector>
+#include <stop_token>
+#include <optional>
 
 namespace Botan {
 
@@ -68,6 +70,11 @@ class BOTAN_PUBLIC_API(2, 8) PasswordHash /* NOLINT(*-special-member-functions)
       */
       virtual bool supports_associated_data() const { return false; }
 
+      /**
+      * @returns true if this password hash supports cancelling a key derivation operation using a stop_token
+      */
+      virtual bool supports_cooperative_cancellation() const { return false; }
+
       /**
       * Hash a password into a bitstring
       *
@@ -106,7 +113,8 @@ class BOTAN_PUBLIC_API(2, 8) PasswordHash /* NOLINT(*-special-member-functions)
                 std::string_view password,
                 std::span<const uint8_t> salt,
                 std::span<const uint8_t> associated_data,
-                std::span<const uint8_t> key) const {
+                std::span<const uint8_t> key,
+                const std::optional<std::stop_token>& stop_token = std::nullopt) const {
          this->derive_key(out.data(),
                           out.size(),
                           password.data(),
@@ -116,7 +124,8 @@ class BOTAN_PUBLIC_API(2, 8) PasswordHash /* NOLINT(*-special-member-functions)
                           associated_data.data(),
                           associated_data.size(),
                           key.data(),
-                          key.size());
+                          key.size(),
+                          stop_token);
       }
 
       /**
@@ -137,7 +146,8 @@ class BOTAN_PUBLIC_API(2, 8) PasswordHash /* NOLINT(*-special-member-functions)
                               const char* password,
                               size_t password_len,
                               const uint8_t salt[],
-                              size_t salt_len) const = 0;
+                              size_t salt_len,
+                              const std::optional<std::stop_token>& stop_token = std::nullopt) const = 0;
 
       /**
       * Derive a key from a password plus additional data and/or a secret key
@@ -168,7 +178,8 @@ class BOTAN_PUBLIC_API(2, 8) PasswordHash /* NOLINT(*-special-member-functions)
                               const uint8_t ad[],
                               size_t ad_len,
                               const uint8_t key[],
-                              size_t key_len) const;
+                              size_t key_len,
+                              const std::optional<std::stop_token>& stop_token = std::nullopt) const;
 };
 
 class BOTAN_PUBLIC_API(2, 8) PasswordHashFamily /* NOLINT(*-special-member-functions) */ {

diff --git a/src/lib/pbkdf/scrypt/scrypt.cpp b/src/lib/pbkdf/scrypt/scrypt.cpp
@@ -198,7 +198,8 @@ void Scrypt::derive_key(uint8_t output[],
                         const char* password,
                         size_t password_len,
                         const uint8_t salt[],
-                        size_t salt_len) const {
+                        size_t salt_len,
+                        [[maybe_unused]] const std::optional<std::stop_token>& stop_token) const {
    const size_t N = memory_param();
    const size_t p = parallelism();
    const size_t r = iterations();

diff --git a/src/lib/pbkdf/scrypt/scrypt.h b/src/lib/pbkdf/scrypt/scrypt.h
@@ -30,7 +30,8 @@ class BOTAN_PUBLIC_API(2, 8) Scrypt final : public PasswordHash {
                       const char* password,
                       size_t password_len,
                       const uint8_t salt[],
-                      size_t salt_len) const override;
+                      size_t salt_len,
+                      const std::optional<std::stop_token>& stop_token) const override;
 
       std::string to_string() const override;
 

diff --git a/src/lib/x509/certstor_system_macos/certstor_macos.h b/src/lib/x509/certstor_system_macos/certstor_macos.h
@@ -58,7 +58,7 @@ class BOTAN_PUBLIC_API(2, 10) Certificate_Store_MacOS final : public Certificate
       std::optional<X509_Certificate> find_cert_by_pubkey_sha1(const std::vector<uint8_t>& key_hash) const override;
 
       /**
-       * @throws Not_Implemented
+       * @throws Not_Implemented as this functionality is not available
        */
       std::optional<X509_Certificate> find_cert_by_raw_subject_dn_sha256(
          const std::vector<uint8_t>& subject_hash) const override;
@@ -78,4 +78,4 @@ class BOTAN_PUBLIC_API(2, 10) Certificate_Store_MacOS final : public Certificate
 
 }  // namespace Botan
 
-#endif
+#endif
diff --git a/src/scripts/ci/setup_gh_actions.sh b/src/scripts/ci/setup_gh_actions.sh
@@ -94,7 +94,7 @@ else
 
     if [ -d '/Applications/Xcode_16.1.app/Contents/Developer' ]; then
         sudo xcrun xcode-select --switch '/Applications/Xcode_16.1.app/Contents/Developer'
-    else
+    elif [ -d '/Applications/Xcode_15.2.app/Contents/Developer' ]; then
         sudo xcrun xcode-select --switch '/Applications/Xcode_15.2.app/Contents/Developer'
     fi
 fi

diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
@@ -367,7 +367,7 @@ def sanitize_kv(some_string):
             test_prefix = ['wine']
         else:
             if target == 'cross-arm32':
-                flags += ['--cpu=armv7', '--extra-cxxflags=-D_FILE_OFFSET_BITS=64']
+                flags += ['--cpu=armv7', '--extra-cxxflags=-D_FILE_OFFSET_BITS=64', '--extra-libs=atomic']
                 cc_bin = 'arm-linux-gnueabihf-g++'
                 test_prefix = ['qemu-arm', '-L', '/usr/arm-linux-gnueabihf/']
             elif target in ['cross-arm64', 'cross-arm64-amalgamation']:
@@ -425,7 +425,7 @@ def sanitize_kv(some_string):
                 cc_bin = 'mips64-linux-gnuabi64-g++'
                 test_prefix = ['qemu-mips64', '-L', '/usr/mips64-linux-gnuabi64/']
             elif target in ['cross-arm32-baremetal']:
-                flags += ['--cpu=arm32', '--disable-neon', '--without-stack-protector', '--ldflags=-specs=nosys.specs']
+                flags += ['--cpu=arm32', '--disable-neon', '--without-stack-protector', '--ldflags=-specs=nosys.specs', '--extra-libs=atomic']
                 cc_bin = 'arm-none-eabi-c++'
                 test_cmd = None
             else: