Browse Source

crypto: make NewSessionDoneCb public

Generic friend classes do not work well with old compiler versions (and
MSVC).
v0.11.12-release
Fedor Indutny 11 years ago
parent
commit
7589a0007c
  1. 3
      src/node_crypto.h
  2. 5
      src/tls_wrap.h

3
src/node_crypto.h

@ -247,6 +247,7 @@ class Connection : public SSLWrap<Connection>, public AsyncWrap {
} }
static void Initialize(Environment* env, v8::Handle<v8::Object> target); static void Initialize(Environment* env, v8::Handle<v8::Object> target);
void NewSessionDoneCb();
#ifdef OPENSSL_NPN_NEGOTIATED #ifdef OPENSSL_NPN_NEGOTIATED
v8::Persistent<v8::Object> npnProtos_; v8::Persistent<v8::Object> npnProtos_;
@ -295,7 +296,6 @@ class Connection : public SSLWrap<Connection>, public AsyncWrap {
void ClearError(); void ClearError();
void SetShutdownFlags(); void SetShutdownFlags();
void NewSessionDoneCb();
Connection(Environment* env, Connection(Environment* env,
v8::Local<v8::Object> wrap, v8::Local<v8::Object> wrap,
@ -324,7 +324,6 @@ class Connection : public SSLWrap<Connection>, public AsyncWrap {
friend class ClientHelloParser; friend class ClientHelloParser;
friend class SecureContext; friend class SecureContext;
friend class SSLWrap<Connection>;
}; };
class CipherBase : public BaseObject { class CipherBase : public BaseObject {

5
src/tls_wrap.h

@ -67,6 +67,8 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
uv_handle_type pending); uv_handle_type pending);
int DoShutdown(ShutdownWrap* req_wrap, uv_shutdown_cb cb); int DoShutdown(ShutdownWrap* req_wrap, uv_shutdown_cb cb);
void NewSessionDoneCb();
protected: protected:
static const int kClearOutChunkSize = 1024; static const int kClearOutChunkSize = 1024;
@ -102,7 +104,6 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
void ClearOut(); void ClearOut();
void MakePending(); void MakePending();
bool InvokeQueued(int status); bool InvokeQueued(int status);
void NewSessionDoneCb();
inline void Cycle() { inline void Cycle() {
// Prevent recursion // Prevent recursion
@ -163,8 +164,6 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>,
static size_t error_off_; static size_t error_off_;
static char error_buf_[1024]; static char error_buf_[1024];
friend class SSLWrap<TLSCallbacks>;
}; };
} // namespace node } // namespace node

Loading…
Cancel
Save