OSSForks/node
1
0
Fork 0
mirror of https://github.com/zebrajr/node.git synced 2026-01-15 12:15:26 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

crypto: use openssl's own memory BIOs in crypto_context.cc

Browse Source 
NodeBIO's memory buffer structure does not support BIO_C_FILE_SEEK and B
IO_C_FILE_TELL. This prevents OpenSSL PEM_read_bio_PrivateKey from readi
ng some private keys. So I switched to OpenSSL'w own protected memory bu
ffers.

Fixes: https://github.com/nodejs/node/issues/47008
PR-URL: https://github.com/nodejs/node/pull/47160
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
GauriSpears
2023-05-18 21:28:44 +05:00
committed by GitHub
parent 3538e1bcde
commit 10b21e5685
3 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
node.gyp
View File

@@ -1054,6 +1054,7 @@
'sources': [
'test/cctest/test_crypto_clienthello.cc',
'test/cctest/test_node_crypto.cc',
'test/cctest/test_node_crypto_env.cc',
'test/cctest/test_quic_cid.cc',
'test/cctest/test_quic_tokens.cc',
]

20
src/crypto/crypto_context.cc
View File

@@ -62,18 +62,16 @@ inline X509_STORE* GetOrCreateRootCertStore() {
// Takes a string or buffer and loads it into a BIO.
// Caller responsible for BIO_free_all-ing the returned object.
BIOPointer LoadBIO(Environment* env, Local<Value> v) {
HandleScope scope(env->isolate());
if (v->IsString()) {
Utf8Value s(env->isolate(), v);
return NodeBIO::NewFixed(*s, s.length());
if (v->IsString() || v->IsArrayBufferView()) {
BIOPointer bio(BIO_new(BIO_s_secmem()));
if (!bio) return nullptr;
ByteSource bsrc = ByteSource::FromStringOrBuffer(env, v);
if (bsrc.size() > INT_MAX) return nullptr;
int written = BIO_write(bio.get(), bsrc.data<char>(), bsrc.size());
if (written < 0) return nullptr;
if (static_cast<size_t>(written) != bsrc.size()) return nullptr;
return bio;
}
if (v->IsArrayBufferView()) {
ArrayBufferViewContents<char> buf(v.As<ArrayBufferView>());
return NodeBIO::NewFixed(buf.data(), buf.length());
}
return nullptr;
}

31
test/cctest/test_node_crypto_env.cc Normal file
View File

@@ -0,0 +1,31 @@
#include "crypto/crypto_bio.h"
#include "gtest/gtest.h"
#include "node_options.h"
#include "node_test_fixture.h"
#include "openssl/err.h"
using v8::Local;
using v8::String;
/*
* This test verifies that an object created by LoadBIO supports BIO_tell
* and BIO_seek, otherwise PEM_read_bio_PrivateKey fails on some keys
* (if OpenSSL needs to rewind pointer between pem_read_bio_key()
* and pem_read_bio_key_legacy() inside PEM_read_bio_PrivateKey).
*/
class NodeCryptoEnv : public EnvironmentTestFixture {};
TEST_F(NodeCryptoEnv, LoadBIO) {
v8::HandleScope handle_scope(isolate_);
Argv argv;
Env env{handle_scope, argv};
// just put a random string into BIO
Local<String> key = String::NewFromUtf8(isolate_, "abcdef").ToLocalChecked();
node::crypto::BIOPointer bio(node::crypto::LoadBIO(*env, key));
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
BIO_seek(bio.get(), 2);
ASSERT_EQ(BIO_tell(bio.get()), 2);
#endif
ASSERT_EQ(ERR_peek_error(), 0UL) << "There should not have left "
"any errors on the OpenSSL error stack\n";
}