Skip to content

Commit 3ec4e89

Browse files
dingoskydingosky
committed
Bump version
1 parent 7167002 commit 3ec4e89

File tree

3 files changed

+39
-39
lines changed

3 files changed

+39
-39
lines changed

‎dist/lib/entropy.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
66

77
var _log = require('babel-runtime/core-js/math/log10');
88

9-
var _log2 = _interopRequireDefault(_log);
9+
var _log3 = _interopRequireDefault(_log);
1010

11-
var _log3 = require('babel-runtime/core-js/math/log2');
11+
var _log4 = require('babel-runtime/core-js/math/log2');
1212

13-
var _log4 = _interopRequireDefault(_log3);
13+
var _log5 = _interopRequireDefault(_log4);
1414

1515
var _charSet = require('./charSet');
1616

@@ -22,11 +22,11 @@ var _lcm2 = _interopRequireDefault(_lcm);
2222

2323
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2424

25-
var log2 = _log4.default;
26-
var log10 = _log2.default;
27-
var log2_10 = log2(10);
25+
var _log2 = _log5.default;
26+
var _log10 = _log3.default;
27+
var _log2_10 = _log2(10);
2828

29-
var endianByteNum = function () {
29+
var _endianByteNum = function () {
3030
var buf32 = new Uint32Array(1);
3131
var buf8 = new Uint8Array(buf32.buffer);
3232
buf32[0] = 0xff;
@@ -40,10 +40,10 @@ var bits = function bits(total, risk) {
4040

4141
var N = 0;
4242
if (total < 10001) {
43-
N = log2(total) + log2(total - 1) + log2_10 * log10(risk) - 1;
43+
N = _log2(total) + _log2(total - 1) + _log2_10 * _log10(risk) - 1;
4444
} else {
45-
var n = 2 * log10(total) + log10(risk);
46-
N = n * log2_10 - 1;
45+
var n = 2 * _log10(total) + _log10(risk);
46+
N = n * _log2_10 - 1;
4747
}
4848
return N;
4949
};
@@ -55,10 +55,10 @@ var bitsWithRiskPower = function bitsWithRiskPower(total, rPower) {
5555

5656
var N = 0;
5757
if (total < 10001) {
58-
N = log2(total) + log2(total - 1) + log2_10 * rPower - 1;
58+
N = _log2(total) + _log2(total - 1) + _log2_10 * rPower - 1;
5959
} else {
60-
var n = 2 * log10(total) + rPower;
61-
N = n * log2_10 - 1;
60+
var n = 2 * _log10(total) + rPower;
61+
N = n * _log2_10 - 1;
6262
}
6363
return N;
6464
};
@@ -69,15 +69,15 @@ var bitsWithPowers = function bitsWithPowers(tPower, rPower) {
6969
return bitsWithRiskPower(Math.pow(10, tPower), rPower);
7070
} else {
7171
var n = 2 * tPower + rPower;
72-
N = n * log2_10 - 1;
72+
N = n * _log2_10 - 1;
7373
}
7474
return N;
7575
};
7676

7777
var randomString = function randomString(entropy, charSet) {
7878
var crypto = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
7979

80-
var bytes = crypto ? cryptoBytes(entropy, charSet) : randomBytes(entropy, charSet);
80+
var bytes = crypto ? _cryptoBytes(entropy, charSet) : _randomBytes(entropy, charSet);
8181
return randomStringWithBytes(entropy, charSet, bytes);
8282
};
8383

@@ -107,27 +107,27 @@ var randomStringWithBytes = function randomStringWithBytes(entropy, charSet, byt
107107
switch (charSet) {
108108
case _charSet2.default.charSet64:
109109
chars = _charSet2.default.charSet64.chars;
110-
ndxFn = ndx64;
110+
ndxFn = _ndx64;
111111
break;
112112
case _charSet2.default.charSet32:
113113
chars = _charSet2.default.charSet32.chars;
114-
ndxFn = ndx32;
114+
ndxFn = _ndx32;
115115
break;
116116
case _charSet2.default.charSet16:
117117
chars = _charSet2.default.charSet16.chars;
118-
ndxFn = ndx16;
118+
ndxFn = _ndx16;
119119
break;
120120
case _charSet2.default.charSet8:
121121
chars = _charSet2.default.charSet8.chars;
122-
ndxFn = ndx8;
122+
ndxFn = _ndx8;
123123
break;
124124
case _charSet2.default.charSet4:
125125
chars = _charSet2.default.charSet4.chars;
126-
ndxFn = ndx4;
126+
ndxFn = _ndx4;
127127
break;
128128
case _charSet2.default.charSet2:
129129
chars = _charSet2.default.charSet2.chars;
130-
ndxFn = ndx2;
130+
ndxFn = _ndx2;
131131
break;
132132
default:
133133
break;
@@ -160,12 +160,12 @@ var bytesNeeded = function bytesNeeded(entropy, charSet) {
160160
return Math.ceil(count * bytesPerSlice);
161161
};
162162

163-
var cryptoBytes = function cryptoBytes(entropy, charSet) {
163+
var _cryptoBytes = function _cryptoBytes(entropy, charSet) {
164164
var crypto = require('crypto');
165165
return Buffer.from(crypto.randomBytes(bytesNeeded(entropy, charSet)));
166166
};
167167

168-
var randomBytes = function randomBytes(entropy, charSet) {
168+
var _randomBytes = function _randomBytes(entropy, charSet) {
169169
var byteCount = bytesNeeded(entropy, charSet);
170170
var randCount = Math.ceil(byteCount / 6);
171171

@@ -174,45 +174,45 @@ var randomBytes = function randomBytes(entropy, charSet) {
174174
for (var rNum = 0; rNum < randCount; rNum++) {
175175
dataView.setFloat64(0, Math.random());
176176
for (var n = 0; n < 6; n++) {
177-
var fByteNum = endianByteNum[n];
177+
var fByteNum = _endianByteNum[n];
178178
var bByteNum = 6 * rNum + n;
179-
bufferByte(buffer, bByteNum, fByteNum, byteCount, dataView);
179+
_bufferByte(buffer, bByteNum, fByteNum, byteCount, dataView);
180180
}
181181
}
182182
return buffer;
183183
};
184184

185-
var bufferByte = function bufferByte(buffer, bByte, nByte, byteCount, dataView) {
185+
var _bufferByte = function _bufferByte(buffer, bByte, nByte, byteCount, dataView) {
186186
if (bByte < byteCount) {
187187
buffer[bByte] = dataView.getUint8(nByte);
188188
}
189189
};
190190

191-
var ndx64 = function ndx64(chunk, slice, bytes) {
192-
return ndxGen(chunk, slice, bytes, 6);
191+
var _ndx64 = function _ndx64(chunk, slice, bytes) {
192+
return _ndxGen(chunk, slice, bytes, 6);
193193
};
194194

195-
var ndx32 = function ndx32(chunk, slice, bytes) {
196-
return ndxGen(chunk, slice, bytes, 5);
195+
var _ndx32 = function _ndx32(chunk, slice, bytes) {
196+
return _ndxGen(chunk, slice, bytes, 5);
197197
};
198198

199-
var ndx16 = function ndx16(chunk, slice, bytes) {
199+
var _ndx16 = function _ndx16(chunk, slice, bytes) {
200200
return (bytes[chunk] << 4 * slice & 0xff) >> 4;
201201
};
202202

203-
var ndx8 = function ndx8(chunk, slice, bytes) {
204-
return ndxGen(chunk, slice, bytes, 3);
203+
var _ndx8 = function _ndx8(chunk, slice, bytes) {
204+
return _ndxGen(chunk, slice, bytes, 3);
205205
};
206206

207-
var ndx4 = function ndx4(chunk, slice, bytes) {
207+
var _ndx4 = function _ndx4(chunk, slice, bytes) {
208208
return (bytes[chunk] << 2 * slice & 0xff) >> 6;
209209
};
210210

211-
var ndx2 = function ndx2(chunk, slice, bytes) {
211+
var _ndx2 = function _ndx2(chunk, slice, bytes) {
212212
return (bytes[chunk] << slice & 0xff) >> 7;
213213
};
214214

215-
var ndxGen = function ndxGen(chunk, slice, bytes, bitsPerSlice) {
215+
var _ndxGen = function _ndxGen(chunk, slice, bytes, bitsPerSlice) {
216216
var bitsPerByte = 8;
217217
var slicesPerChunk = (0, _lcm2.default)(bitsPerSlice, bitsPerByte) / bitsPerByte;
218218

‎dist/lib/lcm.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Object.defineProperty(exports, "__esModule", {
44
value: true
55
});
6-
var gcd = function gcd(a, b) {
6+
var _gcd = function _gcd(a, b) {
77
while (b != 0) {
88
var _ref = [b, a % b];
99
a = _ref[0];
@@ -13,5 +13,5 @@ var gcd = function gcd(a, b) {
1313
};
1414

1515
exports.default = function (a, b) {
16-
return a / gcd(a, b) * b;
16+
return a / _gcd(a, b) * b;
1717
};

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "entropy-string",
3-
"version": "1.1.2",
3+
"version": "1.2.0",
44
"description": "Efficiently generate cryptographically strong random strings of specified entropy from various character sets.",
55
"main": "entropy-string.js",
66
"directories": {

0 commit comments

Comments
 (0)