bcrypto: do not require bsert in production.

michalsmiarowski · Jan 24, 2020 · 9ff273d · 9ff273d
1 parent 55d8639
commit 9ff273d
Show file tree

Hide file tree

Showing 93 changed files with 121 additions and 93 deletions.
diff --git a/lib/bcrypt.js b/lib/bcrypt.js
@@ -20,7 +20,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const SHA512 = require('./sha512');
 const Blowfish = require('./js/ciphers/blowfish');
 

diff --git a/lib/cshake.js b/lib/cshake.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const Keccak = require('./keccak');
 const HMAC = require('./internal/hmac');
 

diff --git a/lib/ctr-drbg.js b/lib/ctr-drbg.js
@@ -17,7 +17,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const cipher = require('./cipher');
 const {Cipher} = cipher;
 

diff --git a/lib/dsaies.js b/lib/dsaies.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const dsa = require('./dsa');
 const random = require('./random');
 const box = require('./secretbox');

diff --git a/lib/eb2k.js b/lib/eb2k.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const MD5 = require('./md5');
 
 /*

diff --git a/lib/ecies.js b/lib/ecies.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const box = require('./secretbox');
 const random = require('./random');
 

diff --git a/lib/encoding/asn1.js b/lib/encoding/asn1.js
@@ -33,7 +33,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const bio = require('bufio');
 const objects = require('../internal/objects');
 

diff --git a/lib/encoding/base16.js b/lib/encoding/base16.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const isBrowser = Buffer.alloc(0)._isBuffer === true;
 
 /*

diff --git a/lib/encoding/base32.js b/lib/encoding/base32.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Constants

diff --git a/lib/encoding/base64.js b/lib/encoding/base64.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Base64

diff --git a/lib/encoding/lines.js b/lib/encoding/lines.js
@@ -8,7 +8,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Lines

diff --git a/lib/encoding/pem.js b/lib/encoding/pem.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const base64 = require('./base64');
 const lines = require('./lines');
 

diff --git a/lib/encoding/pemcrypt.js b/lib/encoding/pemcrypt.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const {PEMBlock} = require('./pem');
 const cipher = require('../cipher');
 const random = require('../random');

diff --git a/lib/encoding/pkcs5.js b/lib/encoding/pkcs5.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * PKCS5

diff --git a/lib/encoding/util.js b/lib/encoding/util.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Util

diff --git a/lib/encoding/x509.js b/lib/encoding/x509.js
@@ -21,7 +21,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const asn1 = require('./asn1');
 const pem = require('./pem');
 const {types} = asn1;

diff --git a/lib/gost94.js b/lib/gost94.js
@@ -16,7 +16,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 const HMAC = require('./internal/hmac');
 
 /*

diff --git a/lib/hash-drbg.js b/lib/hash-drbg.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 
 /*
  * Constants

diff --git a/lib/hkdf.js b/lib/hkdf.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 
 /**
  * HKDF

diff --git a/lib/hmac-drbg.js b/lib/hmac-drbg.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('./internal/assert');
 
 /*
  * Constants

diff --git a/lib/internal/assert.js b/lib/internal/assert.js
@@ -0,0 +1,28 @@
+/*!
+ * assert.js - assert for bcrypto
+ * Copyright (c) 2020, Christopher Jeffrey (MIT License).
+ * https://github.com/bcoin-org/bcrypto
+ */
+
+'use strict';
+
+/*
+ * Assert
+ */
+
+function assert(val, msg) {
+  if (!val) {
+    const err = new Error(msg || 'Assertion failed');
+
+    if (Error.captureStackTrace)
+      Error.captureStackTrace(err, assert);
+
+    throw err;
+  }
+}
+
+/*
+ * Expose
+ */
+
+module.exports = assert;
diff --git a/lib/internal/ciphers.js b/lib/internal/ciphers.js
@@ -8,7 +8,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Constants

diff --git a/lib/internal/hmac.js b/lib/internal/hmac.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /**
  * HMAC

diff --git a/lib/internal/primes.js b/lib/internal/primes.js
@@ -22,7 +22,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const BN = require('../bn');
 const random = require('../random');
 

diff --git a/lib/js/aead.js b/lib/js/aead.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const ChaCha20 = require('./chacha20');
 const Poly1305 = require('./poly1305');
 

diff --git a/lib/js/base58.js b/lib/js/base58.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/bech32.js b/lib/js/bech32.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /**
  * Constants

diff --git a/lib/js/blake2b.js b/lib/js/blake2b.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const HMAC = require('../internal/hmac');
 
 /*

diff --git a/lib/js/blake2s.js b/lib/js/blake2s.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const HMAC = require('../internal/hmac');
 
 /*

diff --git a/lib/js/cash32.js b/lib/js/cash32.js
@@ -19,7 +19,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /**
  * Constants

diff --git a/lib/js/chacha20.js b/lib/js/chacha20.js
@@ -11,7 +11,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/cipher.js b/lib/js/cipher.js
@@ -6,7 +6,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../internal/assert');
 const ciphers = require('../internal/ciphers');
 const modes = require('./ciphers/modes');
 const AES = require('./ciphers/aes');

diff --git a/lib/js/ciphers/aes.js b/lib/js/ciphers/aes.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/blowfish.js b/lib/js/ciphers/blowfish.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/camellia.js b/lib/js/ciphers/camellia.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/cast5.js b/lib/js/ciphers/cast5.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/des.js b/lib/js/ciphers/des.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/gcm.js b/lib/js/ciphers/gcm.js
@@ -17,7 +17,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/idea.js b/lib/js/ciphers/idea.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/modes.js b/lib/js/ciphers/modes.js
@@ -9,7 +9,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 const gcm = require('./gcm');
 
 /*

diff --git a/lib/js/ciphers/rc2.js b/lib/js/ciphers/rc2.js
@@ -17,7 +17,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants

diff --git a/lib/js/ciphers/twofish.js b/lib/js/ciphers/twofish.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const assert = require('bsert');
+const assert = require('../../internal/assert');
 
 /*
  * Constants
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
     'use strict';
-    const assert = require('bsert');
+    const assert = require('../internal/assert');
     /*
      * Lines
@@ Expand Down @@