diff --git a/src/handshake/crypto.js b/src/handshake/crypto.js index 0d2f9a2..13fb06c 100644 --- a/src/handshake/crypto.js +++ b/src/handshake/crypto.js @@ -188,8 +188,8 @@ exports.generateKeys = (state, callback) => { log('2.3. mac + cipher') parallel([ - (cb) => support.makeMacAndCipher(state.protocols.local, cb), - (cb) => support.makeMacAndCipher(state.protocols.remote, cb) + (_cb) => support.makeMacAndCipher(state.protocols.local, _cb), + (_cb) => support.makeMacAndCipher(state.protocols.remote, _cb) ], cb) } ], callback) diff --git a/src/handshake/exchange.js b/src/handshake/exchange.js index b4cd10b..ecc3ca3 100644 --- a/src/handshake/exchange.js +++ b/src/handshake/exchange.js @@ -11,7 +11,7 @@ log.error = debug('libp2p:secio:error') // step 2. Exchange // -- exchange (signed) ephemeral keys. verify signatures. -module.exports = function exchange (state, cb) { +module.exports = function exchange (state, callback) { log('2. exchange - start') log('2. exchange - writing exchange') @@ -27,9 +27,9 @@ module.exports = function exchange (state, cb) { }, (cb) => crypto.generateKeys(state, cb) ], (err) => { - if (err) { return cb(err) } + if (err) { return callback(err) } log('2. exchange - finish') - cb() + callback() }) } diff --git a/src/handshake/finish.js b/src/handshake/finish.js index 55533e4..7aabf7c 100644 --- a/src/handshake/finish.js +++ b/src/handshake/finish.js @@ -12,7 +12,7 @@ const crypto = require('./crypto') // step 3. Finish // -- send expected message to verify encryption works (send local nonce) -module.exports = function finish (state, cb) { +module.exports = function finish (state, callback) { log('3. finish - start') const proto = state.protocols @@ -40,7 +40,7 @@ module.exports = function finish (state, cb) { sink (read) { } }) - cb(err) + callback(err) } if (err) return fail(err) @@ -55,6 +55,6 @@ module.exports = function finish (state, cb) { // Awesome that's all folks. state.secure.resolve(shake.handshake.rest()) - cb() + callback() }) } diff --git a/src/handshake/propose.js b/src/handshake/propose.js index 7b0689b..709027f 100644 --- a/src/handshake/propose.js +++ b/src/handshake/propose.js @@ -11,7 +11,7 @@ log.error = debug('libp2p:secio:error') // step 1. Propose // -- propose cipher suite + send pubkeys + nonce -module.exports = function propose (state, cb) { +module.exports = function propose (state, callback) { log('1. propose - start') log('1. propose - writing proposal') @@ -26,10 +26,10 @@ module.exports = function propose (state, cb) { (cb) => crypto.selectProtocols(state, cb) ], (err) => { if (err) { - return cb(err) + return callback(err) } log('1. propose - finish') - cb() + callback() }) }