Skip to content

Commit 97b34f2

Browse files
emilbayesemilbayes
committedJan 12, 2023
Lint
·
v3.0.2
1 parent 918692e commit 97b34f2

File tree

10 files changed

+116
-115
lines changed

10 files changed

+116
-115
lines changed
 

‎example.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
var noise = require('./index2')
1+
const noise = require('./index2')
22

3-
var sClient = noise.keygen()
4-
var sServer = noise.keygen()
3+
const sClient = noise.keygen()
4+
const sServer = noise.keygen()
55

6-
var client = noise.initialize('KK', true, Buffer.alloc(0), sClient, null, sServer.publicKey)
7-
var server = noise.initialize('KK', false, Buffer.alloc(0), sServer, null, sClient.publicKey)
6+
const client = noise.initialize('KK', true, Buffer.alloc(0), sClient, null, sServer.publicKey)
7+
const server = noise.initialize('KK', false, Buffer.alloc(0), sServer, null, sClient.publicKey)
88

9-
var clientTx = Buffer.alloc(128)
10-
var serverTx = Buffer.alloc(128)
9+
const clientTx = Buffer.alloc(128)
10+
const serverTx = Buffer.alloc(128)
1111

12-
var clientRx = Buffer.alloc(128)
13-
var serverRx = Buffer.alloc(128)
12+
const clientRx = Buffer.alloc(128)
13+
const serverRx = Buffer.alloc(128)
1414

1515
// -> e, es, ss
1616
noise.writeMessage(client, Buffer.alloc(0), clientTx)
1717
noise.readMessage(server, clientTx.subarray(0, noise.writeMessage.bytes), serverRx)
1818

1919
// <- e, ee, se
20-
var serverSplit = noise.writeMessage(server, Buffer.alloc(0), serverTx)
21-
var clientSplit = noise.readMessage(client, serverTx.subarray(0, noise.writeMessage.bytes), clientRx)
20+
const serverSplit = noise.writeMessage(server, Buffer.alloc(0), serverTx)
21+
const clientSplit = noise.readMessage(client, serverTx.subarray(0, noise.writeMessage.bytes), clientRx)
2222

2323
noise.destroy(client)
2424
noise.destroy(server)

‎handshake-state.js

+23-22
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const assert = require('nanoassert')
44
const clone = require('clone')
55

66
function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
7-
var DhResult = sodium_malloc(dh.DHLEN)
7+
const DhResult = sodium_malloc(dh.DHLEN)
88

99
function HandshakeState () {
1010
this.symmetricState = sodium_malloc(symmetricState.STATELEN)
@@ -34,9 +34,9 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
3434
assert(rs == null ? true : rs.byteLength === dh.PKLEN, `rs must be ${dh.PKLEN} bytes`)
3535
assert(re == null ? true : re.byteLength === dh.PKLEN, `re must be ${dh.PKLEN} bytes`)
3636

37-
var state = new HandshakeState()
37+
const state = new HandshakeState()
3838

39-
var protocolName = Uint8Array.from(`Noise_${handshakePattern}_${dh.ALG}_${cipher.ALG}_${hash.ALG}`, toCharCode)
39+
const protocolName = Uint8Array.from(`Noise_${handshakePattern}_${dh.ALG}_${cipher.ALG}_${hash.ALG}`, toCharCode)
4040

4141
symmetricState.initializeSymmetric(state.symmetricState, protocolName)
4242
symmetricState.mixHash(state.symmetricState, prologue)
@@ -69,12 +69,12 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
6969
}
7070

7171
// hashing
72-
var pat = PATTERNS[handshakePattern]
72+
const pat = PATTERNS[handshakePattern]
7373

