mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace DupCryptoBuffer with bssl::UpRef

Browse source 
https://chromium-review.googlesource.com/c/chromium/src/+/1128194
This commit is contained in:
Jeremy Apthorp 2018-10-02 11:11:45 -07:00
parent 90aa277c26
commit 4f540fe52a
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/common/native_mate_converters/net_converter.cc
View file

@ -90,11 +90,11 @@ v8::Local<v8::Value> Converter<scoped_refptr<net::X509Certificate>>::ToV8(
issuer_intermediates.reserve(intermediate_buffers.size() - 1); issuer_intermediates.reserve(intermediate_buffers.size() - 1);
for (size_t i = 1; i < intermediate_buffers.size(); ++i) { for (size_t i = 1; i < intermediate_buffers.size(); ++i) {
issuer_intermediates.push_back( issuer_intermediates.push_back(
net::x509_util::DupCryptoBuffer(intermediate_buffers[i].get())); bssl::UpRef(intermediate_buffers[i].get()));
} }
const scoped_refptr<net::X509Certificate>& issuer_cert = const scoped_refptr<net::X509Certificate>& issuer_cert =
net::X509Certificate::CreateFromBuffer( net::X509Certificate::CreateFromBuffer(
net::x509_util::DupCryptoBuffer(intermediate_buffers[0].get()), bssl::UpRef(intermediate_buffers[0].get()),
std::move(issuer_intermediates)); std::move(issuer_intermediates));
dict.Set("issuerCert", issuer_cert); dict.Set("issuerCert", issuer_cert);
} }
@ -119,11 +119,9 @@ bool Converter<scoped_refptr<net::X509Certificate>>::FromV8(
scoped_refptr<net::X509Certificate> issuer_cert; scoped_refptr<net::X509Certificate> issuer_cert;
if (dict.Get("issuerCert", &issuer_cert)) { if (dict.Get("issuerCert", &issuer_cert)) {
std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> intermediates; std::vector<bssl::UniquePtr<CRYPTO_BUFFER>> intermediates;
intermediates.push_back( intermediates.push_back(bssl::UpRef(issuer_cert->cert_buffer()));
net::x509_util::DupCryptoBuffer(issuer_cert->cert_buffer()));
auto cert = net::X509Certificate::CreateFromBuffer( auto cert = net::X509Certificate::CreateFromBuffer(
net::x509_util::DupCryptoBuffer(leaf_cert->cert_buffer()), bssl::UpRef(leaf_cert->cert_buffer()), std::move(intermediates));
std::move(intermediates));
if (!cert) if (!cert)
return false; return false;