Browse Source

Revert "crypto: add SecureContext.clearOptions() method"

API addition needs to go in master. Also openssl-0.9.8k doesn't have
SSL_CTX_clear_options().

This reverts commit 6f8839d2ac.
v0.7.4-release
Ryan Dahl 13 years ago
parent
commit
be67fa7e09
  1. 27
      src/node_crypto.cc
  2. 1
      src/node_crypto.h

27
src/node_crypto.cc

@ -166,7 +166,6 @@ void SecureContext::Initialize(Handle<Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "addRootCerts", SecureContext::AddRootCerts); NODE_SET_PROTOTYPE_METHOD(t, "addRootCerts", SecureContext::AddRootCerts);
NODE_SET_PROTOTYPE_METHOD(t, "setCiphers", SecureContext::SetCiphers); NODE_SET_PROTOTYPE_METHOD(t, "setCiphers", SecureContext::SetCiphers);
NODE_SET_PROTOTYPE_METHOD(t, "setOptions", SecureContext::SetOptions); NODE_SET_PROTOTYPE_METHOD(t, "setOptions", SecureContext::SetOptions);
NODE_SET_PROTOTYPE_METHOD(t, "clearOptions", SecureContext::ClearOptions);
NODE_SET_PROTOTYPE_METHOD(t, "setSessionIdContext", NODE_SET_PROTOTYPE_METHOD(t, "setSessionIdContext",
SecureContext::SetSessionIdContext); SecureContext::SetSessionIdContext);
NODE_SET_PROTOTYPE_METHOD(t, "close", SecureContext::Close); NODE_SET_PROTOTYPE_METHOD(t, "close", SecureContext::Close);
@ -541,23 +540,21 @@ Handle<Value> SecureContext::SetCiphers(const Arguments& args) {
return True(); return True();
} }
#define X(name, fn) \ Handle<Value> SecureContext::SetOptions(const Arguments& args) {
Handle<Value> name(const Arguments& args) { \ HandleScope scope;
HandleScope scope; \
SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder()); \ SecureContext *sc = ObjectWrap::Unwrap<SecureContext>(args.Holder());
if (args.Length() != 1 || !args[0]->IsInt32()) { \
return ThrowException( \ if (args.Length() != 1 || !args[0]->IsUint32()) {
Exception::TypeError(String::New("Bad parameter"))); \ return ThrowException(Exception::TypeError(String::New("Bad parameter")));
} \
fn(sc->ctx_, args[0]->Int32Value()); \
return True(); \
} }
// can't use templates, SSL_CTX_set_options and SSL_CTX_clear_options are macros unsigned int opts = args[0]->Uint32Value();
X(SecureContext::SetOptions, SSL_CTX_set_options)
X(SecureContext::ClearOptions, SSL_CTX_clear_options) SSL_CTX_set_options(sc->ctx_, opts);
#undef X return True();
}
Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) { Handle<Value> SecureContext::SetSessionIdContext(const Arguments& args) {
HandleScope scope; HandleScope scope;

1
src/node_crypto.h

@ -66,7 +66,6 @@ class SecureContext : ObjectWrap {
static v8::Handle<v8::Value> AddRootCerts(const v8::Arguments& args); static v8::Handle<v8::Value> AddRootCerts(const v8::Arguments& args);
static v8::Handle<v8::Value> SetCiphers(const v8::Arguments& args); static v8::Handle<v8::Value> SetCiphers(const v8::Arguments& args);
static v8::Handle<v8::Value> SetOptions(const v8::Arguments& args); static v8::Handle<v8::Value> SetOptions(const v8::Arguments& args);
static v8::Handle<v8::Value> ClearOptions(const v8::Arguments& args);
static v8::Handle<v8::Value> SetSessionIdContext(const v8::Arguments& args); static v8::Handle<v8::Value> SetSessionIdContext(const v8::Arguments& args);
static v8::Handle<v8::Value> Close(const v8::Arguments& args); static v8::Handle<v8::Value> Close(const v8::Arguments& args);

Loading…
Cancel
Save