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

Jump to bottom

ssl: use X509_parse_from_buffer #693

Merged
merged 1 commit into from
Jan 23, 2024
Merged

ssl: use X509_parse_from_buffer #693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions src/net/asio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include "core/utils.hpp"
#include "config/config.hpp"
#include "net/x509_util.hpp"

#include <absl/strings/str_split.h>
#include <string>
Expand Down Expand Up @@ -84,9 +85,8 @@ static void print_openssl_error() {
}

#ifdef HAVE_BUILTIN_CA_BUNDLE_CRT
static bool load_ca_to_x509_trust(X509_STORE* store, const uint8_t *data, size_t len) {
bssl::UniquePtr<BIO> bio(BIO_new(BIO_s_mem()));
BIO_write(bio.get(), data, len);
static bool load_ca_to_x509_trust(X509_STORE* store, const char *data, size_t len) {
bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(data, len));
bssl::UniquePtr<X509> cert(PEM_read_bio_X509(bio.get(), nullptr, 0, nullptr));
if (!cert) {
print_openssl_error();
Expand Down Expand Up @@ -127,7 +127,7 @@ static int load_ca_to_ssl_ctx_from_mem(SSL_CTX* ssl_ctx, const std::string_view&
end += sizeof(kEndCertificateMark) -1;

std::string_view cacert(cadata.data() + pos, end - pos);
if (load_ca_to_x509_trust(store, (const uint8_t*)cacert.data(), cacert.size())) {
if (load_ca_to_x509_trust(store, cacert.data(), cacert.size())) {
++count;
}
}
Expand Down Expand Up @@ -275,7 +275,9 @@ static int load_ca_to_ssl_ctx_system(SSL_CTX* ssl_ctx) {
while((cert = CertEnumCertificatesInStore(cert_store, cert))) {
const char* data = (const char *)cert->pbCertEncoded;
size_t len = cert->cbCertEncoded;
bssl::UniquePtr<X509> cert(d2i_X509(nullptr, (const unsigned char**)&data, len));
bssl::UniquePtr<CRYPTO_BUFFER> buffer = net::x509_util::CreateCryptoBuffer(
std::string_view(data, len));
bssl::UniquePtr<X509> cert(X509_parse_from_buffer(buffer.get()));
if (!cert) {
print_openssl_error();
continue;
Expand Down Expand Up @@ -346,7 +348,9 @@ static int load_ca_to_ssl_ctx_system(SSL_CTX* ssl_ctx) {
} else {
const char* data = (const char *)CFDataGetBytePtr(data_ref);
CFIndex len = CFDataGetLength(data_ref);
bssl::UniquePtr<X509> cert(d2i_X509(nullptr, (const unsigned char**)&data, len));
bssl::UniquePtr<CRYPTO_BUFFER> buffer = net::x509_util::CreateCryptoBuffer(
std::string_view(data, len));
bssl::UniquePtr<X509> cert(X509_parse_from_buffer(buffer.get()));
if (!cert) {
print_openssl_error();
continue;
Expand Down
6 changes: 6 additions & 0 deletions src/net/x509_util.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,10 @@ CRYPTO_BUFFER_POOL* GetBufferPool() {
return g_buffer_pool_singleton.pool();
}

bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(std::string_view data) {
return bssl::UniquePtr<CRYPTO_BUFFER>(
CRYPTO_BUFFER_new(reinterpret_cast<const uint8_t*>(data.data()),
data.size(), GetBufferPool()));
}

} // namespace net::x509_util
3 changes: 3 additions & 0 deletions src/net/x509_util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#ifndef H_NET_X509_UTIL
#define H_NET_X509_UTIL

#include <string_view>
#include <openssl/base.h>
#include <openssl/pool.h>

Expand All @@ -12,6 +13,8 @@ namespace net::x509_util {
// Returns a CRYPTO_BUFFER_POOL for deduplicating certificates.
CRYPTO_BUFFER_POOL* GetBufferPool();

bssl::UniquePtr<CRYPTO_BUFFER> CreateCryptoBuffer(std::string_view data);

} // namespace net::x509_util

#endif // H_NET_X509_UTIL
Loading