vialeys 0.0.1 → 0.0.2

package/lib/Utils/noise-handler.js

@@ -2,11 +2,20 @@
 
 Object.defineProperty(exports, "__esModule", { value: true })
 
-const boom_1 = require("@hapi/boom")
-const WAProto_1 = require("../../WAProto")
-const Defaults_1 = require("../Defaults")
-const WABinary_1 = require("../WABinary")
-const crypto_1 = require("./crypto")
+const { Boom } = require("@hapi/boom")
+const { proto } = require("../../WAProto")
+const {
+  NOISE_MODE, 
+  WA_CERT_DETAILS
+} = require("../Defaults/constants")
+const { decodeBinaryNode } = require("../WABinary")
+const { 
+  aesDecryptGCM, 
+  aesEncryptGCM,
+  Curve, 
+  hkdf, 
+  sha256 
+} = require("./crypto")
 
 const generateIV = (counter) => {
     const iv = new ArrayBuffer(12)
@@ -18,11 +27,11 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
     logger = logger.child({ class: 'ns' })
     const authenticate = (data) => {
         if (!isFinished) {
-            hash = crypto_1.sha256(Buffer.concat([hash, data]))
+            hash = sha256(Buffer.concat([hash, data]))
         }
     }
     const encrypt = (plaintext) => {
-        const result = crypto_1.aesEncryptGCM(plaintext, encKey, generateIV(writeCounter), hash)
+        const result = aesEncryptGCM(plaintext, encKey, generateIV(writeCounter), hash)
         writeCounter += 1
         authenticate(result)
         return result
@@ -31,7 +40,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         // before the handshake is finished, we use the same counter
         // after handshake, the counters are different
         const iv = generateIV(isFinished ? readCounter : writeCounter)
-        const result = crypto_1.aesDecryptGCM(ciphertext, decKey, iv, hash)
+        const result = aesDecryptGCM(ciphertext, decKey, iv, hash)
         if (isFinished) {
             readCounter += 1
         }
@@ -42,7 +51,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         return result
     }
     const localHKDF = async (data) => {
-        const key = await crypto_1.hkdf(Buffer.from(data), 64, { salt, info: '' })
+        const key = await hkdf(Buffer.from(data), 64, { salt, info: '' })
         return [key.slice(0, 32), key.slice(32)]
     }
     const mixIntoKey = async (data) => {
@@ -62,8 +71,8 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         writeCounter = 0
         isFinished = true
     }
-    const data = Buffer.from(Defaults_1.NOISE_MODE)
-    let hash = data.byteLength === 32 ? data : crypto_1.sha256(data)
+    const data = Buffer.from(NOISE_MODE)
+    let hash = data.byteLength === 32 ? data : sha256(data)
     let salt = hash
     let encKey = hash
     let decKey = hash
@@ -82,17 +91,17 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
         finishInit,
         processHandshake: async ({ serverHello }, noiseKey) => {
             authenticate(serverHello.ephemeral)
-            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, serverHello.ephemeral))
+            await mixIntoKey(Curve.sharedKey(privateKey, serverHello.ephemeral))
             const decStaticContent = decrypt(serverHello.static)
-            await mixIntoKey(crypto_1.Curve.sharedKey(privateKey, decStaticContent))
+            await mixIntoKey(Curve.sharedKey(privateKey, decStaticContent))
             const certDecoded = decrypt(serverHello.payload)
-            const { intermediate: certIntermediate } = WAProto_1.proto.CertChain.decode(certDecoded)
-            const { issuerSerial } = WAProto_1.proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details)
-            if (issuerSerial !== Defaults_1.WA_CERT_DETAILS.SERIAL) {
-                throw new boom_1.Boom('certification match failed', { statusCode: 400 })
+            const { intermediate: certIntermediate } = proto.CertChain.decode(certDecoded)
+            const { issuerSerial } = proto.CertChain.NoiseCertificate.Details.decode(certIntermediate.details)
+            if (issuerSerial !== WA_CERT_DETAILS.SERIAL) {
+                throw new Boom('certification match failed', { statusCode: 400 })
             }
             const keyEnc = encrypt(noiseKey.public)
-            await mixIntoKey(crypto_1.Curve.sharedKey(noiseKey.private, serverHello.ephemeral))
+            await mixIntoKey(Curve.sharedKey(noiseKey.private, serverHello.ephemeral))
             return keyEnc
         },
         encodeFrame: (data) => {
@@ -140,7 +149,7 @@ const makeNoiseHandler = ({ keyPair: { private: privateKey, public: publicKey },
                 inBytes = inBytes.slice(size + 3)
                 if (isFinished) {
                     const result = decrypt(frame)
-                    frame = await WABinary_1.decodeBinaryNode(result)
+                    frame = await decodeBinaryNode(result)
                 }
                 logger.trace({ msg: frame?.attrs?.id }, 'recv frame')
                 onFrame(frame)