Skip to content
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

Use modern openssl functions #264

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use modern openssl functions #264

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1925623
use BN_check_prime instead of BN_is_prime_ex
cnt0 Dec 31, 2024
696af9a
replace SHA* functions with EVP api
cnt0 Dec 31, 2024
52a858f
replace EVP_DigestFinal with EVP_DigestFinal_ex
cnt0 Jan 5, 2025
2719b63
ensure that ShaImpl is called with at least 1 arg
cnt0 Jan 5, 2025
f844b9b
replace EVP_MD_fetch with EVP_sha* functions
cnt0 Jan 5, 2025
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
133 changes: 36 additions & 97 deletions base/openssl_help.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,7 @@ class BigNum {
if (failed() || !_data) {
return false;
}
constexpr auto kMillerRabinIterationCount = 64;
const auto result = BN_is_prime_ex(
raw(),
kMillerRabinIterationCount,
context.raw(),
nullptr);
const auto result = BN_check_prime(raw(), context.raw(), nullptr);
if (result == 1) {
return true;
} else if (result != 0) {
Expand Down Expand Up @@ -452,62 +447,39 @@ class BigNum {

namespace details {

template <typename Context, typename Method, typename Arg>
inline void ShaUpdate(Context context, Method method, Arg &&arg) {
const auto span = bytes::make_span(arg);
method(context, span.data(), span.size());
}
template <
typename ...Args,
typename = std::enable_if_t<(sizeof...(Args) >= 1)>>
void ShaImpl(bytes::span dst, auto md, Args &&...args) {
Expects(dst.size() >= EVP_MD_size(md));

template <typename Context, typename Method, typename Arg, typename ...Args>
inline void ShaUpdate(Context context, Method method, Arg &&arg, Args &&...args) {
const auto span = bytes::make_span(arg);
method(context, span.data(), span.size());
ShaUpdate(context, method, args...);
}
EVP_MD_CTX *mdctx = EVP_MD_CTX_create();
if constexpr (sizeof...(args) == 1) {
EVP_MD_CTX_set_flags(mdctx, EVP_MD_CTX_FLAG_ONESHOT);
}

template <size_type Size, typename Method>
inline void Sha(
bytes::span dst,
Method method,
bytes::const_span data) {
Expects(dst.size() >= Size);
EVP_DigestInit_ex(mdctx, md, nullptr);

method(
reinterpret_cast<const unsigned char*>(data.data()),
data.size(),
reinterpret_cast<unsigned char*>(dst.data()));
const auto update = [&mdctx](auto &&arg) {
const auto span = bytes::const_span(arg);
EVP_DigestUpdate(mdctx, arg.data(), arg.size());
};
(update(args), ...);

EVP_DigestFinal_ex(mdctx, reinterpret_cast<unsigned char*>(dst.data()), nullptr);
EVP_MD_CTX_free(mdctx);
}

template <size_type Size, typename Method>
[[nodiscard]] inline bytes::vector Sha(
Method method,
bytes::const_span data) {
auto bytes = bytes::vector(Size);
Sha<Size>(bytes, method, data);
return bytes;
inline void ShaTo(bytes::span dst, auto md, bytes::const_span data) {
Expects(dst.size() >= EVP_MD_size(md));
details::ShaImpl(dst, md, data);
}

template <
size_type Size,
typename Context,
typename Init,
typename Update,
typename Finalize,
typename ...Args,
typename = std::enable_if_t<(sizeof...(Args) > 1)>>
[[nodiscard]] bytes::vector Sha(
Context context,
Init init,
Update update,
Finalize finalize,
Args &&...args) {
auto bytes = bytes::vector(Size);

init(&context);
ShaUpdate(&context, update, args...);
finalize(reinterpret_cast<unsigned char*>(bytes.data()), &context);

return bytes;
template <typename ...Args>
[[nodiscard]] inline bytes::vector Sha(auto md, Args &&...args) {
bytes::vector dst(EVP_MD_size(md));
details::ShaImpl(dst, md, args...);
return dst;
}

template <
Expand Down Expand Up @@ -537,64 +509,31 @@ constexpr auto kSha1Size = size_type(SHA_DIGEST_LENGTH);
constexpr auto kSha256Size = size_type(SHA256_DIGEST_LENGTH);
constexpr auto kSha512Size = size_type(SHA512_DIGEST_LENGTH);

[[nodiscard]] inline bytes::vector Sha1(bytes::const_span data) {
return details::Sha<kSha1Size>(SHA1, data);
}

inline void Sha1To(bytes::span dst, bytes::const_span data) {
details::Sha<kSha1Size>(dst, SHA1, data);
details::ShaTo(dst, EVP_sha1(), data);
}

template <
typename ...Args,
typename = std::enable_if_t<(sizeof...(Args) > 1)>>
template <typename ...Args>
[[nodiscard]] inline bytes::vector Sha1(Args &&...args) {
return details::Sha<kSha1Size>(
SHA_CTX(),
SHA1_Init,
SHA1_Update,
SHA1_Final,
args...);
}

[[nodiscard]] inline bytes::vector Sha256(bytes::const_span data) {
return details::Sha<kSha256Size>(SHA256, data);
return details::Sha(EVP_sha1(), args...);
}

inline void Sha256To(bytes::span dst, bytes::const_span data) {
details::Sha<kSha256Size>(dst, SHA256, data);
details::ShaTo(dst, EVP_sha256(), data);
}

template <
typename ...Args,
typename = std::enable_if_t<(sizeof...(Args) > 1)>>
template <typename ...Args>
[[nodiscard]] inline bytes::vector Sha256(Args &&...args) {
return details::Sha<kSha256Size>(
SHA256_CTX(),
SHA256_Init,
SHA256_Update,
SHA256_Final,
args...);
}

[[nodiscard]] inline bytes::vector Sha512(bytes::const_span data) {
return details::Sha<kSha512Size>(SHA512, data);
return details::Sha(EVP_sha256(), args...);
}

inline void Sha512To(bytes::span dst, bytes::const_span data) {
details::Sha<kSha512Size>(dst, SHA512, data);
details::ShaTo(dst, EVP_sha512(), data);
}

template <
typename ...Args,
typename = std::enable_if_t<(sizeof...(Args) > 1)>>
template <typename ...Args>
[[nodiscard]] inline bytes::vector Sha512(Args &&...args) {
return details::Sha<kSha512Size>(
SHA512_CTX(),
SHA512_Init,
SHA512_Update,
SHA512_Final,
args...);
return details::Sha(EVP_sha512(), args...);
}

inline bytes::vector Pbkdf2Sha512(
Expand Down