Skip to content

Fixes enum class #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
owent merged 2 commits into from
Apr 23, 2026
Merged

Fixes enum class #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
529b4f1
Fixes enum class
owent Apr 23, 2026
e40b56e
Fixes include
owent Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atframework/cmake-toolset
Open in desktop
Submodule cmake-toolset updated from 2f05a0 to 0d9385
73 changes: 52 additions & 21 deletions include/algorithm/crypto_cipher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,30 @@ struct cipher_interface_info_t;

class cipher {
public:
struct ATFRAMEWORK_UTILS_API mode_t {
enum type { EN_CMODE_ENCRYPT = 0x01, EN_CMODE_DECRYPT = 0x02 };
enum class mode_t : int32_t {
kEncrypt = 0x01,
kDecrypt = 0x02,
};

// Allow `mode_t::kEncrypt | mode_t::kDecrypt` and similar bitmask usage; result is `int32_t`
// because callers (e.g., `init(int32_t mode)`) take a plain int32_t mask.
friend constexpr int32_t operator|(mode_t lhs, mode_t rhs) noexcept {
return static_cast<int32_t>(lhs) | static_cast<int32_t>(rhs);
}
friend constexpr int32_t operator|(int32_t lhs, mode_t rhs) noexcept { return lhs | static_cast<int32_t>(rhs); }
friend constexpr int32_t operator|(mode_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) | rhs; }

friend constexpr int32_t operator&(mode_t lhs, mode_t rhs) noexcept {
return static_cast<int32_t>(lhs) & static_cast<int32_t>(rhs);
}
friend constexpr int32_t operator&(int32_t lhs, mode_t rhs) noexcept { return lhs & static_cast<int32_t>(rhs); }
friend constexpr int32_t operator&(mode_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) & rhs; }

friend constexpr bool operator==(int32_t lhs, mode_t rhs) noexcept { return lhs == static_cast<int32_t>(rhs); }
friend constexpr bool operator==(mode_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) == rhs; }
friend constexpr bool operator!=(int32_t lhs, mode_t rhs) noexcept { return lhs != static_cast<int32_t>(rhs); }
friend constexpr bool operator!=(mode_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) != rhs; }

enum iv_roll_policy_t : uint8_t {
IV_ROLL_NONE = 0,
IV_ROLL_AEAD_INC1_BE,
Expand Down Expand Up @@ -85,30 +105,41 @@ class cipher {
};
# endif

struct ATFRAMEWORK_UTILS_API error_code_t {
enum type {
OK = 0,
INVALID_PARAM = -1,
NOT_INITED = -2,
ALREADY_INITED = -3,
MALLOC = -4,
CIPHER_DISABLED = -11,
CIPHER_NOT_SUPPORT = -12,
CIPHER_OPERATION = -13,
CIPHER_OPERATION_SET_IV = -14,
LIBSODIUM_OPERATION = -15,
LIBSODIUM_OPERATION_TAG_LEN = -16,
MUST_CALL_AEAD_API = -21,
MUST_NOT_CALL_AEAD_API = -22,
};
enum class error_code_t : int32_t {
kOk = 0,
kInvalidParam = -1,
kNotInited = -2,
kAlreadyInited = -3,
kMalloc = -4,
kCipherDisabled = -11,
kCipherNotSupport = -12,
kCipherOperation = -13,
kCipherOperationSetIv = -14,
kLibsodiumOperation = -15,
kLibsodiumOperationTagLen = -16,
kMustCallAeadApi = -21,
kMustNotCallAeadApi = -22,
};

// Comparison operators with int32_t (legacy callers compare against 0).
friend constexpr bool operator==(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) == rhs; }
friend constexpr bool operator==(int32_t lhs, error_code_t rhs) noexcept { return lhs == static_cast<int32_t>(rhs); }
friend constexpr bool operator!=(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) != rhs; }
friend constexpr bool operator!=(int32_t lhs, error_code_t rhs) noexcept { return lhs != static_cast<int32_t>(rhs); }
friend constexpr bool operator<(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) < rhs; }
friend constexpr bool operator<(int32_t lhs, error_code_t rhs) noexcept { return lhs < static_cast<int32_t>(rhs); }
friend constexpr bool operator<=(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) <= rhs; }
friend constexpr bool operator<=(int32_t lhs, error_code_t rhs) noexcept { return lhs <= static_cast<int32_t>(rhs); }
friend constexpr bool operator>(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) > rhs; }
friend constexpr bool operator>(int32_t lhs, error_code_t rhs) noexcept { return lhs > static_cast<int32_t>(rhs); }
friend constexpr bool operator>=(error_code_t lhs, int32_t rhs) noexcept { return static_cast<int32_t>(lhs) >= rhs; }
friend constexpr bool operator>=(int32_t lhs, error_code_t rhs) noexcept { return lhs >= static_cast<int32_t>(rhs); }

public:
ATFRAMEWORK_UTILS_API cipher();
ATFRAMEWORK_UTILS_API ~cipher();

ATFRAMEWORK_UTILS_API int init(nostd::string_view name,
int mode = mode_t::EN_CMODE_ENCRYPT | mode_t::EN_CMODE_DECRYPT);
ATFRAMEWORK_UTILS_API int init(nostd::string_view name, int32_t mode = mode_t::kEncrypt | mode_t::kDecrypt);
ATFRAMEWORK_UTILS_API int close();

/**
Expand Down Expand Up @@ -263,7 +294,7 @@ class cipher {
static ATFRAMEWORK_UTILS_API int cleanup_global_algorithm();

private:
int init_with_cipher(const cipher_interface_info_t *, int mode);
int init_with_cipher(const cipher_interface_info_t *, int32_t mode);
int close_with_cipher();

private:
Expand Down
Loading
Loading