Merge pull request brave#1 from darkdh/node-ssl

Switching back to openSSL
posix4e · Dec 14, 2016 · 53ede11 · 53ede11
2 parents cd087a9 + a1b0a2e
commit 53ede11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/node.gyp b/node.gyp
@@ -17,7 +17,6 @@
     'node_shared_libuv%': 'false',
     'node_use_openssl%': 'true',
     'node_shared_openssl%': 'false',
-    'node_use_boringssl%': 'false',
     'node_v8_options%': '',
     'node_enable_v8_vtunejit%': 'false',
     'node_core_target_name%': 'node',
@@ -260,11 +259,9 @@
         [ 'node_enable_d8=="true"', {
           'dependencies': [ 'deps/v8/src/d8.gyp:d8' ],
         }],
-        [ 'node_use_boringssl=="true"', {
-          'defines': [ 'BORING_SSL' ],
+        [ 'node_use_chromium_v8=="true"', {
           'dependencies': [
             '../../../v8/src/v8.gyp:v8',
-            '../../../third_party/boringssl/boringssl.gyp:boringssl',
           ],
         }],
         [ 'node_use_bundled_v8=="true"', {

diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -5556,15 +5556,15 @@ static void array_push_back(const TypeName* md,
 void GetCiphers(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   CipherPushContext ctx(env);
-  // EVP_CIPHER_do_all_sorted(array_push_back<EVP_CIPHER>, &ctx);
+  EVP_CIPHER_do_all_sorted(array_push_back<EVP_CIPHER>, &ctx);
   args.GetReturnValue().Set(ctx.arr);
 }
 
 
 void GetHashes(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
   CipherPushContext ctx(env);
-  // EVP_MD_do_all_sorted(array_push_back<EVP_MD>, &ctx);
+  EVP_MD_do_all_sorted(array_push_back<EVP_MD>, &ctx);
   args.GetReturnValue().Set(ctx.arr);
 }
 
@@ -5768,7 +5768,6 @@ void TimingSafeEqual(const FunctionCallbackInfo<Value>& args) {
 
 void InitCryptoOnce() {
   SSL_load_error_strings();
-#ifndef BORING_SSL
   OPENSSL_no_config();
 
   // --openssl-config=...
@@ -5790,7 +5789,6 @@ void InitCryptoOnce() {
       CHECK_NE(err, 0);
     }
   }
-#endif
   SSL_library_init();
   OpenSSL_add_all_algorithms();