74-
for (var pattern of clone(pat.premessages)) {
75-
var patternRole = pattern.shift()
74+
for (const pattern of clone(pat.premessages)) {
75+
const patternRole = pattern.shift()
7676

77-
for (var token of pattern) {
77+
for (const token of pattern) {
7878
switch (token) {
7979
case TOK_E:
8080
assert(state.role === patternRole ? state.epk.byteLength != null : state.re.byteLength != null)
@@ -105,14 +105,14 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
105105
assert(payload.byteLength != null)
106106
assert(messageBuffer.byteLength != null)
107107

108-
var mpat = state.messagePatterns.shift()
109-
var moffset = 0
108+
const mpat = state.messagePatterns.shift()
109+
let moffset = 0
110110

111111
assert(mpat != null)
112112

113113
assert(state.role === mpat.shift())
114114

115-
for (var token of mpat) {
115+
for (const token of mpat) {
116116
switch (token) {
117117
case TOK_E:
118118
assert(state.epk == null)
@@ -175,8 +175,8 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
175175
writeMessage.bytes = moffset
176176

177177
if (state.messagePatterns.length === 0) {
178-
var tx = sodium_malloc(cipherState.STATELEN)
179-
var rx = sodium_malloc(cipherState.STATELEN)
178+
const tx = sodium_malloc(cipherState.STATELEN)
179+
const rx = sodium_malloc(cipherState.STATELEN)
180180
symmetricState.split(state.symmetricState, tx, rx, dh.DHLEN, dh.PKLEN)
181181

182182
return { tx, rx }
@@ -189,13 +189,13 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
189189
assert(message.byteLength != null)
190190
assert(payloadBuffer.byteLength != null)
191191

192-
var mpat = state.messagePatterns.shift()
193-
var moffset = 0
192+
const mpat = state.messagePatterns.shift()
193+
let moffset = 0
194194

195195
assert(mpat != null)
196196
assert(mpat.shift() !== state.role)
197197

198-
for (var token of mpat) {
198+
for (const token of mpat) {
199199
switch (token) {
200200
case TOK_E:
201201
assert(state.re == null)
@@ -210,11 +210,11 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
210210

211211
break
212212

213-
case TOK_S:
213+
case TOK_S: {
214214
assert(state.rs == null)
215215
state.rs = sodium_malloc(dh.PKLEN)
216216

217-
var bytes = 0
217+
let bytes = 0
218218
if (symmetricState._hasKey(state.symmetricState)) {
219219
bytes = dh.PKLEN + 16
220220
} else {
@@ -232,6 +232,7 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
232232
moffset += symmetricState.decryptAndHash.bytesRead
233233

234234
break
235+
}
235236
case TOK_EE:
236237
dh.dh(DhResult, state.esk, state.re)
237238
symmetricState.mixKey(state.symmetricState, DhResult)
@@ -269,8 +270,8 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
269270
readMessage.bytes = symmetricState.decryptAndHash.bytesWritten
270271

271272
if (state.messagePatterns.length === 0) {
272-
var tx = sodium_malloc(cipherState.STATELEN)
273-
var rx = sodium_malloc(cipherState.STATELEN)
273+
const tx = sodium_malloc(cipherState.STATELEN)
274+
const rx = sodium_malloc(cipherState.STATELEN)
274275
symmetricState.split(state.symmetricState, rx, tx, dh.DHLEN, dh.PKLEN)
275276

276277
return { tx, rx }
@@ -293,7 +294,7 @@ function createHandshake ({ dh, hash, cipher, symmetricState, cipherState }) {
293294
}
294295

295296
function seedKeygen (seed) {
296-
var obj = { publicKey: sodium_malloc(dh.PKLEN), secretKey: sodium_malloc(dh.SKLEN) }
297+
const obj = { publicKey: sodium_malloc(dh.PKLEN), secretKey: sodium_malloc(dh.SKLEN) }
297298
dh.generateSeedKeypair(obj.publicKey, obj.secretKey, seed)
298299
return obj
299300
}
@@ -323,7 +324,7 @@ const TOK_SS = Symbol('es')
323324

324325
// initiator, ->
325326
// responder, <-
326-
var PATTERNS = Object.freeze({
327+
const PATTERNS = Object.freeze({
327328
N: {
328329
premessages: [
329330
[RESPONDER, TOK_S]
@@ -452,7 +453,7 @@ var PATTERNS = Object.freeze({
452453
})
453454

454455
function sodiumBufferCopy (src) {
455-
var buf = sodium_malloc(src.byteLength)
456+
const buf = sodium_malloc(src.byteLength)
456457
buf.set(src)
457458
return buf
458459
}

‎symmetric-state.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* eslint-disable camelcase */
22
const { sodium_malloc, sodium_memzero } = require('sodium-universal/memory')
3-
var assert = require('nanoassert')
3+
const assert = require('nanoassert')
44

55
module.exports = ({ hash, cipherState }) => {
66
const STATELEN = hash.HASHLEN + hash.HASHLEN + cipherState.STATELEN
@@ -26,7 +26,7 @@ module.exports = ({ hash, cipherState }) => {
2626
cipherState.initializeKey(state.subarray(CIPHER_BEGIN, CIPHER_END), null)
2727
}
2828

29-
var TempKey = sodium_malloc(HASHLEN)
29+
const TempKey = sodium_malloc(HASHLEN)
3030
function mixKey (state, inputKeyMaterial, dhlen, pklen) {
3131
assert(state.byteLength === STATELEN)
3232
assert(inputKeyMaterial.byteLength != null)
@@ -49,12 +49,12 @@ module.exports = ({ hash, cipherState }) => {
4949
function mixHash (state, data) {
5050
assert(state.byteLength === STATELEN)
5151

52-
var h = state.subarray(HASH_BEGIN, HASH_END)
52+
const h = state.subarray(HASH_BEGIN, HASH_END)
5353

5454
hash.hash(h, [h, data])
5555
}
5656

57-
var TempHash = sodium_malloc(HASHLEN)
57+
const TempHash = sodium_malloc(HASHLEN)
5858
function mixKeyAndHash (state, inputKeyMaterial, dhlen, pklen) {
5959
assert(state.byteLength === STATELEN)
6060
assert(inputKeyMaterial.byteLength != null)
@@ -90,8 +90,8 @@ module.exports = ({ hash, cipherState }) => {
9090
assert(ciphertext.byteLength != null)
9191
assert(plaintext.byteLength != null)
9292

93-
var cstate = state.subarray(CIPHER_BEGIN, CIPHER_END)
94-
var h = state.subarray(HASH_BEGIN, HASH_END)
93+
const cstate = state.subarray(CIPHER_BEGIN, CIPHER_END)
94+
const h = state.subarray(HASH_BEGIN, HASH_END)
9595

9696
cipherState.encryptWithAd(cstate, ciphertext, h, plaintext)
9797
encryptAndHash.bytesRead = cipherState.encryptWithAd.bytesRead
@@ -107,8 +107,8 @@ module.exports = ({ hash, cipherState }) => {
107107
assert(plaintext.byteLength != null)
108108
assert(ciphertext.byteLength != null)
109109

110-
var cstate = state.subarray(CIPHER_BEGIN, CIPHER_END)
111-
var h = state.subarray(HASH_BEGIN, HASH_END)
110+
const cstate = state.subarray(CIPHER_BEGIN, CIPHER_END)
111+
const h = state.subarray(HASH_BEGIN, HASH_END)
112112

113113
cipherState.decryptWithAd(cstate, plaintext, h, ciphertext)
114114
decryptAndHash.bytesRead = cipherState.decryptWithAd.bytesRead
@@ -118,9 +118,9 @@ module.exports = ({ hash, cipherState }) => {
118118
decryptAndHash.bytesRead = 0
119119
decryptAndHash.bytesWritten = 0
120120

121-
var TempKey1 = sodium_malloc(HASHLEN)
122-
var TempKey2 = sodium_malloc(HASHLEN)
123-
var zerolen = new Uint8Array(0)
121+
const TempKey1 = sodium_malloc(HASHLEN)
122+
const TempKey2 = sodium_malloc(HASHLEN)
123+
const zerolen = new Uint8Array(0)
124124
function split (state, cipherstate1, cipherstate2, dhlen, pklen) {
125125
assert(state.byteLength === STATELEN)
126126
assert(cipherstate1.byteLength === cipherState.STATELEN)

‎test/cipher.js

+25-25
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ const {
55
crypto_aead_chacha20poly1305_ietf_ABYTES
66
} = require('sodium-universal/crypto_aead')
77
const { randombytes_buf } = require('sodium-universal/randombytes')
8-
var cipher = require('../cipher')()
9-
var test = require('tape')
8+
const cipher = require('../cipher')()
9+
const test = require('tape')
1010

1111
test('constants', function (assert) {
1212
assert.ok(cipher.KEYLEN === 32, 'KEYLEN conforms to Noise Protocol')
@@ -21,27 +21,27 @@ test('constants', function (assert) {
2121
})
2222

2323
test('identity', function (assert) {
24-
var key = Buffer.alloc(cipher.KEYLEN)
25-
var nonce = Buffer.alloc(cipher.NONCELEN)
24+
const key = Buffer.alloc(cipher.KEYLEN)
25+
const nonce = Buffer.alloc(cipher.NONCELEN)
2626
randombytes_buf(key)
2727
randombytes_buf(nonce)
2828

29-
var key2 = Buffer.alloc(cipher.KEYLEN)
30-
var nonce2 = Buffer.alloc(cipher.NONCELEN)
29+
const key2 = Buffer.alloc(cipher.KEYLEN)
30+
const nonce2 = Buffer.alloc(cipher.NONCELEN)
3131
randombytes_buf(key2)
3232
randombytes_buf(nonce2)
3333

34-
var plaintext = Buffer.from('Hello world')
35-
var ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
36-
var decrypted = Buffer.alloc(plaintext.byteLength)
34+
const plaintext = Buffer.from('Hello world')
35+
const ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
36+
const decrypted = Buffer.alloc(plaintext.byteLength)
3737

3838
cipher.encrypt(ciphertext, key, nonce, null, plaintext)
3939

4040
assert.throws(_ => cipher.decrypt(decrypted, key, nonce, Buffer.alloc(1), ciphertext), 'should not have ad')
4141
assert.throws(_ => cipher.decrypt(decrypted, key2, nonce, null, ciphertext), 'wrong key')
4242
assert.throws(_ => cipher.decrypt(decrypted, key, nonce2, null, ciphertext), 'wrong nonce')
4343

44-
for (var i = 0; i < ciphertext.length; i++) {
44+
for (let i = 0; i < ciphertext.length; i++) {
4545
ciphertext[i] ^= i + 1
4646
assert.throws(_ => cipher.decrypt(decrypted, key, nonce, null, ciphertext))
4747
ciphertext[i] ^= i + 1
@@ -54,29 +54,29 @@ test('identity', function (assert) {
5454
})
5555

5656
test('identity with ad', function (assert) {
57-
var key = Buffer.alloc(cipher.KEYLEN)
58-
var nonce = Buffer.alloc(cipher.NONCELEN)
57+
const key = Buffer.alloc(cipher.KEYLEN)
58+
const nonce = Buffer.alloc(cipher.NONCELEN)
5959
randombytes_buf(key)
6060
randombytes_buf(nonce)
6161

62-
var ad = Buffer.from('version 0')
62+
const ad = Buffer.from('version 0')
6363

64-
var key2 = Buffer.alloc(cipher.KEYLEN)
65-
var nonce2 = Buffer.alloc(cipher.NONCELEN)
64+
const key2 = Buffer.alloc(cipher.KEYLEN)
65+
const nonce2 = Buffer.alloc(cipher.NONCELEN)
6666
randombytes_buf(key2)
6767
randombytes_buf(nonce2)
6868

69-
var plaintext = Buffer.from('Hello world')
70-
var ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
71-
var decrypted = Buffer.alloc(plaintext.byteLength)
69+
const plaintext = Buffer.from('Hello world')
70+
const ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
71+
const decrypted = Buffer.alloc(plaintext.byteLength)
7272

7373
cipher.encrypt(ciphertext, key, nonce, ad, plaintext)
7474

7575
assert.throws(_ => cipher.decrypt(decrypted, key, nonce, Buffer.alloc(1), ciphertext), 'should not have ad')
7676
assert.throws(_ => cipher.decrypt(decrypted, key2, nonce, ad, ciphertext), 'wrong key')
7777
assert.throws(_ => cipher.decrypt(decrypted, key, nonce2, ad, ciphertext), 'wrong nonce')
7878

79-
for (var i = 0; i < ciphertext.length; i++) {
79+
for (let i = 0; i < ciphertext.length; i++) {
8080
ciphertext[i] ^= 255
8181
assert.throws(_ => cipher.decrypt(decrypted, key, nonce, ad, ciphertext))
8282
ciphertext[i] ^= 255
@@ -89,18 +89,18 @@ test('identity with ad', function (assert) {
8989
})
9090

9191
test('rekey', function (assert) {
92-
var key = Buffer.alloc(cipher.KEYLEN)
93-
var nonce = Buffer.alloc(cipher.NONCELEN)
92+
const key = Buffer.alloc(cipher.KEYLEN)
93+
const nonce = Buffer.alloc(cipher.NONCELEN)
9494
randombytes_buf(key)
9595
randombytes_buf(nonce)
9696

97-
var keyCopy = Buffer.from(key)
97+
const keyCopy = Buffer.from(key)
9898
cipher.rekey(key, key)
9999
assert.notOk(key.equals(keyCopy))
100100

101-
var plaintext = Buffer.from('Hello world')
102-
var ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
103-
var decrypted = Buffer.alloc(plaintext.byteLength)
101+
const plaintext = Buffer.from('Hello world')
102+
const ciphertext = Buffer.alloc(plaintext.byteLength + cipher.MACLEN)
103+
const decrypted = Buffer.alloc(plaintext.byteLength)
104104

105105
cipher.encrypt(ciphertext, key, nonce, null, plaintext)
106106

0 commit comments

Comments
 (0)
Please sign in to comment.