Skip to content

Commit

Permalink
src: avoid using deprecated apis. see #7.
Browse files Browse the repository at this point in the history
  • Loading branch information
@chjj
chjj committed Nov 3, 2018
1 parent 7ee81de commit aba492d
Show file tree
Hide file tree
Showing 11 changed files with 58 additions and 58 deletions.
8 changes: 4 additions & 4 deletions src/blake2b.cc
View file
Expand Up @@ -52,7 +52,7 @@ NAN_METHOD(BBLAKE2b::Init) {
if (!info[0]->IsNumber())
return Nan::ThrowTypeError("First argument must be a number.");

outlen = info[0]->Uint32Value();
outlen = Nan::To<uint32_t>(info[0]).FromJust();

if (outlen == 0 || outlen > BCRYPTO_BLAKE2B_OUTBYTES)
return Nan::ThrowRangeError("Invalid output length.");
Expand Down Expand Up @@ -136,7 +136,7 @@ NAN_METHOD(BBLAKE2b::Digest) {
if (!info[1]->IsNumber())
return Nan::ThrowTypeError("Second argument must be a number.");

outlen = info[1]->Uint32Value();
outlen = Nan::To<uint32_t>(info[1]).FromJust();

if (outlen == 0 || outlen > BCRYPTO_BLAKE2B_OUTBYTES)
return Nan::ThrowRangeError("Invalid output length.");
Expand Down Expand Up @@ -199,7 +199,7 @@ NAN_METHOD(BBLAKE2b::Root) {
if (!info[2]->IsNumber())
return Nan::ThrowTypeError("Third argument must be a number.");

outlen = info[2]->Uint32Value();
outlen = Nan::To<uint32_t>(info[2]).FromJust();
}

if (leftlen != outlen || rightlen != outlen)
Expand Down Expand Up @@ -258,7 +258,7 @@ NAN_METHOD(BBLAKE2b::Multi) {
if (!info[3]->IsNumber())
return Nan::ThrowTypeError("Fourth argument must be a number.");

outlen = info[3]->Uint32Value();
outlen = Nan::To<uint32_t>(info[3]).FromJust();
}

bcrypto_blake2b_ctx ctx;
Expand Down
8 changes: 4 additions & 4 deletions src/blake2s.cc
View file
Expand Up @@ -52,7 +52,7 @@ NAN_METHOD(BBLAKE2s::Init) {
if (!info[0]->IsNumber())
return Nan::ThrowTypeError("First argument must be a number.");

outlen = info[0]->Uint32Value();
outlen = Nan::To<uint32_t>(info[0]).FromJust();

if (outlen == 0 || outlen > BCRYPTO_BLAKE2S_OUTBYTES)
return Nan::ThrowRangeError("Invalid output length.");
Expand Down Expand Up @@ -136,7 +136,7 @@ NAN_METHOD(BBLAKE2s::Digest) {
if (!info[1]->IsNumber())
return Nan::ThrowTypeError("Second argument must be a number.");

outlen = info[1]->Uint32Value();
outlen = Nan::To<uint32_t>(info[1]).FromJust();

if (outlen == 0 || outlen > BCRYPTO_BLAKE2S_OUTBYTES)
return Nan::ThrowRangeError("Invalid output length.");
Expand Down Expand Up @@ -199,7 +199,7 @@ NAN_METHOD(BBLAKE2s::Root) {
if (!info[2]->IsNumber())
return Nan::ThrowTypeError("Third argument must be a number.");

outlen = info[2]->Uint32Value();
outlen = Nan::To<uint32_t>(info[2]).FromJust();
}

if (leftlen != outlen || rightlen != outlen)
Expand Down Expand Up @@ -258,7 +258,7 @@ NAN_METHOD(BBLAKE2s::Multi) {
if (!info[3]->IsNumber())
return Nan::ThrowTypeError("Fourth argument must be a number.");

outlen = info[3]->Uint32Value();
outlen = Nan::To<uint32_t>(info[3]).FromJust();
}

bcrypto_blake2s_ctx ctx;
Expand Down
6 changes: 3 additions & 3 deletions src/chacha20.cc
View file
Expand Up @@ -79,7 +79,7 @@ NAN_METHOD(BChaCha20::Init) {
if (!info[2]->IsNumber())
return Nan::ThrowTypeError("Third argument must be a number.");

ctr = (uint64_t)info[2]->IntegerValue();
ctr = (uint64_t)Nan::To<int64_t>(info[2]).FromJust();
}

bcrypto_chacha20_keysetup(&chacha->ctx, key, 32);
Expand Down Expand Up @@ -134,7 +134,7 @@ NAN_METHOD(BChaCha20::InitIV) {
if (!info[1]->IsNumber())
return Nan::ThrowTypeError("Second argument must be a number.");

ctr = (uint64_t)info[1]->IntegerValue();
ctr = (uint64_t)Nan::To<int64_t>(info[1]).FromJust();
}

bcrypto_chacha20_ivsetup(&chacha->ctx, iv, iv_len);
Expand Down Expand Up @@ -200,7 +200,7 @@ NAN_METHOD(BChaCha20::SetCounter) {
if (!info[0]->IsNumber())
return Nan::ThrowError("First argument must be a number.");

bcrypto_chacha20_counter_set(&chacha->ctx, (uint64_t)info[0]->IntegerValue());
bcrypto_chacha20_counter_set(&chacha->ctx, (uint64_t)Nan::To<int64_t>(info[0]).FromJust());

info.GetReturnValue().Set(info.This());
}
Expand Down
2 changes: 1 addition & 1 deletion src/cipherbase.cc
View file
Expand Up @@ -74,7 +74,7 @@ NAN_METHOD(BCipherBase::New) {

Nan::Utf8String name_(info[0]);
const char *name = (const char *)*name_;
bool encrypt = info[1]->BooleanValue();
bool encrypt = Nan::To<bool>(info[1]).FromJust();

const EVP_CIPHER *type = EVP_get_cipherbyname(name);

Expand Down
4 changes: 2 additions & 2 deletions src/dsa.cc
View file
Expand Up @@ -48,7 +48,7 @@ NAN_METHOD(BDSA::ParamsGenerate) {
if (!info[0]->IsNumber())
return Nan::ThrowTypeError("First argument must be a number.");

uint32_t bits = info[0]->Uint32Value();
uint32_t bits = Nan::To<uint32_t>(info[0]).FromJust();

bcrypto_dsa_key_t *k = bcrypto_dsa_params_generate((int)bits);

Expand All @@ -75,7 +75,7 @@ NAN_METHOD(BDSA::ParamsGenerateAsync) {
if (!info[1]->IsFunction())
return Nan::ThrowTypeError("Second argument must be a function.");

uint32_t bits = info[0]->Uint32Value();
uint32_t bits = Nan::To<uint32_t>(info[0]).FromJust();

v8::Local<v8::Function> callback = info[1].As<v8::Function>();

Expand Down
20 changes: 10 additions & 10 deletions src/ecdsa.cc
View file
Expand Up @@ -75,7 +75,7 @@ NAN_METHOD(BECDSA::PrivateKeyExport) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -140,7 +140,7 @@ NAN_METHOD(BECDSA::PrivateKeyExportPKCS8) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -245,7 +245,7 @@ NAN_METHOD(BECDSA::PublicKeyCreate) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -285,7 +285,7 @@ NAN_METHOD(BECDSA::PublicKeyConvert) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -348,7 +348,7 @@ NAN_METHOD(BECDSA::PublicKeyExportSPKI) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -388,7 +388,7 @@ NAN_METHOD(BECDSA::PublicKeyImportSPKI) {
if (!info[2]->IsBoolean())
return Nan::ThrowTypeError("Third argument must be a boolean.");

compress = info[2]->BooleanValue();
compress = Nan::To<bool>(info[2]).FromJust();
}

const uint8_t *rd = (const uint8_t *)node::Buffer::Data(rbuf);
Expand Down Expand Up @@ -428,7 +428,7 @@ NAN_METHOD(BECDSA::PublicKeyTweakAdd) {
if (!info[3]->IsBoolean())
return Nan::ThrowTypeError("Fourth argument must be a boolean.");

compress = info[3]->BooleanValue();
compress = Nan::To<bool>(info[3]).FromJust();
}

const uint8_t *pd = (const uint8_t *)node::Buffer::Data(pbuf);
Expand Down Expand Up @@ -553,14 +553,14 @@ NAN_METHOD(BECDSA::Recover) {
if (!info[4]->IsNumber())
return Nan::ThrowTypeError("Fifth argument must be a number.");

int param = (int)info[4]->Uint32Value();
int param = (int)Nan::To<uint32_t>(info[4]).FromJust();
bool compress = true;

if (info.Length() > 5 && !IsNull(info[5])) {
if (!info[5]->IsBoolean())
return Nan::ThrowTypeError("Sixth argument must be a boolean.");

compress = info[5]->BooleanValue();
compress = Nan::To<bool>(info[5]).FromJust();
}

const uint8_t *md = (const uint8_t *)node::Buffer::Data(mbuf);
Expand Down Expand Up @@ -609,7 +609,7 @@ NAN_METHOD(BECDSA::Derive) {
if (!info[3]->IsBoolean())
return Nan::ThrowTypeError("Fourth argument must be a boolean.");

compress = info[3]->BooleanValue();
compress = Nan::To<bool>(info[3]).FromJust();
}

const uint8_t *kd = (const uint8_t *)node::Buffer::Data(kbuf);
Expand Down
24 changes: 12 additions & 12 deletions src/keccak.cc
View file
Expand Up @@ -52,7 +52,7 @@ NAN_METHOD(BKeccak::Init) {
if (!info[0]->IsNumber())
return Nan::ThrowTypeError("First argument must be a number.");

bits = info[0]->Uint32Value();
bits = Nan::To<uint32_t>(info[0]).FromJust();
}

if (!bcrypto_keccak_init(&keccak->ctx, bits))
Expand Down Expand Up @@ -89,7 +89,7 @@ NAN_METHOD(BKeccak::Final) {
if (!info[0]->IsNumber())
return Nan::ThrowTypeError("First argument must be a number.");

pad = (int)info[0]->Uint32Value();
pad = (int)Nan::To<uint32_t>(info[0]).FromJust();
}

size_t outlen = 0;
Expand All @@ -98,7 +98,7 @@ NAN_METHOD(BKeccak::Final) {
if (!info[1]->IsNumber())
return Nan::ThrowTypeError("Second argument must be a number.");

outlen = (size_t)info[1]->Uint32Value();
outlen = (size_t)Nan::To<uint32_t>(info[1]).FromJust();
}

uint8_t out[64];
Expand Down Expand Up @@ -128,7 +128,7 @@ NAN_METHOD(BKeccak::Digest) {
if (!info[1]->IsNumber())
return Nan::ThrowTypeError("Second argument must be a number.");

bits = info[1]->Uint32Value();
bits = Nan::To<uint32_t>(info[1]).FromJust();
}

int pad = 0x01;
Expand All @@ -137,7 +137,7 @@ NAN_METHOD(BKeccak::Digest) {
if (!info[2]->IsNumber())
return Nan::ThrowTypeError("Third argument must be a number.");

pad = (int)info[2]->Uint32Value();
pad = (int)Nan::To<uint32_t>(info[2]).FromJust();
}

size_t outlen = 0;
Expand All @@ -146,7 +146,7 @@ NAN_METHOD(BKeccak::Digest) {
if (!info[3]->IsNumber())
return Nan::ThrowTypeError("Fourth argument must be a number.");

outlen = (size_t)info[3]->Uint32Value();
outlen = (size_t)Nan::To<uint32_t>(info[3]).FromJust();
}

bcrypto_keccak_ctx ctx;
Expand Down Expand Up @@ -190,7 +190,7 @@ NAN_METHOD(BKeccak::Root) {
if (!info[2]->IsNumber())
return Nan::ThrowTypeError("Third argument must be a number.");

bits = info[2]->Uint32Value();
bits = Nan::To<uint32_t>(info[2]).FromJust();
}

int pad = 0x01;
Expand All @@ -199,7 +199,7 @@ NAN_METHOD(BKeccak::Root) {
if (!info[3]->IsNumber())
return Nan::ThrowTypeError("Fourth argument must be a number.");

pad = (int)info[3]->Uint32Value();
pad = (int)Nan::To<uint32_t>(info[3]).FromJust();
}

size_t outlen = 0;
Expand All @@ -208,7 +208,7 @@ NAN_METHOD(BKeccak::Root) {
if (!info[4]->IsNumber())
return Nan::ThrowTypeError("Fifth argument must be a number.");

outlen = (size_t)info[4]->Uint32Value();
outlen = (size_t)Nan::To<uint32_t>(info[4]).FromJust();
}

if (outlen != 0) {
Expand Down Expand Up @@ -274,7 +274,7 @@ NAN_METHOD(BKeccak::Multi) {
if (!info[3]->IsNumber())
return Nan::ThrowTypeError("Fourth argument must be a number.");

bits = info[3]->Uint32Value();
bits = Nan::To<uint32_t>(info[3]).FromJust();
}

int pad = 0x01;
Expand All @@ -283,7 +283,7 @@ NAN_METHOD(BKeccak::Multi) {
if (!info[4]->IsNumber())
return Nan::ThrowTypeError("Fifth argument must be a number.");

pad = (int)info[4]->Uint32Value();
pad = (int)Nan::To<uint32_t>(info[4]).FromJust();
}

size_t outlen = 0;
Expand All @@ -292,7 +292,7 @@ NAN_METHOD(BKeccak::Multi) {
if (!info[5]->IsNumber())
return Nan::ThrowTypeError("Fifth argument must be a number.");

outlen = (size_t)info[5]->Uint32Value();
outlen = (size_t)Nan::To<uint32_t>(info[5]).FromJust();
}

bcrypto_keccak_ctx ctx;
Expand Down
8 changes: 4 additions & 4 deletions src/pbkdf2.cc
View file
Expand Up @@ -51,8 +51,8 @@ NAN_METHOD(BPBKDF2::Derive) {
size_t datalen = (size_t)node::Buffer::Length(kbuf);
const uint8_t *salt = (const uint8_t *)node::Buffer::Data(sbuf);
size_t saltlen = (size_t)node::Buffer::Length(sbuf);
uint32_t iter = info[3]->Uint32Value();
size_t keylen = (size_t)info[4]->Uint32Value();
uint32_t iter = Nan::To<uint32_t>(info[3]).FromJust();
size_t keylen = (size_t)Nan::To<uint32_t>(info[4]).FromJust();

uint8_t *key = (uint8_t *)malloc(keylen);

Expand Down Expand Up @@ -108,8 +108,8 @@ NAN_METHOD(BPBKDF2::DeriveAsync) {
size_t datalen = (size_t)node::Buffer::Length(dbuf);
const uint8_t *salt = (const uint8_t *)node::Buffer::Data(sbuf);
size_t saltlen = (size_t)node::Buffer::Length(sbuf);
uint32_t iter = info[3]->Uint32Value();
size_t keylen = (size_t)info[4]->Uint32Value();
uint32_t iter = Nan::To<uint32_t>(info[3]).FromJust();
size_t keylen = (size_t)Nan::To<uint32_t>(info[4]).FromJust();

BPBKDF2Worker *worker = new BPBKDF2Worker(
dbuf,
Expand Down
4 changes: 2 additions & 2 deletions src/random.cc
View file
Expand Up @@ -35,8 +35,8 @@ NAN_METHOD(BRandom::RandomFill) {
uint8_t *data = (uint8_t *)node::Buffer::Data(bdata);
size_t len = node::Buffer::Length(bdata);

size_t pos = (size_t)info[1]->IntegerValue();
size_t size = (size_t)info[2]->IntegerValue();
size_t pos = (size_t)Nan::To<int64_t>(info[1]).FromJust();
size_t size = (size_t)Nan::To<int64_t>(info[2]).FromJust();

if (((int32_t)len) < 0 || ((int32_t)pos) < 0 || ((int32_t)size) < 0)
return Nan::ThrowRangeError("Invalid range.");
Expand Down

0 comments on commit aba492d

Please sign in to comment.