Skip to content

Commit

Permalink
build: export openssl symbols on windows
Browse files Browse the repository at this point in the history
Export symbols from the bundled openssl for add-ons to link against.

Fixes: nodejs/node-v0.x-archive#4051
PR-URL: #6274
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
bnoordhuis authored and Myles Borins committed Nov 14, 2016
1 parent 279e30c commit 3cefd65
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 0 deletions.
58 changes: 58 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,15 @@
'deps/v8/tools/SourceMap.js',
'deps/v8/tools/tickprocessor-driver.js',
],
'conditions': [
[ 'OS=="win" and '
'node_use_openssl=="true" and '
'node_shared_openssl=="false"', {
'use_openssl_def': 1,
}, {
'use_openssl_def': 0,
}],
],
},

'targets': [
Expand Down Expand Up @@ -291,6 +300,9 @@
'-Wl,--no-whole-archive',
],
}],
['use_openssl_def==1', {
'sources': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
}],
],
}],
],
Expand Down Expand Up @@ -464,6 +476,52 @@
}
},
},
{
'target_name': 'mkssldef',
'type': 'none',
# TODO(bnoordhuis) Make all platforms export the same list of symbols.
# Teach mkssldef.py to generate linker maps that UNIX linkers understand.
'conditions': [
[ 'use_openssl_def==1', {
'variables': {
'mkssldef_flags': [
# Categories to export.
'-CAES,BF,BIO,DES,DH,DSA,EC,ECDH,ECDSA,ENGINE,EVP,HMAC,MD4,MD5,'
'NEXTPROTONEG,PSK,RC2,RC4,RSA,SHA,SHA0,SHA1,SHA256,SHA512,TLSEXT',
# Defines.
'-DWIN32',
# Symbols to filter from the export list.
'-X^DSO',
'-X^_',
'-X^private_',
],
},
'conditions': [
['openssl_fips!=""', {
'variables': { 'mkssldef_flags': ['-DOPENSSL_FIPS'] },
}],
],
'actions': [
{
'action_name': 'mkssldef',
'inputs': [
'deps/openssl/openssl/util/libeay.num',
'deps/openssl/openssl/util/ssleay.num',
],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
'action': [
'python',
'tools/mkssldef.py',
'<@(mkssldef_flags)',
'-o',
'<@(_outputs)',
'<@(_inputs)',
],
},
],
}],
],
},
# generate ETW header and resource files
{
'target_name': 'node_etw',
Expand Down
35 changes: 35 additions & 0 deletions test/addons/openssl-binding/binding.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#include "node.h"
#include "../../../src/util.h"
#include "../../../src/util-inl.h"

#include <assert.h>
#include <openssl/rand.h>

namespace {

inline void RandomBytes(const v8::FunctionCallbackInfo<v8::Value>& info) {
assert(info[0]->IsArrayBufferView());
auto view = info[0].As<v8::ArrayBufferView>();
auto byte_offset = view->ByteOffset();
auto byte_length = view->ByteLength();
assert(view->HasBuffer());
auto buffer = view->Buffer();
auto contents = buffer->GetContents();
auto data = static_cast<unsigned char*>(contents.Data()) + byte_offset;
assert(RAND_poll());
auto rval = RAND_bytes(data, static_cast<int>(byte_length));
info.GetReturnValue().Set(rval > 0);
}

inline void Initialize(v8::Local<v8::Object> exports,
v8::Local<v8::Value> module,
v8::Local<v8::Context> context) {
auto isolate = context->GetIsolate();
auto key = v8::String::NewFromUtf8(isolate, "randomBytes");
auto value = v8::FunctionTemplate::New(isolate, RandomBytes)->GetFunction();
assert(exports->Set(context, key, value).IsJust());
}

} // anonymous namespace

NODE_MODULE_CONTEXT_AWARE(binding, Initialize)
9 changes: 9 additions & 0 deletions test/addons/openssl-binding/binding.gyp
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
'targets': [
{
'target_name': 'binding',
'sources': ['binding.cc'],
'include_dirs': ['../../../deps/openssl/openssl/include'],
},
]
}
8 changes: 8 additions & 0 deletions test/addons/openssl-binding/test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'use strict';

require('../../common');
const assert = require('assert');
const binding = require('./build/Release/binding');
const bytes = new Uint8Array(1024);
assert(binding.randomBytes(bytes));
assert(bytes.reduce((v, a) => v + a) > 0);
44 changes: 44 additions & 0 deletions tools/mkssldef.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/usr/bin/env python

from __future__ import print_function
import re
import sys

categories = []
defines = []
excludes = []

if __name__ == '__main__':
out = sys.stdout
filenames = sys.argv[1:]

while filenames and filenames[0].startswith('-'):
option = filenames.pop(0)
if option == '-o': out = open(filenames.pop(0), 'w')
elif option.startswith('-C'): categories += option[2:].split(',')
elif option.startswith('-D'): defines += option[2:].split(',')
elif option.startswith('-X'): excludes += option[2:].split(',')

excludes = map(re.compile, excludes)
exported = []

for filename in filenames:
for line in open(filename).readlines():
name, _, meta, _ = re.split('\s+', line)
if any(map(lambda p: p.match(name), excludes)): continue
meta = meta.split(':')
assert meta[0] in ('EXIST', 'NOEXIST')
assert meta[2] in ('FUNCTION', 'VARIABLE')
if meta[0] != 'EXIST': continue
if meta[2] != 'FUNCTION': continue
def satisfy(expr, rules):
def test(expr):
if expr.startswith('!'): return not expr[1:] in rules
return expr == '' or expr in rules
return all(map(test, expr.split(',')))
if not satisfy(meta[1], defines): continue
if not satisfy(meta[3], categories): continue
exported.append(name)

print('EXPORTS', file=out)
for name in sorted(exported): print(' ', name, file=out)

0 comments on commit 3cefd65

Please sign in to comment.