Skip to content

Commit

Permalink
crypto: simplify Certificate class bindings
Browse files Browse the repository at this point in the history 
Replace Certificate C++ class with simple functions. Update
crypto.Certificate methods accordingly.

PR-URL: #5382
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
@estliberitas @Fishrock123
estliberitas authored and Fishrock123 committed Mar 8, 2016
1 parent aee1ff3 commit c7ebef7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 66 deletions.
8 changes: 3 additions & 5 deletions lib/crypto.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -582,23 +582,21 @@ exports.Certificate = Certificate;
function Certificate() {
if (!(this instanceof Certificate))
return new Certificate();

this._handle = new binding.Certificate();
}


Certificate.prototype.verifySpkac = function(object) {
return this._handle.verifySpkac(object);
return binding.certVerifySpkac(object);
};


Certificate.prototype.exportPublicKey = function(object, encoding) {
return this._handle.exportPublicKey(toBuf(object, encoding));
return binding.certExportPublicKey(toBuf(object, encoding));
};


Certificate.prototype.exportChallenge = function(object, encoding) {
return this._handle.exportChallenge(toBuf(object, encoding));
return binding.certExportChallenge(toBuf(object, encoding));
};


Expand Down
51 changes: 13 additions & 38 deletions src/node_crypto.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5470,29 +5470,7 @@ void GetCurves(const FunctionCallbackInfo<Value>& args) {
}


void Certificate::Initialize(Environment* env, Local<Object> target) {
HandleScope scope(env->isolate());

Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

t->InstanceTemplate()->SetInternalFieldCount(1);

env->SetProtoMethod(t, "verifySpkac", VerifySpkac);
env->SetProtoMethod(t, "exportPublicKey", ExportPublicKey);
env->SetProtoMethod(t, "exportChallenge", ExportChallenge);

target->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "Certificate"),
t->GetFunction());
}


void Certificate::New(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
new Certificate(env, args.This());
}


bool Certificate::VerifySpkac(const char* data, unsigned int len) {
bool VerifySpkac(const char* data, unsigned int len) {
bool i = 0;
EVP_PKEY* pkey = nullptr;
NETSCAPE_SPKI* spki = nullptr;
Expand All @@ -5518,9 +5496,8 @@ bool Certificate::VerifySpkac(const char* data, unsigned int len) {
}


void Certificate::VerifySpkac(const FunctionCallbackInfo<Value>& args) {
Certificate* certificate = Unwrap<Certificate>(args.Holder());
Environment* env = certificate->env();
void VerifySpkac(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);
bool i = false;

if (args.Length() < 1)
Expand All @@ -5535,13 +5512,13 @@ void Certificate::VerifySpkac(const FunctionCallbackInfo<Value>& args) {
char* data = Buffer::Data(args[0]);
CHECK_NE(data, nullptr);

i = certificate->VerifySpkac(data, length);
i = VerifySpkac(data, length);

args.GetReturnValue().Set(i);
}


const char* Certificate::ExportPublicKey(const char* data, int len) {
const char* ExportPublicKey(const char* data, int len) {
char* buf = nullptr;
EVP_PKEY* pkey = nullptr;
NETSCAPE_SPKI* spki = nullptr;
Expand Down Expand Up @@ -5582,11 +5559,9 @@ const char* Certificate::ExportPublicKey(const char* data, int len) {
}


void Certificate::ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
void ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);

Certificate* certificate = Unwrap<Certificate>(args.Holder());

if (args.Length() < 1)
return env->ThrowTypeError("Missing argument");

Expand All @@ -5599,7 +5574,7 @@ void Certificate::ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
char* data = Buffer::Data(args[0]);
CHECK_NE(data, nullptr);

const char* pkey = certificate->ExportPublicKey(data, length);
const char* pkey = ExportPublicKey(data, length);
if (pkey == nullptr)
return args.GetReturnValue().SetEmptyString();

Expand All @@ -5611,7 +5586,7 @@ void Certificate::ExportPublicKey(const FunctionCallbackInfo<Value>& args) {
}


const char* Certificate::ExportChallenge(const char* data, int len) {
const char* ExportChallenge(const char* data, int len) {
NETSCAPE_SPKI* sp = nullptr;

sp = NETSCAPE_SPKI_b64_decode(data, len);
Expand All @@ -5627,11 +5602,9 @@ const char* Certificate::ExportChallenge(const char* data, int len) {
}


void Certificate::ExportChallenge(const FunctionCallbackInfo<Value>& args) {
void ExportChallenge(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args);

Certificate* crt = Unwrap<Certificate>(args.Holder());

if (args.Length() < 1)
return env->ThrowTypeError("Missing argument");

Expand All @@ -5644,7 +5617,7 @@ void Certificate::ExportChallenge(const FunctionCallbackInfo<Value>& args) {
char* data = Buffer::Data(args[0]);
CHECK_NE(data, nullptr);

const char* cert = crt->ExportChallenge(data, len);
const char* cert = ExportChallenge(data, len);
if (cert == nullptr)
return args.GetReturnValue().SetEmptyString();

Expand Down Expand Up @@ -5753,8 +5726,10 @@ void InitCrypto(Local<Object> target,
Hash::Initialize(env, target);
Sign::Initialize(env, target);
Verify::Initialize(env, target);
Certificate::Initialize(env, target);

env->SetMethod(target, "certVerifySpkac", VerifySpkac);
env->SetMethod(target, "certExportPublicKey", ExportPublicKey);
env->SetMethod(target, "certExportChallenge", ExportChallenge);
#ifndef OPENSSL_NO_ENGINE
env->SetMethod(target, "setEngine", SetEngine);
#endif // !OPENSSL_NO_ENGINE
Expand Down
23 changes: 0 additions & 23 deletions src/node_crypto.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -732,29 +732,6 @@ class ECDH : public BaseObject {
const EC_GROUP* group_;
};

class Certificate : public AsyncWrap {
public:
static void Initialize(Environment* env, v8::Local<v8::Object> target);

v8::Local<v8::Value> CertificateInit(const char* sign_type);
bool VerifySpkac(const char* data, unsigned int len);
const char* ExportPublicKey(const char* data, int len);
const char* ExportChallenge(const char* data, int len);

size_t self_size() const override { return sizeof(*this); }

protected:
static void New(const v8::FunctionCallbackInfo<v8::Value>& args);
static void VerifySpkac(const v8::FunctionCallbackInfo<v8::Value>& args);
static void ExportPublicKey(const v8::FunctionCallbackInfo<v8::Value>& args);
static void ExportChallenge(const v8::FunctionCallbackInfo<v8::Value>& args);

Certificate(Environment* env, v8::Local<v8::Object> wrap)
: AsyncWrap(env, wrap, AsyncWrap::PROVIDER_CRYPTO) {
MakeWeak<Certificate>(this);
}
};

bool EntropySource(unsigned char* buffer, size_t length);
#ifndef OPENSSL_NO_ENGINE
void SetEngine(const v8::FunctionCallbackInfo<v8::Value>& args);
Expand Down

0 comments on commit c7ebef7

Please sign in to comment.