Skip to content
This repository has been archived by the owner on May 31, 2019. It is now read-only.

Switching back to openSSL #1

Merged
merged 1 commit into from
Dec 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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"', {
Expand Down
6 changes: 2 additions & 4 deletions src/node_crypto.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -5768,7 +5768,6 @@ void TimingSafeEqual(const FunctionCallbackInfo<Value>& args) {

void InitCryptoOnce() {
SSL_load_error_strings();
#ifndef BORING_SSL
OPENSSL_no_config();

// --openssl-config=...
Expand All @@ -5790,7 +5789,6 @@ void InitCryptoOnce() {
CHECK_NE(err, 0);
}
}
#endif
SSL_library_init();
OpenSSL_add_all_algorithms();

Expand Down