zapo-js 0.1.2 → 0.3.0

package/dist/auth/pairing/{WaPairingCodeCrypto.js → pairing-code-crypto.js}

@@ -1,12 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.PBKDF2_ITERATIONS = exports.CROCKFORD_ALPHABET = void 0;
+exports.normalizeCustomPairingCode = normalizeCustomPairingCode;
 exports.createCompanionHello = createCompanionHello;
 exports.completeCompanionFinish = completeCompanionFinish;
-const constants_1 = require("../pairing/constants");
 const _crypto_1 = require("../../crypto/index.js");
 const X25519_1 = require("../../crypto/curves/X25519");
-const constants_2 = require("../../protocol/constants");
+const constants_1 = require("../../protocol/constants");
 const bytes_1 = require("../../util/bytes");
+exports.CROCKFORD_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTVWXYZ';
+exports.PBKDF2_ITERATIONS = 2 << 16;
 function bytesToCrockford(bytes) {
     let bitCount = 0;
     let value = 0;
@@ -15,24 +18,37 @@ function bytesToCrockford(bytes) {
         value = (value << 8) | bytes[i];
         bitCount += 8;
         while (bitCount >= 5) {
-            out += constants_1.CROCKFORD_ALPHABET[(value >>> (bitCount - 5)) & 31];
+            out += exports.CROCKFORD_ALPHABET[(value >>> (bitCount - 5)) & 31];
             bitCount -= 5;
         }
     }
     if (bitCount > 0) {
-        out += constants_1.CROCKFORD_ALPHABET[(value << (5 - bitCount)) & 31];
+        out += exports.CROCKFORD_ALPHABET[(value << (5 - bitCount)) & 31];
     }
     return out;
 }
