diff --git a/CMakeLists.txt b/CMakeLists.txt index 315ce28e..85af6e5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,7 +155,6 @@ endfunction() if (BOOST_CAPY_MRDOCS_BUILD) file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp" "#include \n" - "#include \n" "#include \n" "#include \n") add_library(boost_capy_mrdocs "${CMAKE_CURRENT_BINARY_DIR}/mrdocs.cpp") @@ -171,13 +170,6 @@ add_library(boost_capy include/boost/capy.hpp build/Jamfile ${BOOST_CAPY_HEADERS add_library(Boost::capy ALIAS boost_capy) boost_capy_setup_properties(boost_capy) -# bcrypt requires platform-specific libraries -if (WIN32) - target_link_libraries(boost_capy PRIVATE bcrypt) -elseif (APPLE) - target_link_libraries(boost_capy PRIVATE "-framework Security") -endif () - # Zlib find_package(ZLIB) if (ZLIB_FOUND) diff --git a/build/Jamfile b/build/Jamfile index e9d081fb..0d3f9404 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -30,18 +30,10 @@ project boost/capy alias capy_sources : [ glob-tree-ex src : *.cpp ] ; -# Windows CNG library for bcrypt random number generation. -lib bcrypt_sys : : bcrypt ; - lib boost_capy : capy_sources : requirements ../ - windows:bcrypt_sys - darwin:"-framework Security" - : usage-requirements - windows:bcrypt_sys - darwin:"-framework Security" ; # Zlib diff --git a/doc/modules/ROOT/nav.adoc b/doc/modules/ROOT/nav.adoc index ce170dff..38e4a5e2 100644 --- a/doc/modules/ROOT/nav.adoc +++ b/doc/modules/ROOT/nav.adoc @@ -14,8 +14,6 @@ ** xref:buffers/index.adoc[Buffer Types] ** xref:buffers/sequences.adoc[Buffer Sequences] ** xref:buffers/dynamic.adoc[Dynamic Buffers] -* Cryptography -** xref:cryptography/bcrypt.adoc[BCrypt Password Hashing] * Compression ** xref:compression/brotli.adoc[Brotli] ** xref:compression/zlib.adoc[ZLib] diff --git a/doc/modules/ROOT/pages/cryptography/bcrypt.adoc b/doc/modules/ROOT/pages/cryptography/bcrypt.adoc deleted file mode 100644 index 28970e6d..00000000 --- a/doc/modules/ROOT/pages/cryptography/bcrypt.adoc +++ /dev/null @@ -1,295 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -= BCrypt Password Hashing - -This page explains how to securely hash and verify passwords using bcrypt. - -NOTE: Code snippets assume `using namespace boost::capy;` is in effect. - -== What is BCrypt? - -BCrypt is a password-hashing function designed by Niels Provos and David -Mazières. It incorporates: - -* A **salt** to protect against rainbow table attacks -* An **adaptive cost factor** that can be increased as hardware improves -* Built-in work factor that makes brute-force attacks expensive - -BCrypt is the recommended algorithm for password storage. - -== Quick Start - -[source,cpp] ----- -#include - -// Hash a password -bcrypt::result hash = bcrypt::hash("my_password", 12); - -// Store hash.str() in database... - -// Later, verify the password -system::error_code ec; -bool valid = bcrypt::compare("my_password", stored_hash, ec); - -if (ec) - // Hash was malformed -else if (valid) - // Password matches -else - // Password does not match ----- - -== Hashing Passwords - -The `hash` function generates a salted hash: - -[source,cpp] ----- -// Default cost factor (10) -bcrypt::result r1 = bcrypt::hash("password"); - -// Custom cost factor -bcrypt::result r2 = bcrypt::hash("password", 12); - -// Custom cost factor and version -bcrypt::result r3 = bcrypt::hash("password", 12, bcrypt::version::v2b); ----- - -=== Cost Factor - -The cost factor (rounds) determines how expensive hashing is. Each increment -doubles the work: - -[cols="1,2"] -|=== -| Cost | Approximate Time (modern CPU) - -| 10 -| ~100ms - -| 12 -| ~400ms - -| 14 -| ~1.6s - -| 16 -| ~6.4s -|=== - -**Guidelines:** - -* Minimum: 10 for new applications -* Recommended: 12 for most applications -* Maximum: 31 (impractically slow) -* Adjust based on your hardware and latency requirements - -=== Password Length Limit - -BCrypt only uses the first 72 bytes of a password. Longer passwords are -silently truncated. If you need to support longer passwords, pre-hash -with SHA-256: - -[source,cpp] ----- -// For passwords > 72 bytes -std::string pre_hash = sha256(long_password); -bcrypt::result r = bcrypt::hash(pre_hash, 12); ----- - -== Verifying Passwords - -The `compare` function extracts the salt from a stored hash, re-hashes -the input password, and compares: - -[source,cpp] ----- -system::error_code ec; -bool valid = bcrypt::compare(user_input, stored_hash, ec); - -if (ec == bcrypt::error::invalid_hash) -{ - // Hash string is malformed - data corruption or tampering - log_security_event("invalid hash format"); - return false; -} - -if (valid) - grant_access(); -else - reject_login(); ----- - -WARNING: Always check the error code. A false return value alone does not -distinguish between "wrong password" and "malformed hash". - -== Working with Salts - -You can generate and use salts separately: - -[source,cpp] ----- -// Generate a salt -bcrypt::result salt = bcrypt::gen_salt(12); - -// Hash with explicit salt -system::error_code ec; -bcrypt::result hash = bcrypt::hash("password", salt.str(), ec); ----- - -This is rarely needed since `hash()` generates a salt automatically. - -== The result Type - -`bcrypt::result` is a fixed-size buffer (no heap allocation): - -[source,cpp] ----- -bcrypt::result r = bcrypt::hash("password", 12); - -// Access the hash string -core::string_view sv = r.str(); // Or just use r (implicit conversion) -char const* cstr = r.c_str(); // Null-terminated - -// Check for valid result -if (r) - store(r.str()); ----- - -== Hash String Format - -A bcrypt hash string has this format: - ----- -$2b$12$N9qo8uLOickgx2ZMRZoMyeIjZAgcfl7p92ldGxad68LJZdL17lhWy -│ │ │ │ -│ │ │ └─ hash (31 chars) -│ │ └─ salt (22 chars) -│ └─ cost factor -└─ version ----- - -Total length: 60 characters. - -== Extracting the Cost Factor - -To check the cost factor of an existing hash: - -[source,cpp] ----- -system::error_code ec; -unsigned rounds = bcrypt::get_rounds(stored_hash, ec); - -if (ec) - // Invalid hash format -else if (rounds < 12) - // Consider re-hashing with higher cost ----- - -== Upgrading Cost Factor - -When a user logs in successfully, you can check if their hash needs upgrading: - -[source,cpp] ----- -system::error_code ec; -bool valid = bcrypt::compare(password, stored_hash, ec); - -if (valid && !ec) -{ - unsigned current_cost = bcrypt::get_rounds(stored_hash, ec); - - if (!ec && current_cost < 12) - { - // Re-hash with higher cost - bcrypt::result new_hash = bcrypt::hash(password, 12); - update_stored_hash(user_id, new_hash.str()); - } -} ----- - -== Error Handling - -BCrypt defines two error codes: - -[cols="1,3"] -|=== -| Error | Meaning - -| `bcrypt::error::invalid_salt` -| Salt string is malformed - -| `bcrypt::error::invalid_hash` -| Hash string is malformed -|=== - -These errors indicate either data corruption or malicious input. Log them -as security events. - -== Version Selection - -BCrypt has multiple version prefixes: - -[cols="1,3"] -|=== -| Version | Description - -| `version::v2a` -| Original specification - -| `version::v2b` -| Fixed handling of passwords > 255 chars (recommended) -|=== - -Use `v2b` for new hashes. All versions produce compatible hashes that can -be verified by any version. - -== Security Considerations - -**Do:** - -* Use cost factor 12 or higher -* Store the complete hash string (includes salt and cost) -* Compare in constant time (handled by `compare`) -* Log invalid hash errors as security events - -**Do Not:** - -* Store salts separately (they are embedded in the hash) -* Use bcrypt for general-purpose hashing (use SHA-256) -* Compare hashes with `==` (timing attacks) - -== Summary - -[cols="1,3"] -|=== -| Function | Purpose - -| `bcrypt::hash(password, rounds)` -| Hash a password with auto-generated salt - -| `bcrypt::hash(password, salt, ec)` -| Hash with explicit salt - -| `bcrypt::compare(password, hash, ec)` -| Verify a password against a hash - -| `bcrypt::gen_salt(rounds)` -| Generate a random salt - -| `bcrypt::get_rounds(hash, ec)` -| Extract cost factor from hash -|=== - -== Next Steps - -* xref:../utilities/containers.adoc[Containers] — Type-erased storage -* xref:reference:boost/capy.adoc[API Reference] — Full reference documentation diff --git a/include/boost/capy.hpp b/include/boost/capy.hpp index 9f5fa1c8..c351e82d 100644 --- a/include/boost/capy.hpp +++ b/include/boost/capy.hpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include diff --git a/include/boost/capy/bcrypt.hpp b/include/boost/capy/bcrypt.hpp deleted file mode 100644 index b890fdbc..00000000 --- a/include/boost/capy/bcrypt.hpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -/** @file - bcrypt password hashing library. - - This header includes all bcrypt-related functionality including - password hashing, verification, and salt generation. - - bcrypt is a password-hashing function designed by Niels Provos - and David Mazières based on the Blowfish cipher. It incorporates - a salt to protect against rainbow table attacks and an adaptive - cost parameter that can be increased as hardware improves. - - @code - #include - - // Hash a password - capy::bcrypt::result r; - capy::bcrypt::hash(r, "my_password", 12); - - // Store r.str() in database... - - // Verify later - system::error_code ec; - bool ok = boost::capy::bcrypt::compare("my_password", stored_hash, ec); - if (ec) - handle_malformed_hash(); - else if (ok) - grant_access(); - @endcode -*/ - -#ifndef BOOST_CAPY_BCRYPT_HPP -#define BOOST_CAPY_BCRYPT_HPP - -#include -#include -#include -#include -#include - -#endif - diff --git a/include/boost/capy/bcrypt/error.hpp b/include/boost/capy/bcrypt/error.hpp deleted file mode 100644 index b1450cc0..00000000 --- a/include/boost/capy/bcrypt/error.hpp +++ /dev/null @@ -1,92 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_BCRYPT_ERROR_HPP -#define BOOST_CAPY_BCRYPT_ERROR_HPP - -#include -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { - -/** Error codes for bcrypt operations. - - These errors indicate malformed input from untrusted sources. -*/ -enum class error -{ - /// Success - ok = 0, - - /// Salt string is malformed - invalid_salt, - - /// Hash string is malformed - invalid_hash -}; - -} // bcrypt -} // capy - -namespace system { -template<> -struct is_error_code_enum< - ::boost::capy::bcrypt::error> -{ - static bool const value = true; -}; -} // system - -namespace capy { -namespace bcrypt { - -namespace detail { - -struct BOOST_SYMBOL_VISIBLE - error_cat_type - : system::error_category -{ - BOOST_CAPY_DECL const char* name( - ) const noexcept override; - BOOST_CAPY_DECL std::string message( - int) const override; - BOOST_CAPY_DECL char const* message( - int, char*, std::size_t - ) const noexcept override; - BOOST_SYSTEM_CONSTEXPR error_cat_type() - : error_category(0xbc8f2a4e7c193d56) - { - } -}; - -BOOST_CAPY_DECL extern - error_cat_type error_cat; - -} // detail - -inline -BOOST_SYSTEM_CONSTEXPR -system::error_code -make_error_code( - error ev) noexcept -{ - return system::error_code{ - static_cast::type>(ev), - detail::error_cat}; -} - -} // bcrypt -} // capy -} // boost - -#endif diff --git a/include/boost/capy/bcrypt/hash.hpp b/include/boost/capy/bcrypt/hash.hpp deleted file mode 100644 index 0433c8dc..00000000 --- a/include/boost/capy/bcrypt/hash.hpp +++ /dev/null @@ -1,174 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_BCRYPT_HASH_HPP -#define BOOST_CAPY_BCRYPT_HASH_HPP - -#include -#include -#include -#include -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { - -/** Generate a random salt. - - Creates a bcrypt salt string suitable for use with - the hash() function. - - @par Preconditions - @code - rounds >= 4 && rounds <= 31 - @endcode - - @par Exception Safety - Strong guarantee. - - @par Complexity - Constant. - - @param rounds Cost factor. Each increment doubles the work. - Default is 10, which takes approximately 100ms on modern hardware. - - @param ver Hash version to use. - - @return A 29-character salt string. - - @throws std::invalid_argument if rounds is out of range. - @throws system_error on RNG failure. -*/ -BOOST_CAPY_DECL -result -gen_salt( - unsigned rounds = 10, - version ver = version::v2b); - -/** Hash a password with auto-generated salt. - - Generates a random salt and hashes the password. - - @par Preconditions - @code - rounds >= 4 && rounds <= 31 - @endcode - - @par Exception Safety - Strong guarantee. - - @par Complexity - O(2^rounds). - - @param password The password to hash. Only the first 72 bytes - are used (bcrypt limitation). - - @param rounds Cost factor. Each increment doubles the work. - - @param ver Hash version to use. - - @return A 60-character hash string. - - @throws std::invalid_argument if rounds is out of range. - @throws system_error on RNG failure. -*/ -BOOST_CAPY_DECL -result -hash( - core::string_view password, - unsigned rounds = 10, - version ver = version::v2b); - -/** Hash a password using a provided salt. - - Uses the given salt to hash the password. The salt should - be a string previously returned by gen_salt() or extracted - from a hash string. - - @par Exception Safety - Strong guarantee. - - @par Complexity - O(2^rounds). - - @param password The password to hash. - - @param salt The salt string (29 characters). - - @param ec Set to bcrypt::error::invalid_salt if the salt - is malformed. - - @return A 60-character hash string, or empty result on error. -*/ -BOOST_CAPY_DECL -result -hash( - core::string_view password, - core::string_view salt, - system::error_code& ec); - -/** Compare a password against a hash. - - Extracts the salt from the hash, re-hashes the password, - and compares the result. - - @par Exception Safety - Strong guarantee. - - @par Complexity - O(2^rounds). - - @param password The plaintext password to check. - - @param hash The hash string to compare against. - - @param ec Set to bcrypt::error::invalid_hash if the hash - is malformed. - - @return true if the password matches the hash, false if - it does not match OR if an error occurred. Always check - ec to distinguish between a mismatch and an error. -*/ -BOOST_CAPY_DECL -bool -compare( - core::string_view password, - core::string_view hash, - system::error_code& ec); - -/** Extract the cost factor from a hash string. - - @par Exception Safety - Strong guarantee. - - @par Complexity - Constant. - - @param hash The hash string to parse. - - @param ec Set to bcrypt::error::invalid_hash if the hash - is malformed. - - @return The cost factor (4-31) on success, or 0 if an - error occurred. -*/ -BOOST_CAPY_DECL -unsigned -get_rounds( - core::string_view hash, - system::error_code& ec); - -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/include/boost/capy/bcrypt/result.hpp b/include/boost/capy/bcrypt/result.hpp deleted file mode 100644 index 729acf0f..00000000 --- a/include/boost/capy/bcrypt/result.hpp +++ /dev/null @@ -1,124 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_BCRYPT_RESULT_HPP -#define BOOST_CAPY_BCRYPT_RESULT_HPP - -#include -#include -#include -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { - -/** Fixed-size buffer for bcrypt hash output. - - Stores a bcrypt hash string (max 60 chars) in an - inline buffer with no heap allocation. - - @par Example - @code - bcrypt::result r = bcrypt::hash("password", 10); - core::string_view sv = r; // or r.str() - std::cout << r.c_str(); // null-terminated - @endcode -*/ -class result -{ - char buf_[61]; // 60 chars + null terminator - unsigned char size_; - -public: - /** Default constructor. - - Constructs an empty result. - */ - result() noexcept - : size_(0) - { - buf_[0] = '\0'; - } - - /** Return the hash as a string_view. - */ - core::string_view - str() const noexcept - { - return core::string_view(buf_, size_); - } - - /** Implicit conversion to string_view. - */ - operator core::string_view() const noexcept - { - return str(); - } - - /** Return null-terminated C string. - */ - char const* - c_str() const noexcept - { - return buf_; - } - - /** Return pointer to data. - */ - char const* - data() const noexcept - { - return buf_; - } - - /** Return size in bytes (excludes null terminator). - */ - std::size_t - size() const noexcept - { - return size_; - } - - /** Check if result is empty. - */ - bool - empty() const noexcept - { - return size_ == 0; - } - - /** Check if result contains valid data. - */ - explicit - operator bool() const noexcept - { - return size_ != 0; - } - -private: - friend BOOST_CAPY_DECL result gen_salt(unsigned, version); - friend BOOST_CAPY_DECL result hash(core::string_view, unsigned, version); - friend BOOST_CAPY_DECL result hash(core::string_view, core::string_view, system::error_code&); - - char* buf() noexcept { return buf_; } - void set_size(unsigned char n) noexcept - { - size_ = n; - buf_[n] = '\0'; - } -}; - -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/include/boost/capy/bcrypt/version.hpp b/include/boost/capy/bcrypt/version.hpp deleted file mode 100644 index 6fabd9b7..00000000 --- a/include/boost/capy/bcrypt/version.hpp +++ /dev/null @@ -1,38 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_BCRYPT_VERSION_HPP -#define BOOST_CAPY_BCRYPT_VERSION_HPP - -#include - -namespace boost { -namespace capy { -namespace bcrypt { - -/** bcrypt hash version prefix. - - The version determines which variant of bcrypt is used. - All versions produce compatible hashes. -*/ -enum class version -{ - /// $2a$ - Original specification - v2a, - - /// $2b$ - Fixed handling of passwords > 255 chars (recommended) - v2b -}; - -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/include/boost/capy/detail/config.hpp b/include/boost/capy/detail/config.hpp index 737284d5..934b4684 100644 --- a/include/boost/capy/detail/config.hpp +++ b/include/boost/capy/detail/config.hpp @@ -16,15 +16,6 @@ # include #endif -// Detect std::stop_token availability (C++20 jthread facility) -#if !defined(BOOST_CAPY_HAS_STOP_TOKEN) -# if defined(__cpp_lib_jthread) && __cpp_lib_jthread >= 201911L -# define BOOST_CAPY_HAS_STOP_TOKEN 1 -# else -# define BOOST_CAPY_HAS_STOP_TOKEN 0 -# endif -#endif - // Detect thread-local storage mechanism // Cascade: compiler keyword > thread_local > OS API #if !defined(BOOST_CAPY_TLS_KEYWORD) diff --git a/include/boost/capy/ex/get_stop_token.hpp b/include/boost/capy/ex/get_stop_token.hpp index aa6e23f9..c398fc8f 100644 --- a/include/boost/capy/ex/get_stop_token.hpp +++ b/include/boost/capy/ex/get_stop_token.hpp @@ -15,8 +15,6 @@ namespace boost { namespace capy { -#if BOOST_CAPY_HAS_STOP_TOKEN - /** Tag type for coroutine stop token retrieval. This tag is returned by @ref get_stop_token and intercepted by a @@ -66,8 +64,6 @@ inline get_stop_token_tag get_stop_token() noexcept return {}; } -#endif // BOOST_CAPY_HAS_STOP_TOKEN - } // namespace capy } // namespace boost diff --git a/include/boost/capy/ex/run_async.hpp b/include/boost/capy/ex/run_async.hpp index aa0a5762..fe0ddb99 100644 --- a/include/boost/capy/ex/run_async.hpp +++ b/include/boost/capy/ex/run_async.hpp @@ -344,9 +344,7 @@ class [[nodiscard]] run_async_wrapper task_h.promise().continuation_ = tr_.h_; task_h.promise().caller_ex_ = ex_; task_h.promise().ex_ = ex_; // Used by awaited async_ops -#if BOOST_CAPY_HAS_STOP_TOKEN task_h.promise().set_stop_token(st_); -#endif // Resume task through executor // The executor returns a handle for symmetric transfer; diff --git a/include/boost/capy/ex/run_on.hpp b/include/boost/capy/ex/run_on.hpp index 26c5b962..06973928 100644 --- a/include/boost/capy/ex/run_on.hpp +++ b/include/boost/capy/ex/run_on.hpp @@ -69,11 +69,7 @@ struct [[nodiscard]] run_on_awaitable h_.promise().ex_ = ex_; h_.promise().caller_ex_ = caller_ex; h_.promise().continuation_ = continuation; -#if BOOST_CAPY_HAS_STOP_TOKEN h_.promise().set_stop_token(token); -#else - (void)token; -#endif h_.promise().needs_dispatch_ = true; return h_; } diff --git a/include/boost/capy/ex/stop_token_support.hpp b/include/boost/capy/ex/stop_token_support.hpp index 6638e47d..9819c660 100644 --- a/include/boost/capy/ex/stop_token_support.hpp +++ b/include/boost/capy/ex/stop_token_support.hpp @@ -15,16 +15,12 @@ #include #include -#if BOOST_CAPY_HAS_STOP_TOKEN #include -#endif #include namespace boost { namespace capy { -#if BOOST_CAPY_HAS_STOP_TOKEN - /** CRTP mixin that adds stop token support to a promise type. Inherit from this class to enable two capabilities in your coroutine: @@ -204,8 +200,6 @@ class stop_token_support } }; -#endif // BOOST_CAPY_HAS_STOP_TOKEN - } // namespace capy } // namespace boost diff --git a/include/boost/capy/task.hpp b/include/boost/capy/task.hpp index 8b548ed8..ce54efff 100644 --- a/include/boost/capy/task.hpp +++ b/include/boost/capy/task.hpp @@ -79,9 +79,7 @@ struct [[nodiscard]] BOOST_CAPY_CORO_AWAIT_ELIDABLE { struct promise_type : frame_allocating_base -#if BOOST_CAPY_HAS_STOP_TOKEN , stop_token_support -#endif , detail::task_return_base { any_executor_ref ex_; @@ -182,11 +180,7 @@ struct [[nodiscard]] BOOST_CAPY_CORO_AWAIT_ELIDABLE template auto await_suspend(std::coroutine_handle h) { -#if BOOST_CAPY_HAS_STOP_TOKEN return a_.await_suspend(h, p_->ex_, p_->stop_token()); -#else - return a_.await_suspend(h, p_->ex_, std::stop_token{}); -#endif } }; @@ -206,15 +200,6 @@ struct [[nodiscard]] BOOST_CAPY_CORO_AWAIT_ELIDABLE return make_affine(std::forward(a), ex_); } } - -#if !BOOST_CAPY_HAS_STOP_TOKEN - // Without stop token support, provide await_transform directly - template - auto await_transform(Awaitable&& a) - { - return transform_awaitable(std::forward(a)); - } -#endif }; std::coroutine_handle h_; @@ -247,11 +232,7 @@ struct [[nodiscard]] BOOST_CAPY_CORO_AWAIT_ELIDABLE h_.promise().caller_ex_ = caller_ex; h_.promise().continuation_ = continuation; h_.promise().ex_ = caller_ex; -#if BOOST_CAPY_HAS_STOP_TOKEN h_.promise().set_stop_token(token); -#else - (void)token; -#endif h_.promise().needs_dispatch_ = false; return h_; } diff --git a/include/boost/capy/when_all.hpp b/include/boost/capy/when_all.hpp index 1c0f9bdc..d3276df5 100644 --- a/include/boost/capy/when_all.hpp +++ b/include/boost/capy/when_all.hpp @@ -22,9 +22,7 @@ #include #include #include -#if BOOST_CAPY_HAS_STOP_TOKEN #include -#endif #include #include #include @@ -94,7 +92,6 @@ struct when_all_state std::atomic has_exception_{false}; std::exception_ptr first_exception_; -#if BOOST_CAPY_HAS_STOP_TOKEN // Stop propagation - on error, request stop for siblings std::stop_source stop_source_; @@ -106,7 +103,6 @@ struct when_all_state }; using stop_callback_t = std::stop_callback; std::optional parent_stop_callback_; -#endif // Parent resumption any_coro continuation_; @@ -160,9 +156,7 @@ struct when_all_runner { when_all_state* state_ = nullptr; any_executor_ref ex_; -#if BOOST_CAPY_HAS_STOP_TOKEN std::stop_token stop_token_; -#endif when_all_runner get_return_object() { @@ -205,10 +199,8 @@ struct when_all_runner void unhandled_exception() { state_->capture_exception(std::current_exception()); -#if BOOST_CAPY_HAS_STOP_TOKEN // Request stop for sibling tasks state_->stop_source_.request_stop(); -#endif } template @@ -230,11 +222,7 @@ struct when_all_runner template auto await_suspend(std::coroutine_handle h) { -#if BOOST_CAPY_HAS_STOP_TOKEN return a_.await_suspend(h, p_->ex_, p_->stop_token_); -#else - return a_.await_suspend(h, p_->ex_, std::stop_token{}); -#endif } }; @@ -323,7 +311,6 @@ class when_all_launcher return sizeof...(Ts) == 0; } -#if BOOST_CAPY_HAS_STOP_TOKEN template any_coro await_suspend(any_coro continuation, Ex const& caller_ex, std::stop_token parent_token = {}) { @@ -350,22 +337,6 @@ class when_all_launcher // Let signal_completion() handle resumption return std::noop_coroutine(); } -#else - template - any_coro await_suspend(any_coro continuation, Ex const& caller_ex) - { - state_->continuation_ = continuation; - state_->caller_ex_ = caller_ex; - - // Launch all tasks concurrently - [&](std::index_sequence) { - (..., launch_one(caller_ex)); - }(std::index_sequence_for{}); - - // Let signal_completion() handle resumption - return std::noop_coroutine(); - } -#endif void await_resume() const noexcept { @@ -373,7 +344,6 @@ class when_all_launcher } private: -#if BOOST_CAPY_HAS_STOP_TOKEN template void launch_one(Ex const& caller_ex, std::stop_token token) { @@ -389,22 +359,6 @@ class when_all_launcher state_->runner_handles_[I] = ch; caller_ex.dispatch(ch).resume(); } -#else - template - void launch_one(Ex const& caller_ex) - { - auto runner = make_when_all_runner( - std::move(std::get(*tasks_)), state_); - - auto h = runner.release(); - h.promise().state_ = state_; - h.promise().ex_ = caller_ex; - - any_coro ch{h}; - state_->runner_handles_[I] = ch; - caller_ex.dispatch(ch).resume(); - } -#endif }; /** Compute the result type for when_all. diff --git a/src/bcrypt/base64.cpp b/src/bcrypt/base64.cpp deleted file mode 100644 index 6f818b86..00000000 --- a/src/bcrypt/base64.cpp +++ /dev/null @@ -1,184 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include "base64.hpp" - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -namespace { - -// bcrypt's non-standard base64 alphabet -constexpr char encode_table[] = - "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; - -// Decode table: maps ASCII char to 6-bit value, or 0xFF for invalid -constexpr std::uint8_t decode_table[256] = { - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 0-7 - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 8-15 - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 16-23 - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 24-31 - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 32-39 - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01, // 40-47 (. /) - 0x36, 0x37, 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, // 48-55 (0-7) - 0x3E, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 56-63 (8-9) - 0xFF, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, // 64-71 (A-G) - 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, // 72-79 (H-O) - 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, // 80-87 (P-W) - 0x19, 0x1A, 0x1B, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 88-95 (X-Z) - 0xFF, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21, 0x22, // 96-103 (a-g) - 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29, 0x2A, // 104-111 (h-o) - 0x2B, 0x2C, 0x2D, 0x2E, 0x2F, 0x30, 0x31, 0x32, // 112-119 (p-w) - 0x33, 0x34, 0x35, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // 120-127 (x-z) - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -}; - -} // namespace - -std::size_t -base64_encode( - char* dest, - std::uint8_t const* src, - std::size_t n) -{ - char* out = dest; - - while (n >= 3) - { - std::uint32_t v = - (static_cast(src[0]) << 16) | - (static_cast(src[1]) << 8) | - static_cast(src[2]); - - *out++ = encode_table[(v >> 18) & 0x3F]; - *out++ = encode_table[(v >> 12) & 0x3F]; - *out++ = encode_table[(v >> 6) & 0x3F]; - *out++ = encode_table[v & 0x3F]; - - src += 3; - n -= 3; - } - - if (n == 2) - { - std::uint32_t v = - (static_cast(src[0]) << 16) | - (static_cast(src[1]) << 8); - - *out++ = encode_table[(v >> 18) & 0x3F]; - *out++ = encode_table[(v >> 12) & 0x3F]; - *out++ = encode_table[(v >> 6) & 0x3F]; - } - else if (n == 1) - { - std::uint32_t v = - static_cast(src[0]) << 16; - - *out++ = encode_table[(v >> 18) & 0x3F]; - *out++ = encode_table[(v >> 12) & 0x3F]; - } - - return static_cast(out - dest); -} - -int -base64_decode( - std::uint8_t* dest, - char const* src, - std::size_t n) -{ - std::uint8_t* out = dest; - std::size_t i = 0; - - while (i + 4 <= n) - { - std::uint8_t a = decode_table[static_cast(src[i])]; - std::uint8_t b = decode_table[static_cast(src[i + 1])]; - std::uint8_t c = decode_table[static_cast(src[i + 2])]; - std::uint8_t d = decode_table[static_cast(src[i + 3])]; - - if ((a | b | c | d) & 0x80) - return -1; - - std::uint32_t v = - (static_cast(a) << 18) | - (static_cast(b) << 12) | - (static_cast(c) << 6) | - static_cast(d); - - *out++ = static_cast(v >> 16); - *out++ = static_cast(v >> 8); - *out++ = static_cast(v); - - i += 4; - } - - // Handle remaining 2 or 3 characters - if (i + 3 == n) - { - std::uint8_t a = decode_table[static_cast(src[i])]; - std::uint8_t b = decode_table[static_cast(src[i + 1])]; - std::uint8_t c = decode_table[static_cast(src[i + 2])]; - - if ((a | b | c) & 0x80) - return -1; - - std::uint32_t v = - (static_cast(a) << 18) | - (static_cast(b) << 12) | - (static_cast(c) << 6); - - *out++ = static_cast(v >> 16); - *out++ = static_cast(v >> 8); - } - else if (i + 2 == n) - { - std::uint8_t a = decode_table[static_cast(src[i])]; - std::uint8_t b = decode_table[static_cast(src[i + 1])]; - - if ((a | b) & 0x80) - return -1; - - std::uint32_t v = - (static_cast(a) << 18) | - (static_cast(b) << 12); - - *out++ = static_cast(v >> 16); - } - else if (i + 1 == n) - { - // Single trailing character is invalid - return -1; - } - - return static_cast(out - dest); -} - -} // detail -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/base64.hpp b/src/bcrypt/base64.hpp deleted file mode 100644 index 841b5362..00000000 --- a/src/bcrypt/base64.hpp +++ /dev/null @@ -1,48 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_SRC_BCRYPT_BASE64_HPP -#define BOOST_CAPY_SRC_BCRYPT_BASE64_HPP - -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -// bcrypt uses a non-standard base64 alphabet: -// ./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789 - -// Encode binary data to bcrypt base64. -// Returns number of characters written to dest. -// dest must have space for ((n * 4) + 2) / 3 characters. -std::size_t -base64_encode( - char* dest, - std::uint8_t const* src, - std::size_t n); - -// Decode bcrypt base64 to binary. -// Returns number of bytes written to dest, or -1 on error. -// dest must have space for (n * 3) / 4 bytes. -int -base64_decode( - std::uint8_t* dest, - char const* src, - std::size_t n); - -} // detail -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/src/bcrypt/blowfish.cpp b/src/bcrypt/blowfish.cpp deleted file mode 100644 index 88f8df1c..00000000 --- a/src/bcrypt/blowfish.cpp +++ /dev/null @@ -1,478 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// -// Based on the OpenBSD implementation by Niels Provos. -// - -#include "blowfish.hpp" -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -namespace { - -// Initial P-array (first 18 32-bit values of the fractional part of pi) -constexpr std::uint32_t P_init[18] = { - 0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, - 0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89, - 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, - 0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, - 0x9216d5d9, 0x8979fb1b -}; - -// Initial S-boxes (more fractional bits of pi) -constexpr std::uint32_t S_init[4][256] = { - { - 0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, - 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99, - 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, - 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, - 0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, - 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, - 0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, - 0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e, - 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, - 0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, - 0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce, - 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, - 0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, - 0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677, - 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, - 0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, - 0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88, - 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, - 0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, - 0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0, - 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, - 0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, - 0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88, - 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, - 0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, - 0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d, - 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, - 0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, - 0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba, - 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, - 0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, - 0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09, - 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, - 0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, - 0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279, - 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, - 0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, - 0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82, - 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, - 0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, - 0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0, - 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, - 0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, - 0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8, - 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, - 0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, - 0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7, - 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, - 0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, - 0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1, - 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, - 0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, - 0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477, - 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, - 0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, - 0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af, - 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, - 0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, - 0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, - 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, - 0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, - 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915, - 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, - 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a - }, - { - 0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, - 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266, - 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, - 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, - 0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, - 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, - 0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, - 0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1, - 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, - 0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, - 0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff, - 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, - 0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, - 0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7, - 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, - 0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, - 0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf, - 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, - 0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, - 0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87, - 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, - 0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, - 0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16, - 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, - 0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, - 0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509, - 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, - 0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, - 0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f, - 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, - 0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, - 0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960, - 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, - 0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, - 0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802, - 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, - 0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, - 0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf, - 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, - 0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, - 0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50, - 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, - 0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, - 0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281, - 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, - 0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, - 0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128, - 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, - 0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, - 0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0, - 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, - 0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, - 0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3, - 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, - 0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, - 0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061, - 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, - 0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, - 0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, - 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, - 0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, - 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340, - 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, - 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7 - }, - { - 0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, - 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068, - 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, - 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, - 0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, - 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, - 0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, - 0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb, - 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, - 0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, - 0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42, - 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, - 0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, - 0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb, - 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, - 0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, - 0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33, - 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, - 0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, - 0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc, - 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, - 0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, - 0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b, - 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, - 0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, - 0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728, - 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, - 0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, - 0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37, - 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, - 0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, - 0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b, - 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, - 0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, - 0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d, - 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, - 0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, - 0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9, - 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, - 0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, - 0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d, - 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, - 0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, - 0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61, - 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, - 0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, - 0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2, - 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, - 0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, - 0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633, - 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, - 0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, - 0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52, - 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, - 0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, - 0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62, - 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, - 0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, - 0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, - 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, - 0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, - 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c, - 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, - 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0 - }, - { - 0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, - 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe, - 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, - 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, - 0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, - 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, - 0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, - 0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22, - 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, - 0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, - 0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9, - 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, - 0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, - 0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51, - 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, - 0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, - 0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b, - 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, - 0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, - 0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd, - 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, - 0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, - 0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb, - 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, - 0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, - 0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32, - 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, - 0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, - 0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae, - 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, - 0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, - 0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47, - 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, - 0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, - 0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84, - 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, - 0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, - 0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd, - 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, - 0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, - 0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38, - 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, - 0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, - 0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525, - 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, - 0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, - 0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964, - 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, - 0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, - 0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d, - 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, - 0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, - 0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02, - 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, - 0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, - 0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a, - 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, - 0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, - 0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, - 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, - 0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, - 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9, - 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, - 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6 - } -}; - -} // namespace - -void blowfish_init(blowfish_ctx& ctx) -{ - std::memcpy(ctx.P, P_init, sizeof(P_init)); - std::memcpy(ctx.S, S_init, sizeof(S_init)); -} - -inline std::uint32_t F(blowfish_ctx const& ctx, std::uint32_t x) -{ - std::uint32_t a = ctx.S[0][(x >> 24) & 0xFF]; - std::uint32_t b = ctx.S[1][(x >> 16) & 0xFF]; - std::uint32_t c = ctx.S[2][(x >> 8) & 0xFF]; - std::uint32_t d = ctx.S[3][x & 0xFF]; - return ((a + b) ^ c) + d; -} - -void blowfish_encrypt( - blowfish_ctx const& ctx, - std::uint32_t& L, - std::uint32_t& R) -{ - for (int i = 0; i < 16; i += 2) - { - L ^= ctx.P[i]; - R ^= F(ctx, L); - R ^= ctx.P[i + 1]; - L ^= F(ctx, R); - } - L ^= ctx.P[16]; - R ^= ctx.P[17]; - std::swap(L, R); -} - -void blowfish_expand_key( - blowfish_ctx& ctx, - std::uint8_t const* key, - std::size_t key_len) -{ - std::size_t j = 0; - - // XOR key into P-array - for (int i = 0; i < 18; ++i) - { - std::uint32_t data = 0; - for (int k = 0; k < 4; ++k) - { - data = (data << 8) | key[j]; - j = (j + 1) % key_len; - } - ctx.P[i] ^= data; - } - - // Encrypt all zeros, replace P and S - std::uint32_t L = 0, R = 0; - - for (int i = 0; i < 18; i += 2) - { - blowfish_encrypt(ctx, L, R); - ctx.P[i] = L; - ctx.P[i + 1] = R; - } - - for (int i = 0; i < 4; ++i) - { - for (int k = 0; k < 256; k += 2) - { - blowfish_encrypt(ctx, L, R); - ctx.S[i][k] = L; - ctx.S[i][k + 1] = R; - } - } -} - -void blowfish_expand_key_salt( - blowfish_ctx& ctx, - std::uint8_t const* key, - std::size_t key_len, - std::uint8_t const* salt, - std::size_t salt_len) -{ - std::size_t j = 0; - - // XOR key into P-array - for (int i = 0; i < 18; ++i) - { - std::uint32_t data = 0; - for (int k = 0; k < 4; ++k) - { - data = (data << 8) | key[j]; - j = (j + 1) % key_len; - } - ctx.P[i] ^= data; - } - - // Encrypt with salt XOR - std::uint32_t L = 0, R = 0; - j = 0; - - for (int i = 0; i < 18; i += 2) - { - // XOR salt into L and R - L ^= (static_cast(salt[(j + 0) % salt_len]) << 24) | - (static_cast(salt[(j + 1) % salt_len]) << 16) | - (static_cast(salt[(j + 2) % salt_len]) << 8) | - static_cast(salt[(j + 3) % salt_len]); - j = (j + 4) % salt_len; - - R ^= (static_cast(salt[(j + 0) % salt_len]) << 24) | - (static_cast(salt[(j + 1) % salt_len]) << 16) | - (static_cast(salt[(j + 2) % salt_len]) << 8) | - static_cast(salt[(j + 3) % salt_len]); - j = (j + 4) % salt_len; - - blowfish_encrypt(ctx, L, R); - ctx.P[i] = L; - ctx.P[i + 1] = R; - } - - for (int i = 0; i < 4; ++i) - { - for (int k = 0; k < 256; k += 2) - { - L ^= (static_cast(salt[(j + 0) % salt_len]) << 24) | - (static_cast(salt[(j + 1) % salt_len]) << 16) | - (static_cast(salt[(j + 2) % salt_len]) << 8) | - static_cast(salt[(j + 3) % salt_len]); - j = (j + 4) % salt_len; - - R ^= (static_cast(salt[(j + 0) % salt_len]) << 24) | - (static_cast(salt[(j + 1) % salt_len]) << 16) | - (static_cast(salt[(j + 2) % salt_len]) << 8) | - static_cast(salt[(j + 3) % salt_len]); - j = (j + 4) % salt_len; - - blowfish_encrypt(ctx, L, R); - ctx.S[i][k] = L; - ctx.S[i][k + 1] = R; - } - } -} - -void blowfish_encrypt_ecb( - blowfish_ctx const& ctx, - std::uint8_t* data, - std::size_t len) -{ - for (std::size_t i = 0; i < len; i += 8) - { - std::uint32_t L = - (static_cast(data[i]) << 24) | - (static_cast(data[i + 1]) << 16) | - (static_cast(data[i + 2]) << 8) | - static_cast(data[i + 3]); - - std::uint32_t R = - (static_cast(data[i + 4]) << 24) | - (static_cast(data[i + 5]) << 16) | - (static_cast(data[i + 6]) << 8) | - static_cast(data[i + 7]); - - blowfish_encrypt(ctx, L, R); - - data[i] = static_cast(L >> 24); - data[i + 1] = static_cast(L >> 16); - data[i + 2] = static_cast(L >> 8); - data[i + 3] = static_cast(L); - data[i + 4] = static_cast(R >> 24); - data[i + 5] = static_cast(R >> 16); - data[i + 6] = static_cast(R >> 8); - data[i + 7] = static_cast(R); - } -} - -} // detail -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/blowfish.hpp b/src/bcrypt/blowfish.hpp deleted file mode 100644 index 46def951..00000000 --- a/src/bcrypt/blowfish.hpp +++ /dev/null @@ -1,65 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// -// Based on the OpenBSD implementation by Niels Provos. -// - -#ifndef BOOST_CAPY_SRC_BCRYPT_BLOWFISH_HPP -#define BOOST_CAPY_SRC_BCRYPT_BLOWFISH_HPP - -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -// Blowfish context -struct blowfish_ctx -{ - std::uint32_t P[18]; - std::uint32_t S[4][256]; -}; - -// Initialize context with default P and S boxes -void blowfish_init(blowfish_ctx& ctx); - -// Expand key into context -void blowfish_expand_key( - blowfish_ctx& ctx, - std::uint8_t const* key, - std::size_t key_len); - -// Expand key with salt (for eksblowfish) -void blowfish_expand_key_salt( - blowfish_ctx& ctx, - std::uint8_t const* key, - std::size_t key_len, - std::uint8_t const* salt, - std::size_t salt_len); - -// Encrypt 8 bytes in place (big-endian) -void blowfish_encrypt( - blowfish_ctx const& ctx, - std::uint32_t& L, - std::uint32_t& R); - -// Encrypt data (must be multiple of 8 bytes) -void blowfish_encrypt_ecb( - blowfish_ctx const& ctx, - std::uint8_t* data, - std::size_t len); - -} // detail -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/src/bcrypt/crypt.cpp b/src/bcrypt/crypt.cpp deleted file mode 100644 index 042e960e..00000000 --- a/src/bcrypt/crypt.cpp +++ /dev/null @@ -1,207 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include "crypt.hpp" -#include "base64.hpp" -#include "blowfish.hpp" -#include "random.hpp" -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -namespace { - -// "OrpheanBeholderScryDoubt" - magic string for bcrypt -constexpr std::uint8_t magic_text[24] = { - 'O', 'r', 'p', 'h', 'e', 'a', 'n', 'B', - 'e', 'h', 'o', 'l', 'd', 'e', 'r', 'S', - 'c', 'r', 'y', 'D', 'o', 'u', 'b', 't' -}; - -char const* version_prefix(version ver) -{ - switch (ver) - { - case version::v2a: return "$2a$"; - case version::v2b: return "$2b$"; - default: return "$2b$"; - } -} - -} // namespace - -void generate_salt_bytes(std::uint8_t* salt) -{ - fill_random(salt, BCRYPT_SALT_LEN); -} - -std::size_t format_salt( - char* output, - std::uint8_t const* salt_bytes, - unsigned rounds, - version ver) -{ - char* p = output; - - // Version prefix - char const* prefix = version_prefix(ver); - std::size_t prefix_len = 4; - std::memcpy(p, prefix, prefix_len); - p += prefix_len; - - // Rounds (2 digits, zero-padded) - *p++ = static_cast('0' + (rounds / 10)); - *p++ = static_cast('0' + (rounds % 10)); - *p++ = '$'; - - // Salt (22 base64 characters) - std::size_t encoded = base64_encode(p, salt_bytes, BCRYPT_SALT_LEN); - p += encoded; - - return static_cast(p - output); -} - -bool parse_salt( - core::string_view salt_str, - version& ver, - unsigned& rounds, - std::uint8_t* salt_bytes) -{ - // Minimum: "$2a$XX$" + 22 chars = 29 - if (salt_str.size() < 29) - return false; - - char const* s = salt_str.data(); - - // Check prefix - if (s[0] != '$' || s[1] != '2') - return false; - - // Parse version - if (s[2] == 'a' && s[3] == '$') - ver = version::v2a; - else if (s[2] == 'b' && s[3] == '$') - ver = version::v2b; - else if (s[2] == 'y' && s[3] == '$') - ver = version::v2b; // treat $2y$ as $2b$ - else - return false; - - // Parse rounds - if (s[4] < '0' || s[4] > '9') - return false; - if (s[5] < '0' || s[5] > '9') - return false; - - rounds = static_cast((s[4] - '0') * 10 + (s[5] - '0')); - if (rounds < 4 || rounds > 31) - return false; - - if (s[6] != '$') - return false; - - // Decode salt (22 base64 chars -> 16 bytes) - int decoded = base64_decode(salt_bytes, s + 7, 22); - if (decoded != 16) - return false; - - return true; -} - -void bcrypt_hash( - char const* password, - std::size_t password_len, - std::uint8_t const* salt, - unsigned rounds, - std::uint8_t* hash) -{ - blowfish_ctx ctx; - - // Truncate password to 72 bytes (bcrypt limit) - // Include null terminator in hash - std::size_t key_len = std::min(password_len, std::size_t(72)); - - // Create key with null terminator - std::uint8_t key[73]; - std::memcpy(key, password, key_len); - key[key_len] = 0; - key_len++; - - // Initialize with default P and S boxes - blowfish_init(ctx); - - // Expensive key setup (eksblowfish) - blowfish_expand_key_salt(ctx, key, key_len, salt, BCRYPT_SALT_LEN); - - // 2^rounds iterations - std::uint64_t iterations = 1ULL << rounds; - for (std::uint64_t i = 0; i < iterations; ++i) - { - blowfish_expand_key(ctx, key, key_len); - blowfish_expand_key(ctx, salt, BCRYPT_SALT_LEN); - } - - // Encrypt magic text 64 times - std::uint8_t ctext[24]; - std::memcpy(ctext, magic_text, 24); - - for (int i = 0; i < 64; ++i) - { - blowfish_encrypt_ecb(ctx, ctext, 24); - } - - // Copy result (only 23 bytes are used in the final encoding) - std::memcpy(hash, ctext, 24); - - // Clear sensitive data - std::memset(&ctx, 0, sizeof(ctx)); - std::memset(key, 0, sizeof(key)); -} - -std::size_t format_hash( - char* output, - std::uint8_t const* salt_bytes, - std::uint8_t const* hash_bytes, - unsigned rounds, - version ver) -{ - char* p = output; - - // Format salt portion (29 chars) - p += format_salt(p, salt_bytes, rounds, ver); - - // Encode hash (23 bytes -> 31 base64 chars) - // Note: bcrypt only uses 23 of the 24 hash bytes - p += base64_encode(p, hash_bytes, 23); - - return static_cast(p - output); -} - -bool secure_compare( - std::uint8_t const* a, - std::uint8_t const* b, - std::size_t len) -{ - volatile std::uint8_t result = 0; - for (std::size_t i = 0; i < len; ++i) - { - result = static_cast(result | (a[i] ^ b[i])); - } - return result == 0; -} - -} // detail -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/crypt.hpp b/src/bcrypt/crypt.hpp deleted file mode 100644 index d515f8b2..00000000 --- a/src/bcrypt/crypt.hpp +++ /dev/null @@ -1,80 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_SRC_BCRYPT_CRYPT_HPP -#define BOOST_CAPY_SRC_BCRYPT_CRYPT_HPP - -#include -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -// bcrypt constants -constexpr std::size_t BCRYPT_SALT_LEN = 16; // 128-bit salt -constexpr std::size_t BCRYPT_HASH_LEN = 24; // 192-bit hash (23 bytes used) -constexpr std::size_t BCRYPT_SALT_OUTPUT_LEN = 29; // "$2b$XX$" + 22 base64 -constexpr std::size_t BCRYPT_HASH_OUTPUT_LEN = 60; // salt + 31 base64 - -// Generate random salt bytes -void generate_salt_bytes(std::uint8_t* salt); - -// Format salt string: "$2b$XX$<22 base64 chars>" -// Returns number of characters written (29) -std::size_t format_salt( - char* output, - std::uint8_t const* salt_bytes, - unsigned rounds, - version ver); - -// Parse salt string, extract version, rounds, and salt bytes -// Returns true on success -bool parse_salt( - core::string_view salt_str, - version& ver, - unsigned& rounds, - std::uint8_t* salt_bytes); - -// Core bcrypt hash function -// password: null-terminated password (max 72 bytes used) -// salt: 16 bytes -// rounds: cost factor (2^rounds iterations) -// hash: output buffer (24 bytes) -void bcrypt_hash( - char const* password, - std::size_t password_len, - std::uint8_t const* salt, - unsigned rounds, - std::uint8_t* hash); - -// Format complete hash string -// Returns number of characters written (60) -std::size_t format_hash( - char* output, - std::uint8_t const* salt_bytes, - std::uint8_t const* hash_bytes, - unsigned rounds, - version ver); - -// Constant-time comparison of hash bytes -bool secure_compare( - std::uint8_t const* a, - std::uint8_t const* b, - std::size_t len); - -} // detail -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/src/bcrypt/error.cpp b/src/bcrypt/error.cpp deleted file mode 100644 index caf23740..00000000 --- a/src/bcrypt/error.cpp +++ /dev/null @@ -1,58 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -const char* -error_cat_type:: -name() const noexcept -{ - return "boost.capy.bcrypt"; -} - -std::string -error_cat_type:: -message(int ev) const -{ - return message(ev, nullptr, 0); -} - -char const* -error_cat_type:: -message( - int ev, - char*, - std::size_t) const noexcept -{ - switch(static_cast(ev)) - { - case error::ok: return "success"; - case error::invalid_salt: return "invalid salt"; - case error::invalid_hash: return "invalid hash"; - default: - return "unknown"; - } -} - -#if defined(__cpp_constinit) && __cpp_constinit >= 201907L -constinit error_cat_type error_cat; -#else -error_cat_type error_cat; -#endif - -} // detail -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/hash.cpp b/src/bcrypt/hash.cpp deleted file mode 100644 index c8f87a0a..00000000 --- a/src/bcrypt/hash.cpp +++ /dev/null @@ -1,223 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include -#include -#include "base64.hpp" -#include "crypt.hpp" - -namespace boost { -namespace capy { -namespace bcrypt { - -result -gen_salt( - unsigned rounds, - version ver) -{ - // Validate preconditions - if (rounds < 4 || rounds > 31) - capy::detail::throw_invalid_argument("bcrypt rounds must be 4-31"); - - // Generate random salt - std::uint8_t salt_bytes[detail::BCRYPT_SALT_LEN]; - detail::generate_salt_bytes(salt_bytes); - - // Format salt string - result r; - std::size_t len = detail::format_salt( - r.buf(), - salt_bytes, - rounds, - ver); - - r.set_size(static_cast(len)); - return r; -} - -result -hash( - core::string_view password, - unsigned rounds, - version ver) -{ - // Validate preconditions - if (rounds < 4 || rounds > 31) - capy::detail::throw_invalid_argument("bcrypt rounds must be 4-31"); - - // Generate random salt - std::uint8_t salt_bytes[detail::BCRYPT_SALT_LEN]; - detail::generate_salt_bytes(salt_bytes); - - // Hash password - std::uint8_t hash_bytes[detail::BCRYPT_HASH_LEN]; - detail::bcrypt_hash( - password.data(), - password.size(), - salt_bytes, - rounds, - hash_bytes); - - // Format output - result r; - std::size_t len = detail::format_hash( - r.buf(), - salt_bytes, - hash_bytes, - rounds, - ver); - - r.set_size(static_cast(len)); - return r; -} - -result -hash( - core::string_view password, - core::string_view salt, - system::error_code& ec) -{ - ec = {}; - - // Parse salt - version ver; - unsigned rounds; - std::uint8_t salt_bytes[detail::BCRYPT_SALT_LEN]; - - if (!detail::parse_salt(salt, ver, rounds, salt_bytes)) - { - ec = make_error_code(error::invalid_salt); - return result{}; - } - - // Hash password - std::uint8_t hash_bytes[detail::BCRYPT_HASH_LEN]; - detail::bcrypt_hash( - password.data(), - password.size(), - salt_bytes, - rounds, - hash_bytes); - - // Format output - result r; - std::size_t len = detail::format_hash( - r.buf(), - salt_bytes, - hash_bytes, - rounds, - ver); - - r.set_size(static_cast(len)); - return r; -} - -bool -compare( - core::string_view password, - core::string_view hash_str, - system::error_code& ec) -{ - ec = {}; - - // Parse hash to extract salt - version ver; - unsigned rounds; - std::uint8_t salt_bytes[detail::BCRYPT_SALT_LEN]; - - if (!detail::parse_salt(hash_str, ver, rounds, salt_bytes)) - { - ec = make_error_code(error::invalid_hash); - return false; - } - - // Validate hash length - if (hash_str.size() != detail::BCRYPT_HASH_OUTPUT_LEN) - { - ec = make_error_code(error::invalid_hash); - return false; - } - - // Decode stored hash (31 base64 chars starting at position 29) - std::uint8_t stored_hash[detail::BCRYPT_HASH_LEN]; - int decoded = detail::base64_decode( - stored_hash, - hash_str.data() + 29, - 31); - - if (decoded < 0) - { - ec = make_error_code(error::invalid_hash); - return false; - } - - // Compute hash of provided password - std::uint8_t computed_hash[detail::BCRYPT_HASH_LEN]; - detail::bcrypt_hash( - password.data(), - password.size(), - salt_bytes, - rounds, - computed_hash); - - // Constant-time comparison (only first 23 bytes are used) - return detail::secure_compare(stored_hash, computed_hash, 23); -} - -unsigned -get_rounds( - core::string_view hash_str, - system::error_code& ec) -{ - ec = {}; - - // Minimum length check - if (hash_str.size() < 7) - { - ec = make_error_code(error::invalid_hash); - return 0; - } - - char const* s = hash_str.data(); - - // Check prefix - if (s[0] != '$' || s[1] != '2') - { - ec = make_error_code(error::invalid_hash); - return 0; - } - - // Check version character - if ((s[2] != 'a' && s[2] != 'b' && s[2] != 'y') || s[3] != '$') - { - ec = make_error_code(error::invalid_hash); - return 0; - } - - // Parse rounds - if (s[4] < '0' || s[4] > '9' || s[5] < '0' || s[5] > '9') - { - ec = make_error_code(error::invalid_hash); - return 0; - } - - unsigned rounds = static_cast((s[4] - '0') * 10 + (s[5] - '0')); - if (rounds < 4 || rounds > 31) - { - ec = make_error_code(error::invalid_hash); - return 0; - } - - return rounds; -} - -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/random.cpp b/src/bcrypt/random.cpp deleted file mode 100644 index a36f96ea..00000000 --- a/src/bcrypt/random.cpp +++ /dev/null @@ -1,185 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include "random.hpp" -#include -#include - -#if defined(_WIN32) -# ifndef WIN32_LEAN_AND_MEAN -# define WIN32_LEAN_AND_MEAN -# endif -# include -# include -# ifdef _MSC_VER -# pragma comment(lib, "bcrypt.lib") -# endif -#elif defined(__linux__) -# include -#elif defined(__APPLE__) -# include -#else -# include -# include -#endif - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -#if defined(_WIN32) - -namespace { - -class rng_provider -{ - BCRYPT_ALG_HANDLE h_ = nullptr; - -public: - rng_provider() - { - NTSTATUS status = BCryptOpenAlgorithmProvider( - &h_, - BCRYPT_RNG_ALGORITHM, - nullptr, - 0); - if (!BCRYPT_SUCCESS(status)) - h_ = nullptr; - } - - ~rng_provider() - { - if (h_) - BCryptCloseAlgorithmProvider(h_, 0); - } - - rng_provider(rng_provider const&) = delete; - rng_provider& operator=(rng_provider const&) = delete; - - bool generate(void* buf, std::size_t n) const - { - if (!h_) - return false; - NTSTATUS status = BCryptGenRandom( - h_, - static_cast(buf), - static_cast(n), - 0); - return BCRYPT_SUCCESS(status); - } -}; - -rng_provider& get_rng() -{ - static rng_provider rng; - return rng; -} - -} // namespace - -void -fill_random(void* buf, std::size_t n) -{ - if (!get_rng().generate(buf, n)) - { - capy::detail::throw_system_error( - system::error_code( - static_cast(GetLastError()), - system::system_category())); - } -} - -#elif defined(__linux__) - -void -fill_random(void* buf, std::size_t n) -{ - auto* p = static_cast(buf); - while (n > 0) - { - ssize_t r = getrandom(p, n, 0); - if (r < 0) - { - if (errno == EINTR) - continue; - capy::detail::throw_system_error( - system::error_code( - errno, - system::system_category())); - } - p += r; - n -= static_cast(r); - } -} - -#elif defined(__APPLE__) - -void -fill_random(void* buf, std::size_t n) -{ - int err = SecRandomCopyBytes(kSecRandomDefault, n, buf); - if (err != errSecSuccess) - { - capy::detail::throw_system_error( - system::error_code( - err, - system::system_category())); - } -} - -#else - -// Fallback: /dev/urandom -void -fill_random(void* buf, std::size_t n) -{ - static int fd = -1; - if (fd < 0) - { - fd = open("/dev/urandom", O_RDONLY | O_CLOEXEC); - if (fd < 0) - { - capy::detail::throw_system_error( - system::error_code( - errno, - system::system_category())); - } - } - - auto* p = static_cast(buf); - while (n > 0) - { - ssize_t r = read(fd, p, n); - if (r < 0) - { - if (errno == EINTR) - continue; - capy::detail::throw_system_error( - system::error_code( - errno, - system::system_category())); - } - if (r == 0) - { - capy::detail::throw_runtime_error( - "unexpected EOF from /dev/urandom"); - } - p += r; - n -= static_cast(r); - } -} - -#endif - -} // detail -} // bcrypt -} // capy -} // boost - diff --git a/src/bcrypt/random.hpp b/src/bcrypt/random.hpp deleted file mode 100644 index d5cdbeb5..00000000 --- a/src/bcrypt/random.hpp +++ /dev/null @@ -1,32 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#ifndef BOOST_CAPY_SRC_BCRYPT_RANDOM_HPP -#define BOOST_CAPY_SRC_BCRYPT_RANDOM_HPP - -#include -#include - -namespace boost { -namespace capy { -namespace bcrypt { -namespace detail { - -// Fill buffer with cryptographically secure random bytes. -// Throws system_error on failure. -void -fill_random(void* buf, std::size_t n); - -} // detail -} // bcrypt -} // capy -} // boost - -#endif - diff --git a/test/unit/bcrypt.cpp b/test/unit/bcrypt.cpp deleted file mode 100644 index 935cc35e..00000000 --- a/test/unit/bcrypt.cpp +++ /dev/null @@ -1,291 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie.falco@gmail.com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -#include - -#include "test_helpers.hpp" - -namespace boost { -namespace capy { - -struct bcrypt_test -{ - void - test_error_code() - { - // Test error codes can be created - system::error_code ec1 = bcrypt::make_error_code(bcrypt::error::ok); - BOOST_TEST(! ec1.failed()); - - system::error_code ec2 = bcrypt::make_error_code(bcrypt::error::invalid_salt); - BOOST_TEST(ec2.failed()); - BOOST_TEST(ec2.message() == "invalid salt"); - - system::error_code ec3 = bcrypt::make_error_code(bcrypt::error::invalid_hash); - BOOST_TEST(ec3.failed()); - BOOST_TEST(ec3.message() == "invalid hash"); - } - - void - test_result() - { - // Default construction - bcrypt::result r; - BOOST_TEST(r.empty()); - BOOST_TEST(r.size() == 0); - BOOST_TEST(! r); - - // After hashing - r = bcrypt::hash("password", 4); - BOOST_TEST(! r.empty()); - BOOST_TEST(r.size() == 60); - BOOST_TEST(static_cast(r)); - BOOST_TEST(r.c_str()[60] == '\0'); - } - - void - test_gen_salt() - { - // Default rounds (10) - bcrypt::result r = bcrypt::gen_salt(); - BOOST_TEST(r.size() == 29); - BOOST_TEST(r.str().substr(0, 4) == "$2b$"); - BOOST_TEST(r.str().substr(4, 2) == "10"); - - // Custom rounds - r = bcrypt::gen_salt(12); - BOOST_TEST(r.str().substr(4, 2) == "12"); - - // Version 2a - r = bcrypt::gen_salt(10, bcrypt::version::v2a); - BOOST_TEST(r.str().substr(0, 4) == "$2a$"); - - // Different salts each time - bcrypt::result r1 = bcrypt::gen_salt(4); - bcrypt::result r2 = bcrypt::gen_salt(4); - BOOST_TEST(r1.str() != r2.str()); - } - - void - test_hash_with_rounds() - { - // Basic hash - bcrypt::result r = bcrypt::hash("password", 4); - BOOST_TEST(r.size() == 60); - BOOST_TEST(r.str().substr(0, 7) == "$2b$04$"); - - // Different passwords produce different hashes - bcrypt::result r1 = bcrypt::hash("password1", 4); - bcrypt::result r2 = bcrypt::hash("password2", 4); - BOOST_TEST(r1.str() != r2.str()); - - // Same password with different salts produces different hashes - r1 = bcrypt::hash("password", 4); - r2 = bcrypt::hash("password", 4); - BOOST_TEST(r1.str() != r2.str()); - } - - void - test_hash_with_salt() - { - bcrypt::result salt = bcrypt::gen_salt(4); - - // Generate salt, then hash - { - system::error_code ec; - bcrypt::result h = bcrypt::hash("password", salt.str(), ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(h.size() == 60); - } - - // Same password + salt = same hash - { - system::error_code ec1; - bcrypt::result hash1 = bcrypt::hash("password", salt.str(), ec1); - BOOST_TEST(! ec1.failed()); - - system::error_code ec2; - bcrypt::result hash2 = bcrypt::hash("password", salt.str(), ec2); - BOOST_TEST(! ec2.failed()); - - BOOST_TEST(hash1.str() == hash2.str()); - } - - // Invalid salt - { - system::error_code ec; - bcrypt::result h = bcrypt::hash("password", "invalid", ec); - BOOST_TEST(ec == bcrypt::error::invalid_salt); - BOOST_TEST(h.empty()); - } - - // Malformed salt - { - system::error_code ec; - bcrypt::result h = bcrypt::hash("password", "$2b$04$", ec); - BOOST_TEST(ec == bcrypt::error::invalid_salt); - BOOST_TEST(h.empty()); - } - } - - void - test_compare() - { - bcrypt::result r = bcrypt::hash("correct_password", 4); - - // Correct password - { - system::error_code ec; - bool match = bcrypt::compare("correct_password", r.str(), ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(match); - } - - // Wrong password - { - system::error_code ec; - bool match = bcrypt::compare("wrong_password", r.str(), ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(! match); - } - - // Empty password (should not match) - { - system::error_code ec; - bool match = bcrypt::compare("", r.str(), ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(! match); - } - - // Invalid hash - { - system::error_code ec; - bool match = bcrypt::compare("password", "invalid", ec); - BOOST_TEST(ec == bcrypt::error::invalid_hash); - BOOST_TEST(! match); - } - - // Malformed hash (wrong length) - { - system::error_code ec; - bool match = bcrypt::compare("password", "$2b$04$abcdefghij", ec); - BOOST_TEST(ec == bcrypt::error::invalid_hash); - BOOST_TEST(! match); - } - } - - void - test_get_rounds() - { - // Valid hash - { - system::error_code ec; - unsigned rounds = bcrypt::get_rounds( - "$2b$12$abcdefghijklmnopqrstuuxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(rounds == 12); - } - - // Different versions - { - system::error_code ec; - unsigned rounds = bcrypt::get_rounds( - "$2a$10$abcdefghijklmnopqrstuuxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", ec); - BOOST_TEST(! ec.failed()); - BOOST_TEST(rounds == 10); - } - - // Invalid format - { - system::error_code ec; - unsigned rounds = bcrypt::get_rounds("invalid", ec); - BOOST_TEST(ec == bcrypt::error::invalid_hash); - BOOST_TEST(rounds == 0); - } - - // Missing prefix - { - system::error_code ec; - unsigned rounds = bcrypt::get_rounds("2b$10$abc", ec); - BOOST_TEST(ec == bcrypt::error::invalid_hash); - BOOST_TEST(rounds == 0); - } - } - - void - test_known_vectors() - { - // Test vectors verified against reference implementations - - // U*U with all-C salt - { - system::error_code ec; - BOOST_TEST(bcrypt::compare("U*U", - "$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW", ec)); - BOOST_TEST(! ec.failed()); - } - - // Empty password - { - system::error_code ec; - BOOST_TEST(bcrypt::compare("", - "$2a$06$DCq7YPn5Rq63x1Lad4cll.TV4S6ytwfsfvkgY8jIucDrjc8deX1s.", ec)); - BOOST_TEST(! ec.failed()); - } - - // Test that wrong password fails - { - system::error_code ec; - BOOST_TEST(! bcrypt::compare("wrong", - "$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW", ec)); - BOOST_TEST(! ec.failed()); - } - } - - void - test_password_truncation() - { - // bcrypt truncates passwords to 72 bytes - std::string long_pw(100, 'a'); - std::string truncated_pw(72, 'a'); - - bcrypt::result salt = bcrypt::gen_salt(4); - - system::error_code ec1; - bcrypt::result r1 = bcrypt::hash(long_pw, salt.str(), ec1); - BOOST_TEST(! ec1.failed()); - - system::error_code ec2; - bcrypt::result r2 = bcrypt::hash(truncated_pw, salt.str(), ec2); - BOOST_TEST(! ec2.failed()); - - // Both should produce the same hash - BOOST_TEST(r1.str() == r2.str()); - } - - void - run() - { - test_error_code(); - test_result(); - test_gen_salt(); - test_hash_with_rounds(); - test_hash_with_salt(); - test_compare(); - test_get_rounds(); - test_known_vectors(); - test_password_truncation(); - } -}; - -TEST_SUITE(bcrypt_test, "boost.capy.bcrypt"); - -} // capy -} // boost - diff --git a/test/unit/bcrypt/error.cpp b/test/unit/bcrypt/error.cpp deleted file mode 100644 index 52fdebbf..00000000 --- a/test/unit/bcrypt/error.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -// Test that header file is self-contained. -#include diff --git a/test/unit/bcrypt/hash.cpp b/test/unit/bcrypt/hash.cpp deleted file mode 100644 index a9f5e17e..00000000 --- a/test/unit/bcrypt/hash.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -// Test that header file is self-contained. -#include diff --git a/test/unit/bcrypt/result.cpp b/test/unit/bcrypt/result.cpp deleted file mode 100644 index 9930ff7c..00000000 --- a/test/unit/bcrypt/result.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -// Test that header file is self-contained. -#include diff --git a/test/unit/bcrypt/version.cpp b/test/unit/bcrypt/version.cpp deleted file mode 100644 index ca23d0d6..00000000 --- a/test/unit/bcrypt/version.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// -// Copyright (c) 2025 Vinnie Falco (vinnie dot falco at gmail dot com) -// -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// -// Official repository: https://github.com/cppalliance/capy -// - -// Test that header file is self-contained. -#include diff --git a/test/unit/ex/get_stop_token.cpp b/test/unit/ex/get_stop_token.cpp index 3d3e357f..2d36af16 100644 --- a/test/unit/ex/get_stop_token.cpp +++ b/test/unit/ex/get_stop_token.cpp @@ -15,8 +15,6 @@ namespace boost { namespace capy { -#if BOOST_CAPY_HAS_STOP_TOKEN - struct get_stop_token_test { void @@ -50,7 +48,5 @@ TEST_SUITE( get_stop_token_test, "boost.capy.ex.get_stop_token"); -#endif // BOOST_CAPY_HAS_STOP_TOKEN - } // namespace capy } // namespace boost diff --git a/test/unit/ex/run_async.cpp b/test/unit/ex/run_async.cpp index 5ef0a99f..904f3dbd 100644 --- a/test/unit/ex/run_async.cpp +++ b/test/unit/ex/run_async.cpp @@ -323,7 +323,6 @@ struct run_async_test // Stop Token //---------------------------------------------------------- -#if BOOST_CAPY_HAS_STOP_TOKEN static task check_stop_requested() { @@ -362,7 +361,6 @@ struct run_async_test BOOST_TEST(result); } -#endif //---------------------------------------------------------- // Sync Dispatcher @@ -577,10 +575,8 @@ struct run_async_test testOverloadedHandlerException(); // Stop Token -#if BOOST_CAPY_HAS_STOP_TOKEN testStopTokenPropagation(); testCancellationVisible(); -#endif // Sync Dispatcher testSyncDispatcherBasic(); diff --git a/test/unit/ex/stop_token_support.cpp b/test/unit/ex/stop_token_support.cpp index f42be1f7..0a2a6ed5 100644 --- a/test/unit/ex/stop_token_support.cpp +++ b/test/unit/ex/stop_token_support.cpp @@ -19,8 +19,6 @@ namespace boost { namespace capy { -#if BOOST_CAPY_HAS_STOP_TOKEN - struct test_coro { struct promise_type : stop_token_support @@ -199,7 +197,5 @@ TEST_SUITE( stop_token_support_test, "boost.capy.ex.stop_token_support"); -#endif // BOOST_CAPY_HAS_STOP_TOKEN - } // namespace capy } // namespace boost diff --git a/test/unit/task.cpp b/test/unit/task.cpp index a4c5ed18..c9c78e35 100644 --- a/test/unit/task.cpp +++ b/test/unit/task.cpp @@ -1583,7 +1583,6 @@ struct task_test // get_stop_token() tests //------------------------------------------------------ -#if BOOST_CAPY_HAS_STOP_TOKEN static task task_checks_stop_token() { @@ -1769,7 +1768,6 @@ struct task_test // Clean up - task completed, destroy the handle h.destroy(); } -#endif // BOOST_CAPY_HAS_STOP_TOKEN void run() @@ -1828,7 +1826,6 @@ struct task_test // testDeallocationCount(); // testFrameAllocationOrder(); -#if BOOST_CAPY_HAS_STOP_TOKEN // get_stop_token() tests testGetStopTokenBasic(); testGetStopTokenWithSource(); @@ -1836,7 +1833,6 @@ struct task_test testGetStopTokenInLoop(); testGetStopTokenMultipleCalls(); testStopTokenReceivesStopSignal(); -#endif } }; diff --git a/test/unit/when_all.cpp b/test/unit/when_all.cpp index 2b6199d4..a989e6d0 100644 --- a/test/unit/when_all.cpp +++ b/test/unit/when_all.cpp @@ -741,7 +741,6 @@ struct when_all_test // Stoppable awaitable protocol tests //---------------------------------------------------------- -#if BOOST_CAPY_HAS_STOP_TOKEN // Test: when_all returns task which satisfies IoAwaitable concept void testIoAwaitableConcept() @@ -797,7 +796,6 @@ struct when_all_test BOOST_TEST(caught_exception); } -#endif void run() @@ -835,10 +833,8 @@ struct when_all_test testDeferredAwait(); // Stoppable awaitable protocol -#if BOOST_CAPY_HAS_STOP_TOKEN testIoAwaitableConcept(); testNestedWhenAllStopPropagation(); -#endif // Frame allocator tests - skipped: allocator is currently ignored per design // testWhenAllUsesAllocator();