From 2bf1ed8f34e9d2048abf170afcddad1c5b385c67 Mon Sep 17 00:00:00 2001 From: Manuel Araoz Date: Thu, 20 Nov 2014 12:16:27 -0300 Subject: [PATCH] use strict to crypto --- lib/address.js | 6 ++++-- lib/bip32.js | 16 +++++++++------- lib/crypto/bn.js | 2 ++ lib/crypto/ecdsa.js | 2 ++ lib/crypto/hash.js | 2 ++ lib/crypto/kdf.js | 2 ++ lib/crypto/point.js | 2 ++ lib/crypto/random.js | 4 +++- lib/privkey.js | 12 +++++++----- lib/protocol/base58check.js | 4 +++- lib/pubkey.js | 2 +- 11 files changed, 37 insertions(+), 17 deletions(-) diff --git a/lib/address.js b/lib/address.js index 82865fc..f3f2116 100644 --- a/lib/address.js +++ b/lib/address.js @@ -1,6 +1,8 @@ +'use strict'; + var base58check = require('./base58check'); var constants = require('./constants'); -var Hash = require('./hash'); +var Hash = require('./crypto/hash'); function Address(buf) { if (!(this instanceof Address)) @@ -14,7 +16,7 @@ function Address(buf) { var obj = buf; this.set(obj); } -}; +} Address.prototype.set = function(obj) { this.hashbuf = obj.hashbuf || this.hashbuf || null; diff --git a/lib/bip32.js b/lib/bip32.js index 2ee5d6e..34bfe5c 100644 --- a/lib/bip32.js +++ b/lib/bip32.js @@ -1,12 +1,14 @@ -var Base58Check = require('./base58check'); -var Hash = require('./hash'); +'use strict'; + +var Base58Check = require('./protocol/base58check'); +var constants = require('./protocol/constants'); +var Hash = require('./crypto/hash'); +var Point = require('./crypto/point'); +var Random = require('./crypto/random'); +var BN = require('./crypto/bn'); var Keypair = require('./keypair'); var Pubkey = require('./pubkey'); var Privkey = require('./privkey'); -var Point = require('./point'); -var Random = require('./random'); -var BN = require('./bn'); -var constants = require('./constants'); var BIP32 = function BIP32(obj) { if (!(this instanceof BIP32)) @@ -17,7 +19,7 @@ var BIP32 = function BIP32(obj) { } else if (obj ) { this.set(obj); } -} +}; BIP32.prototype.set = function(obj) { this.version = typeof obj.version !== 'undefined' ? obj.version : this.version; diff --git a/lib/crypto/bn.js b/lib/crypto/bn.js index 6b71b67..60874d9 100644 --- a/lib/crypto/bn.js +++ b/lib/crypto/bn.js @@ -1,3 +1,5 @@ +'use strict'; + var _BN = require('bn.js'); var BN = function BN_extended(n) { diff --git a/lib/crypto/ecdsa.js b/lib/crypto/ecdsa.js index ddb4af6..c56302d 100644 --- a/lib/crypto/ecdsa.js +++ b/lib/crypto/ecdsa.js @@ -1,3 +1,5 @@ +'use strict'; + var BN = require('./bn'); var Point = require('./point'); var Signature = require('./signature'); diff --git a/lib/crypto/hash.js b/lib/crypto/hash.js index d3251a9..7ca5692 100644 --- a/lib/crypto/hash.js +++ b/lib/crypto/hash.js @@ -1,3 +1,5 @@ +'use strict'; + var hashjs = require('hash.js'); var sha512 = require('sha512'); diff --git a/lib/crypto/kdf.js b/lib/crypto/kdf.js index 6a826ea..4e2c872 100644 --- a/lib/crypto/kdf.js +++ b/lib/crypto/kdf.js @@ -1,3 +1,5 @@ +'use strict'; + var Bn = require('./bn'); var Privkey = require('./privkey'); var Point = require('./point'); diff --git a/lib/crypto/point.js b/lib/crypto/point.js index 4296705..d457b18 100644 --- a/lib/crypto/point.js +++ b/lib/crypto/point.js @@ -1,3 +1,5 @@ +'use strict'; + var BN = require('./bn'); var elliptic = require('elliptic'); diff --git a/lib/crypto/random.js b/lib/crypto/random.js index 77573a8..e413470 100644 --- a/lib/crypto/random.js +++ b/lib/crypto/random.js @@ -1,5 +1,7 @@ +'use strict'; + function Random() { -}; +} /* secure random bytes that sometimes throws an error due to lack of entropy */ Random.getRandomBuffer = function(size) { diff --git a/lib/privkey.js b/lib/privkey.js index 12f0b7c..9ee2508 100644 --- a/lib/privkey.js +++ b/lib/privkey.js @@ -1,8 +1,10 @@ -var BN = require('./bn'); -var Point = require('./point'); -var constants = require('./constants'); -var base58check = require('./base58check'); -var Random = require('./random'); +'use strict'; + +var BN = require('./crypto/bn'); +var Point = require('./crypto/point'); +var constants = require('./protocol/constants'); +var base58check = require('./protocol/base58check'); +var Random = require('./crypto/random'); var Privkey = function Privkey(bn) { if (!(this instanceof Privkey)) diff --git a/lib/protocol/base58check.js b/lib/protocol/base58check.js index 7b5fb95..68d00d6 100644 --- a/lib/protocol/base58check.js +++ b/lib/protocol/base58check.js @@ -1,5 +1,7 @@ +'use strict'; + var base58 = require('./base58'); -var sha256sha256 = require('./hash').sha256sha256; +var sha256sha256 = require('../crypto/hash').sha256sha256; var Base58Check = function Base58Check(obj) { if (!(this instanceof Base58Check)) diff --git a/lib/pubkey.js b/lib/pubkey.js index 6099b76..0e32207 100644 --- a/lib/pubkey.js +++ b/lib/pubkey.js @@ -1,5 +1,5 @@ var Point = require('./crypto/point'); -var bn = require('./bn'); +var bn = require('./crypto/bn'); var privkey = require('./privkey'); var Pubkey = function Pubkey(point) {