crypto: fix zero byte allocation assertion failure

When an empty string was passed, malloc might have returned a nullptr depending on the platform, causing an assertion failure. This change makes private key parsing behave as public key parsing does, causing a BIO error instead that can be caught in JS. Fixes: nodejs#25247 PR-URL: nodejs#25248 Reviewed-By: Ujjwal Sharma <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>
refack · Jan 10, 2019 · b6e960f · b6e960f
1 parent ac5ffbe
commit b6e960f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -2696,7 +2696,7 @@ static bool IsSupportedAuthenticatedMode(const EVP_CIPHER_CTX* ctx) {
 template <typename T>
 static T* MallocOpenSSL(size_t count) {
   void* mem = OPENSSL_malloc(MultiplyWithOverflowCheck(count, sizeof(T)));
-  CHECK_NOT_NULL(mem);
+  CHECK_IMPLIES(mem == nullptr, count == 0);
   return static_cast<T*>(mem);
 }
 
@@ -2854,7 +2854,8 @@ static EVPKeyPointer ParsePrivateKey(const PrivateKeyEncodingConfig& config,
 
   if (config.format_ == kKeyFormatPEM) {
     BIOPointer bio(BIO_new_mem_buf(key, key_len));
-    CHECK(bio);
+    if (!bio)
+      return pkey;
 
     char* pass = const_cast<char*>(config.passphrase_.get());
     pkey.reset(PEM_read_bio_PrivateKey(bio.get(),
@@ -2869,7 +2870,8 @@ static EVPKeyPointer ParsePrivateKey(const PrivateKeyEncodingConfig& config,
       pkey.reset(d2i_PrivateKey(EVP_PKEY_RSA, nullptr, &p, key_len));
     } else if (config.type_.ToChecked() == kKeyEncodingPKCS8) {
       BIOPointer bio(BIO_new_mem_buf(key, key_len));
-      CHECK(bio);
+      if (!bio)
+        return pkey;
       char* pass = const_cast<char*>(config.passphrase_.get());
       pkey.reset(d2i_PKCS8PrivateKey_bio(bio.get(),
                                          nullptr,

diff --git a/test/parallel/test-crypto-key-objects.js b/test/parallel/test-crypto-key-objects.js
@@ -105,3 +105,10 @@ const privatePem = fixtures.readSync('test_rsa_privkey.pem', 'ascii');
     }
   }
 }
+
+{
+  // This should not cause a crash: https://github.com/nodejs/node/issues/25247
+  assert.throws(() => {
+    createPrivateKey({ key: '' });
+  }, /null/);
+}