-async function createCompanionHello() {
-    const [codeBytes, companionEphemeralKeyPair, salt, counter] = await Promise.all([
-        (0, _crypto_1.randomBytesAsync)(5),
+function normalizeCustomPairingCode(input) {
+    const stripped = input.replace(/-/g, '').toUpperCase();
+    if (stripped.length !== 8) {
+        throw new Error(`custom pairing code must be 8 characters, got ${stripped.length}`);
+    }
+    for (let i = 0; i < stripped.length; i += 1) {
+        if (exports.CROCKFORD_ALPHABET.indexOf(stripped[i]) < 0) {
+            throw new Error(`custom pairing code contains invalid character "${stripped[i]}" (allowed: ${exports.CROCKFORD_ALPHABET})`);
+        }
+    }
+    return stripped;
+}
+async function createCompanionHello(options = {}) {
+    const normalizedCustomCode = options.customCode !== undefined ? normalizeCustomPairingCode(options.customCode) : null;
+    const [companionEphemeralKeyPair, salt, counter, codeBytes] = await Promise.all([
         X25519_1.X25519.generateKeyPair(),
         (0, _crypto_1.randomBytesAsync)(32),
-        (0, _crypto_1.randomBytesAsync)(16)
+        (0, _crypto_1.randomBytesAsync)(16),
+        normalizedCustomCode !== null ? Promise.resolve(null) : (0, _crypto_1.randomBytesAsync)(5)
     ]);
-    const pairingCode = bytesToCrockford(codeBytes);
-    const cipher = await (0, _crypto_1.pbkdf2DeriveAesCtrKey)(bytes_1.TEXT_ENCODER.encode(pairingCode), salt, constants_1.PBKDF2_ITERATIONS);
+    const pairingCode = normalizedCustomCode ?? bytesToCrockford(codeBytes);
+    const cipher = await (0, _crypto_1.pbkdf2DeriveAesCtrKey)(bytes_1.TEXT_ENCODER.encode(pairingCode), salt, exports.PBKDF2_ITERATIONS);
     const encrypted = await (0, _crypto_1.aesCtrEncrypt)(cipher, counter, companionEphemeralKeyPair.pubKey);
     return {
         pairingCode,
@@ -44,29 +60,31 @@ async function completeCompanionFinish(args) {
     if (args.wrappedPrimaryEphemeralPub.length <= 48) {
         throw new Error('invalid wrapped primary payload');
     }
-    const pairingCipher = await (0, _crypto_1.pbkdf2DeriveAesCtrKey)(bytes_1.TEXT_ENCODER.encode(args.pairingCode), args.wrappedPrimaryEphemeralPub.subarray(0, 32), constants_1.PBKDF2_ITERATIONS);
+    const pairingCipher = await (0, _crypto_1.pbkdf2DeriveAesCtrKey)(bytes_1.TEXT_ENCODER.encode(args.pairingCode), args.wrappedPrimaryEphemeralPub.subarray(0, 32), exports.PBKDF2_ITERATIONS);
     const primaryEphemeralPub = await (0, _crypto_1.aesCtrDecrypt)(pairingCipher, args.wrappedPrimaryEphemeralPub.subarray(32, 48), args.wrappedPrimaryEphemeralPub.subarray(48));
     if (primaryEphemeralPub.length === 0) {
         throw new Error('empty primary ephemeral public key');
     }
-    const sharedEphemeral = await X25519_1.X25519.scalarMult(args.companionEphemeralPrivKey, primaryEphemeralPub);
-    const [bundleSalt, bundleSecret, bundleIv] = await Promise.all([
+    const [sharedEphemeral, bundleSalt, bundleSecret, bundleIv] = await Promise.all([
+        X25519_1.X25519.scalarMult(args.companionEphemeralPrivKey, primaryEphemeralPub),
         (0, _crypto_1.randomBytesAsync)(32),
         (0, _crypto_1.randomBytesAsync)(32),
         (0, _crypto_1.randomBytesAsync)(12)
     ]);
-    const bundleEncryptionKeyRaw = await (0, _crypto_1.hkdf)(sharedEphemeral, bundleSalt, constants_2.WA_PAIRING_KDF_INFO.LINK_CODE_BUNDLE, 32);
+    const bundleEncryptionKeyRaw = await (0, _crypto_1.hkdf)(sharedEphemeral, bundleSalt, constants_1.WA_PAIRING_KDF_INFO.LINK_CODE_BUNDLE, 32);
     const bundleEncryptionKey = await (0, _crypto_1.importAesGcmKey)(bundleEncryptionKeyRaw, ['encrypt']);
     const plaintextBundle = (0, bytes_1.concatBytes)([
         args.registrationIdentityKeyPair.pubKey,
         args.primaryIdentityPub,
         bundleSecret
     ]);
-    const encryptedBundle = await (0, _crypto_1.aesGcmEncrypt)(bundleEncryptionKey, bundleIv, plaintextBundle);
+    const [encryptedBundle, sharedIdentity] = await Promise.all([
+        (0, _crypto_1.aesGcmEncrypt)(bundleEncryptionKey, bundleIv, plaintextBundle),
+        X25519_1.X25519.scalarMult(args.registrationIdentityKeyPair.privKey, args.primaryIdentityPub)
+    ]);
     const wrappedKeyBundle = (0, bytes_1.concatBytes)([bundleSalt, bundleIv, encryptedBundle]);
-    const sharedIdentity = await X25519_1.X25519.scalarMult(args.registrationIdentityKeyPair.privKey, args.primaryIdentityPub);
     const advMaterial = (0, bytes_1.concatBytes)([sharedEphemeral, sharedIdentity, bundleSecret]);
-    const advSecret = await (0, _crypto_1.hkdf)(advMaterial, null, constants_2.WA_PAIRING_KDF_INFO.ADV_SECRET, 32);
+    const advSecret = await (0, _crypto_1.hkdf)(advMaterial, null, constants_1.WA_PAIRING_KDF_INFO.ADV_SECRET, 32);
     return {
         wrappedKeyBundle,
         companionIdentityPublic: args.registrationIdentityKeyPair.pubKey,