mirrors/cpp-httplib
1
0
Fork 0
mirror of https://github.com/yhirose/cpp-httplib.git synced 2025-05-10 01:33:53 +00:00
Code Issues Projects Releases Wiki Activity

replace deprecated OpenSSL functions with evp functions (#1241)

Browse Source
This commit is contained in:
Kotarou 2022-04-12 01:40:58 +08:00 committed by GitHub
parent 020b0db090
commit 0857eba17b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
httplib.h
View File

@ -227,7 +227,7 @@ using socket_t = int;
#endif #endif
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/md5.h> #include <openssl/evp.h>
#include <openssl/ssl.h> #include <openssl/ssl.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
@ -4146,36 +4146,36 @@ inline bool has_crlf(const char *s) {
} }
#ifdef CPPHTTPLIB_OPENSSL_SUPPORT #ifdef CPPHTTPLIB_OPENSSL_SUPPORT
template <typename CTX, typename Init, typename Update, typename Final> inline std::string message_digest(const std::string &s, const EVP_MD *algo) {
inline std::string message_digest(const std::string &s, Init init, auto context = std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)>
Update update, Final final, (EVP_MD_CTX_new(), EVP_MD_CTX_free);
size_t digest_length) {
std::vector<unsigned char> md(digest_length, 0); unsigned int hash_length = 0;
CTX ctx; unsigned char hash[EVP_MAX_MD_SIZE];
init(&ctx);
update(&ctx, s.data(), s.size()); EVP_DigestInit_ex(context.get(), algo, nullptr);
final(md.data(), &ctx); EVP_DigestUpdate(context.get(), s.c_str(), s.size());
EVP_DigestFinal_ex(context.get(), hash, &hash_length);
std::stringstream ss; std::stringstream ss;
for (auto c : md) { for (auto i = 0u; i < hash_length; ++i) {
ss << std::setfill('0') << std::setw(2) << std::hex << (unsigned int)c; ss << std::hex << std::setw(2) << std::setfill('0') <<
(unsigned int) hash[i];
} }
return ss.str(); return ss.str();
} }
inline std::string MD5(const std::string &s) { inline std::string MD5(const std::string &s) {
return message_digest<MD5_CTX>(s, MD5_Init, MD5_Update, MD5_Final, return message_digest(s, EVP_md5());
MD5_DIGEST_LENGTH);
} }
inline std::string SHA_256(const std::string &s) { inline std::string SHA_256(const std::string &s) {
return message_digest<SHA256_CTX>(s, SHA256_Init, SHA256_Update, SHA256_Final, return message_digest(s, EVP_sha256());
SHA256_DIGEST_LENGTH);
} }
inline std::string SHA_512(const std::string &s) { inline std::string SHA_512(const std::string &s) {
return message_digest<SHA512_CTX>(s, SHA512_Init, SHA512_Update, SHA512_Final, return message_digest(s, EVP_sha512());
SHA512_DIGEST_LENGTH);
} }
#endif #endif