Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

crypto: account for OpenSSL 1.1.0 function signature change. #14761

Closed
wants to merge 1 commit into from
Closed

crypto: account for OpenSSL 1.1.0 function signature change. #14761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/node_crypto.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,11 @@ template void SSLWrap<TLSWrap>::SetSNIContext(SecureContext* sc);
template int SSLWrap<TLSWrap>::SetCACerts(SecureContext* sc);
template SSL_SESSION* SSLWrap<TLSWrap>::GetSessionCallback(
SSL* s,
#if OPENSSL_VERSION_NUMBER < 0x10100000L
unsigned char* key,
#else
const unsigned char *key,
#endif
int len,
int* copy);
template int SSLWrap<TLSWrap>::NewSessionCallback(SSL* s,
Expand Down Expand Up @@ -1394,7 +1398,11 @@ void SSLWrap<Base>::InitNPN(SecureContext* sc) {

template <class Base>
SSL_SESSION* SSLWrap<Base>::GetSessionCallback(SSL* s,
#if OPENSSL_VERSION_NUMBER < 0x10100000L
unsigned char* key,
#else
const unsigned char* key,
#endif
int len,
int* copy) {
Base* w = static_cast<Base*>(SSL_get_app_data(s));
Expand Down
4 changes: 4 additions & 0 deletions src/node_crypto.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,11 @@ class SSLWrap {
static void AddMethods(Environment* env, v8::Local<v8::FunctionTemplate> t);

static SSL_SESSION* GetSessionCallback(SSL* s,
#if OPENSSL_VERSION_NUMBER < 0x10100000L
unsigned char* key,
#else
const unsigned char* key,
#endif
int len,
int* copy);
static int NewSessionCallback(SSL* s, SSL_SESSION* sess);
Expand Down