1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: use StringBytes::Encode

Browse Source
This commit is contained in:
isaacs 2013-05-02 15:32:32 -07:00
parent a1eacdf12a
commit 430dc39e87
2 changed files with 49 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/crypto.js
View File

@ -197,7 +197,8 @@ Hash.prototype._transform = function(chunk, encoding, callback) {
};
Hash.prototype._flush = function(callback) {
this.push(this._binding.digest());
var encoding = this._readableState.encoding || 'buffer';
this.push(this._binding.digest(encoding), encoding);
callback();
};
@ -212,10 +213,10 @@ Hash.prototype.update = function(data, encoding) {
Hash.prototype.digest = function(outputEncoding) {
outputEncoding = outputEncoding || exports.DEFAULT_ENCODING;
var result = this._binding.digest();
if (outputEncoding && outputEncoding !== 'buffer')
result = result.toString(outputEncoding);
return result;
var ret = this._binding.digest(outputEncoding);
if (outputEncoding !== 'buffer' && Buffer.isBuffer(ret))
ret = ret.toString(outputEncoding);
return ret;
};

59
src/node_crypto.cc
View File

@ -2239,11 +2239,11 @@ class Cipher : public ObjectWrap {
int out_len = 0, r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = cipher->CipherUpdate(buf, written, &out, &out_len);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -2548,11 +2548,11 @@ class Decipher : public ObjectWrap {
int out_len = 0, r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = cipher->DecipherUpdate(buf, written, &out, &out_len);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -2737,11 +2737,11 @@ class Hmac : public ObjectWrap {
int r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = hmac->HmacUpdate(buf, written);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -2860,11 +2860,11 @@ class Hash : public ObjectWrap {
int r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = hash->HashUpdate(buf, written);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -2888,6 +2888,11 @@ class Hash : public ObjectWrap {
return ThrowException(Exception::Error(String::New("Not initialized")));
}
enum encoding encoding = BUFFER;
if (args.Length() >= 1) {
encoding = ParseEncoding(args[0]->ToString(), BUFFER);
}
unsigned char md_value[EVP_MAX_MD_SIZE];
unsigned int md_len;
@ -2895,11 +2900,8 @@ class Hash : public ObjectWrap {
EVP_MD_CTX_cleanup(&hash->mdctx);
hash->initialised_ = false;
Local<Value> outString;
outString = Encode(md_value, md_len, BUFFER);
return scope.Close(outString);
return scope.Close(StringBytes::Encode(
reinterpret_cast<const char*>(md_value), md_len, encoding));
}
Hash () : ObjectWrap () {
@ -3021,11 +3023,11 @@ class Sign : public ObjectWrap {
int r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = sign->SignUpdate(buf, written);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -3240,11 +3242,11 @@ class Verify : public ObjectWrap {
int r;
if (args[0]->IsString()) {
enum encoding encoding = ParseEncoding(args[1], BINARY);
size_t buflen = StringBytes::SizeFast(args[0], encoding);
char* buf = static_cast<char*>(malloc(buflen));
size_t buflen = StringBytes::StorageSize(args[0], encoding);
char* buf = new char[buflen];
size_t written = StringBytes::Write(buf, buflen, args[0], encoding);
r = verify->VerifyUpdate(buf, written);
free(buf);
delete[] buf;
} else {
char* buf = Buffer::Data(args[0]);
size_t buflen = Buffer::Length(args[0]);
@ -3277,8 +3279,15 @@ class Verify : public ObjectWrap {
ssize_t kwritten = DecodeWrite(kbuf, klen, args[0], BINARY);
assert(kwritten == klen);
ASSERT_IS_BUFFER(args[1]);
ssize_t hlen = Buffer::Length(args[1]);
ASSERT_IS_STRING_OR_BUFFER(args[1]);
// BINARY works for both buffers and binary strings.
enum encoding encoding = BINARY;
if (args.Length() >= 3) {
encoding = ParseEncoding(args[2]->ToString(), BINARY);
}
ssize_t hlen = StringBytes::Size(args[1], encoding);
if (hlen < 0) {
delete [] kbuf;