@crossdyne/security 0.5.0-beta.1 → 0.5.0-beta.2

package/dist/index.cjs

@@ -74,20 +74,31 @@ var SecurityUtils = class {
       diff |= a[i] ^ b[i];
     return diff === 0;
   }
-  /** Modular exponentiation (base^exp mod mod) using binary exponentiation. */
-  static expMod(base, exp, mod) {
+  /**
+   * Async modular exponentiation with event-loop yielding.
+   * @param base - The base value.
+   * @param exp - The exponent.
+   * @param mod - The modulus.
+   * @param yieldEvery - Number of iterations before yielding (default 64).
+   */
+  static async expModAsync(base, exp, mod, yieldEvery = 64) {
     if (mod === 1n) return 0n;
     let res = 1n;
     base = base % mod;
+    let i = 0;
     while (exp > 0n) {
       if ((exp & 1n) === 1n)
         res = res * base % mod;
       exp >>= 1n;
       if (exp > 0n)
         base = base * base % mod;
+      if (++i % yieldEvery === 0) {
+        await new Promise((resolve) => setTimeout(resolve, 0));
+      }
     }
     return res;
   }
+  /** Converts bigint to minimal-length big-endian bytes (no padding). */
   static bigIntToRawBytes(bn) {
     if (bn === 0n)
       return new Uint8Array([0]);
@@ -253,7 +264,6 @@ var CryptoService = class {
   * Encrypts a serializable object to a Base64 string.
   * @param dataModel - Object or Uint8Array to encrypt.
   * @param key - AES-256 key (32 bytes).
-  * @param options - AES-GCM configuration; uses default if omitted.
   * @returns Base64-encoded ciphertext with prepended nonce.
   */
   async encryptData(dataModel, key, version = 1 /* V1 */) {
@@ -300,7 +310,6 @@ var CryptoService = class {
   * Decrypts a Base64-encoded ciphertext back to the original object.
   * @param encryptedBase64 - The encrypted data.
   * @param key - AES-256 key (32 bytes).
-  * @param options - AES-GCM configuration; uses default if omitted.
   * @returns Deserialized object, or null if input is empty.
   * @throws If authentication tag mismatch or corrupted data.
   */
@@ -355,15 +364,14 @@ var CryptoService = class {
 // src/crypto/key-derivation.service.ts
 var KeyDerivationService = class {
   /**
-  * Derives KEK and Base64 AuthHash. Identity is hashed as-is — caller must 
-  * normalize (trim, lowercase, etc.) before calling.
-  * @param identity - User identity (pre-normalized by caller).
-  * @param identity - User identity (email, username).
-  * @param password - User password.
-  * @param salt - Random salt.
-  * @param options - KDF configuration; uses default if omitted.
-  * @returns Object with `kek` (Uint8Array) and `authHash` (Base64 string).
-  */
+   * Derives KEK and Base64 AuthHash. Identity is used as-is in the 
+   * combined salt string — caller must normalize (trim, lowercase, etc.) before calling.
+   * @param identity - User identity (email, username). Must be pre-normalized by caller.
+   * @param password - User password.
+   * @param salt - Random salt (minimum 16 bytes).
+   * @param version - Crypto version for profile selection.
+   * @returns Object with `kek` (Uint8Array) and `authHash` (Base64 string).
+   */
   async deriveKeysFromPassword(identity, password, salt, version) {
     if (!identity || identity.length === 0)
       throw new Error("Identity cannot be null or empty.");
@@ -402,63 +410,6 @@ var KeyDerivationService = class {
       authHash: SecurityUtils.toBase64(new Uint8Array(authBytes))
     };
   }
-  /**
-  * Derives an SRP-compatible authentication hash (output size = hash output length).
-  * Identity is hashed as-is — caller must normalize (trim, lowercase, etc.) before calling.
-  * @param identity - User identity (pre-normalized by caller).
-  * @param identity - User identity.
-  * @param password - User password.
-  * @param salt - Random salt.
-  * @param srpHashAlgorithm - SRP hash algorithm (SHA-256/384/512).
-  * @param options - KDF configuration; uses default if omitted.
-  * @returns Raw hash bytes for use as SRP verifier input (x).
-  */
-  async deriveAuthHashForSrp(identity, password, salt, srpHashAlgorithm, version) {
-    if (!identity || identity.trim().length === 0)
-      throw new Error("Identity cannot be null or empty.");
-    if (!password || password.trim().length === 0)
-      throw new Error("Password cannot be null or empty.");
-    if (!salt || salt.length < 16)
-      throw new Error("Salt must be at least 16 bytes.");
-    const profile = CryptoProfileRegistry.getProfile(version);
-    const opts = profile.kdfOptions;
-    opts.validate();
-    const srpHashSize = HashSizes[srpHashAlgorithm];
-    const combinedPassword = `${identity}:${password}`;
-    const passwordBytes = new TextEncoder().encode(combinedPassword);
-    const baseKey = await crypto.subtle.importKey(
-      "raw",
-      passwordBytes,
-      "PBKDF2",
-      false,
-      ["deriveBits"]
-    );
-    const masterKeyBits = await crypto.subtle.deriveBits({
-      name: "PBKDF2",
-      salt,
-      iterations: opts.pbkdf2Iterations,
-      hash: srpHashAlgorithm
-    }, baseKey, srpHashSize * 8);
-    const masterKey = await crypto.subtle.importKey(
-      "raw",
-      masterKeyBits,
-      "HKDF",
-      false,
-      ["deriveBits"]
-    );
-    const info = new TextEncoder().encode("SRP-AUTH-HASH-v1");
-    const authBytes = await crypto.subtle.deriveBits(
-      {
-        name: "HKDF",
-        hash: srpHashAlgorithm,
-        salt: new Uint8Array(0),
-        info
-      },
-      masterKey,
-      srpHashSize * 8
-    );
-    return new Uint8Array(authBytes);
-  }
 };
 
 // src/utils/srp-encoding.ts
@@ -482,7 +433,7 @@ var SrpEncoding = class {
   * Follows RFC 5054 / SRP-6a:
   * - H(N) and H(g) are hashed as modulus-sized values.
   * - Identity (I) is hashed as raw UTF-8 bytes.
-  * - A and B are padded to the modulus size before hashing.
+  * - A and B are zero-padded to the modulus size before hashing.
   * - K is the session key (H(S) without padding).
   * 
   * @param ctx - SRP context containing N, g, hash algorithm, and modulus size.
@@ -513,7 +464,10 @@ var SrpEncoding = class {
       sessionKeyK
     );
   }
-  /** Computes M2 = H(A || M1 || sessionKeyK). */
+  /** 
+  * Computes M2 = H( PAD(A) || M1 || sessionKeyK ).
+  * A is zero-padded to the modulus size before hashing.
+  */
   static async computeM2(ctx, A, m1Bytes, sessionKeyK) {
     return this.computeHash(
       ctx.hashAlgorithmName,
@@ -525,10 +479,14 @@ var SrpEncoding = class {
   /** Computes session key K = H(S). */
   static async computeSessionKey(ctx, S) {
     const sBytes = SecurityUtils.bigIntToRawBytes(S);
-    const hashBuffer = await crypto.subtle.digest(ctx.hashAlgorithmName, sBytes.buffer);
+    const safeBuffer = sBytes.buffer.slice(
+      sBytes.byteOffset,
+      sBytes.byteOffset + sBytes.byteLength
+    );
+    const hashBuffer = await crypto.subtle.digest(ctx.hashAlgorithmName, safeBuffer);
     return new Uint8Array(hashBuffer);
   }
-  /** Hashes bytes and returns raw Uint8Array (для M1/M2). */
+  /** Hashes concatenated byte arrays and returns raw Uint8Array. */
   static async computeHash(algo, ...buffers) {
     const totalLen = buffers.reduce((sum, b) => sum + b.length, 0);
     const combined = new Uint8Array(totalLen);
@@ -554,35 +512,159 @@ var SrpEncoding = class {
   }
 };
 
-// src/srp/srp-client-service.ts
-var SrpClientService = class {
+// src/srp/srp-group.ts
+var SrpGroup = /* @__PURE__ */ ((SrpGroup2) => {
+  SrpGroup2[SrpGroup2["Rfc5054_1024"] = 1] = "Rfc5054_1024";
+  SrpGroup2[SrpGroup2["Rfc5054_1536"] = 2] = "Rfc5054_1536";
+  SrpGroup2[SrpGroup2["Rfc5054_2048"] = 3] = "Rfc5054_2048";
+  SrpGroup2[SrpGroup2["Rfc5054_3072"] = 4] = "Rfc5054_3072";
+  SrpGroup2[SrpGroup2["Rfc5054_4096"] = 5] = "Rfc5054_4096";
+  SrpGroup2[SrpGroup2["Rfc5054_6144"] = 6] = "Rfc5054_6144";
+  SrpGroup2[SrpGroup2["Rfc5054_8192"] = 7] = "Rfc5054_8192";
+  SrpGroup2[SrpGroup2["Custom"] = 99] = "Custom";
+  return SrpGroup2;
+})(SrpGroup || {});
+
+// src/srp/srp-group-params.ts
+var SrpGroupParams = class {
+  /**
+   * Returns the prime modulus N for the given SRP group.
+   * @param group - SRP group identifier.
+   * @returns N as a bigint.
+   */
+  static getN(group) {
+    switch (group) {
+      case 1 /* Rfc5054_1024 */:
+        return BigInt("0xEEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9AFD5138FE8376435B9FC61D2FC0EB06E3");
+      case 2 /* Rfc5054_1536 */:
+        return BigInt("0x9DEF3CAFB939277AB1F12A8617A47BBBDBA51DF499AC4C80BEEEA9614B19CC4D5F4F5F556E27CBDE51C6A94BE4607A291558903BA0D0F84380B655BB9A22E8DCDF028A7CEC67F0D08134B1C8B97989149B609E0BE3BAB63D47548381DBC5B1FC764E3F4B53DD9DA1158BFD3E2B9C8CF56EDF019539349627DB2FD53D24B7C48665772E437D6C7F8CE442734AF7CCB7AE837C264AE3A9BEB87F8A2FE9B8B5292E5A021FFF5E91479E8CE7A28C2442C6F315180F93499A234DCF76E3FED135F9BB");
+      case 3 /* Rfc5054_2048 */:
+        return BigInt("0xAC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF6095179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B9078717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB3786160279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DBFBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73");
+      case 4 /* Rfc5054_3072 */:
+        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF");
+      case 5 /* Rfc5054_4096 */:
+        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF");
+      case 6 /* Rfc5054_6144 */:
+        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AACC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DCC4024FFFFFFFFFFFFFFFF");
+      case 7 /* Rfc5054_8192 */:
+        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AACC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD922222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC50846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E7160C980DD98EDD3DFFFFFFFFFFFFFFFFF");
+      default:
+        throw new Error("Unsupported group");
+    }
+  }
+  /**
+   * Returns the generator g for the given SRP group.
+   * @param group - SRP group identifier.
+   * @returns g as a bigint (2, 5, or 19).
+   */
+  static getG(group) {
+    switch (group) {
+      case 1 /* Rfc5054_1024 */:
+        return BigInt(2);
+      case 2 /* Rfc5054_1536 */:
+        return BigInt(2);
+      case 3 /* Rfc5054_2048 */:
+        return BigInt(2);
+      case 4 /* Rfc5054_3072 */:
+        return BigInt(5);
+      case 5 /* Rfc5054_4096 */:
+        return BigInt(5);
+      case 6 /* Rfc5054_6144 */:
+        return BigInt(5);
+      case 7 /* Rfc5054_8192 */:
+        return BigInt(19);
+      default:
+        throw new Error("Unsupported group");
+    }
+  }
+};
+
+// src/srp/srp-options.ts
+var SrpOptions = class {
   constructor() {
-    this.keyDerivation = new KeyDerivationService();
+    /** Diffie-Hellman group. Default Rfc5054_3072 (g=5). */
+    this.group = 4 /* Rfc5054_3072 */;
+    /** Hash algorithm for SRP computations. Default SHA-256. */
+    this.hashAlgorithmName = "SHA-256";
+    /** Salt size in bytes. Default 32. */
+    this.saltSize = 32;
+  }
+  /** Prime modulus N for the selected group. */
+  get N() {
+    return SrpGroupParams.getN(this.group);
+  }
+  /** Generator g for the selected group (2, 5, or 19). */
+  get g() {
+    return SrpGroupParams.getG(this.group);
+  }
+  /** Byte length of N (ceil(bitLength / 8)). */
+  get modulusSize() {
+    return Math.floor((this.N.toString(2).length + 7) / 8);
   }
+  /**
+   * Computes the multiplier parameter k = H(PAD(N) || PAD(g)) (RFC 5054, 2.5.3).
+   * @returns k as a bigint.
+   */
+  async computeK() {
+    const nBytes = SecurityUtils.bigIntToFixedBytes(this.N, this.modulusSize);
+    const gBytes = SecurityUtils.bigIntToFixedBytes(this.g, this.modulusSize);
+    const combined = new Uint8Array(nBytes.length + gBytes.length);
+    combined.set(nBytes, 0);
+    combined.set(gBytes, nBytes.length);
+    const hash = await crypto.subtle.digest(this.hashAlgorithmName, combined);
+    return SecurityUtils.bytesToBigInt(new Uint8Array(hash));
+  }
+};
+
+// src/srp/srp-context-factory.ts
+var SrpContextFactory = class {
+  /**
+   * Creates an SRP context with the specified group.
+   * @param group - SRP group (default Rfc5054_3072).
+   * @returns A ready-to-use SrpContext.
+   */
+  static async create(group = 4 /* Rfc5054_3072 */) {
+    const opts = new SrpOptions();
+    opts.group = group;
+    opts.hashAlgorithmName = group === 5 /* Rfc5054_4096 */ || group === 6 /* Rfc5054_6144 */ || group === 7 /* Rfc5054_8192 */ ? "SHA-384" : "SHA-256";
+    return {
+      N: opts.N,
+      g: opts.g,
+      k: await opts.computeK(),
+      modulusSize: opts.modulusSize,
+      hashAlgorithmName: opts.hashAlgorithmName,
+      hashSize: opts.hashAlgorithmName === "SHA-256" ? 32 : opts.hashAlgorithmName === "SHA-384" ? 48 : 64
+    };
+  }
+};
+
+// src/srp/srp-client-service.ts
+var SrpClientService = class {
   /**
   * Computes SRP verifier v = g^x mod N from the authentication hash.
   * @param authHash - Auth hash (Base64).
-  * @param ctx - SRP context (N, g, hash algorithm, etc.).
+  * @param group - SRP group (determines modulus N, generator g, hash).
   * @returns Verifier as Base64 string.
   */
-  async generateSrpVerifier(authHash, ctx) {
+  async generateSrpVerifier(authHash, group) {
+    const ctx = await SrpContextFactory.create(group);
     const x = SecurityUtils.bytesToBigInt(SecurityUtils.fromBase64(authHash));
-    const v = SecurityUtils.expMod(ctx.g, x, ctx.N);
+    const v = await SecurityUtils.expModAsync(ctx.g, x, ctx.N);
     return SecurityUtils.toBase64(SrpEncoding.toModulusBytes(ctx, v));
   }
   /**
    * Generates client proof (A, M1, session key S) from server challenge.
    * @param login - User login.
-   * @param password - Plaintext password.
+   * @param authHashBytes - SRP private exponent x as raw bytes (derived from auth hash).
    * @param saltBase64 - Server salt (standard Base64).
    * @param B_base64 - Server public ephemeral B (standard Base64).
-   * @param ctx - SRP context.
+   * @param group - SRP group (determines modulus N, generator g, hash).
    * @returns Object with A and M1 as standard Base64; SessionKeyK as raw bytes.
    */
-  async generateSrpProof(login, password, saltBase64, B_base64, ctx, version) {
+  async generateSrpProof(login, authHashBytes, saltBase64, B_base64, group) {
+    const ctx = await SrpContextFactory.create(group);
     const salt = SecurityUtils.fromBase64(saltBase64);
-    const authHash = await this.keyDerivation.deriveAuthHashForSrp(login, password, salt, ctx.hashAlgorithmName, version);
-    const x = SecurityUtils.bytesToBigInt(authHash);
+    const x = SecurityUtils.bytesToBigInt(authHashBytes);
     const privateKeySize = Math.max(32, Math.floor(ctx.modulusSize / 2));
     let aBytes;
     let a;
@@ -590,7 +672,7 @@ var SrpClientService = class {
       aBytes = crypto.getRandomValues(new Uint8Array(privateKeySize));
       a = SecurityUtils.bytesToBigInt(aBytes);
     } while (a === 0n);
-    const A = SecurityUtils.expMod(ctx.g, a, ctx.N);
+    const A = await SecurityUtils.expModAsync(ctx.g, a, ctx.N);
     if (A <= 0n || A >= ctx.N)
       throw new Error("Invalid client public key A.");
     const B = SecurityUtils.bytesToBigInt(SecurityUtils.fromBase64(B_base64));
@@ -599,11 +681,11 @@ var SrpClientService = class {
     const u = await SrpEncoding.hashModuli(ctx, A, B);
     if (u === 0n)
       throw new Error("\u041D\u0435\u0434\u043E\u043F\u0443\u0441\u0442\u0438\u043C\u043E\u0435 \u0437\u043D\u0430\u0447\u0435\u043D\u0438\u0435 u");
-    const gX = SecurityUtils.expMod(ctx.g, x, ctx.N);
+    const gX = await SecurityUtils.expModAsync(ctx.g, x, ctx.N);
     const term = ctx.k * gX % ctx.N;
     const base = (B - term + ctx.N) % ctx.N;
     const exponent = a + u * x;
-    const S = SecurityUtils.expMod(base, exponent, ctx.N);
+    const S = await SecurityUtils.expModAsync(base, exponent, ctx.N);
     if (S === 0n)
       throw new Error("Critical error: S === 0");
     const sessionKeyK = await SrpEncoding.computeSessionKey(ctx, S);
@@ -618,12 +700,13 @@ var SrpClientService = class {
    * Validates the server proof M2 to authenticate the server.
    * @param A_b64 - Client public A (Base64).
    * @param M1_b64 - Client proof M1 (Base64).
-   * @param S_b64 - Session key S (Base64).
+   * @param sessionKeyK - Session key K as raw bytes.
    * @param serverM2_b64 - Server proof M2 (Base64).
-   * @param ctx - SRP context.
+   * @param group - SRP group (determines modulus N, generator g, hash).
    * @returns True if the server proof is valid.
    */
-  async verifyServerM2(A_b64, M1_b64, sessionKeyK, serverM2_b64, ctx) {
+  async verifyServerM2(A_b64, M1_b64, sessionKeyK, serverM2_b64, group) {
+    const ctx = await SrpContextFactory.create(group);
     const A = SecurityUtils.bytesToBigInt(SecurityUtils.fromBase64(A_b64));
     const M1 = SecurityUtils.fromBase64(M1_b64);
     const computedM2 = await SrpEncoding.computeM2(ctx, A, M1, sessionKeyK);
@@ -638,14 +721,16 @@ var SrpServerService = class {
    * Generates server challenge B and session state from verifier.
    * @param login - User login.
    * @param verifierBytes - Stored verifier v as byte array.
-   * @param ctx - SRP context (hash, N, g, etc.).
-   * @returns Session state with private b, verifier, and public B.
+   * @param salt - User salt (raw bytes).
+   * @param group - SRP group (determines modulus N, generator g, hash).
+   * @returns Session state with private b, verifier, public B, and salt.
    */
-  async getSrpChallenge(login, verifierBytes, salt, ctx) {
+  async getSrpChallenge(login, verifierBytes, salt, group) {
     if (!login || login.trim().length === 0)
       throw new Error("Login cannot be null or empty.");
     if (!verifierBytes || verifierBytes.length === 0)
       throw new Error("Verifier cannot be null or empty.");
+    const ctx = await SrpContextFactory.create(group);
     const v = SecurityUtils.bytesToBigInt(verifierBytes);
     if (v <= 0n || v >= ctx.N)
       throw new Error("The verifier is corrupted");
@@ -656,7 +741,7 @@ var SrpServerService = class {
       if (b === 0n) {
         continue;
       }
-      const gB = SecurityUtils.expMod(ctx.g, b, ctx.N);
+      const gB = await SecurityUtils.expModAsync(ctx.g, b, ctx.N);
       const B = (ctx.k * v + gB) % ctx.N;
       if (B !== 0n) {
         return {
@@ -674,11 +759,12 @@ var SrpServerService = class {
    * @param sessionState - Server session state.
    * @param a - Client public A (Base64).
    * @param m1 - Client proof M1 (Base64).
-   * @param ctx - SRP context.
+   * @param group - SRP group (determines modulus N, generator g, hash).
    * @returns Server proof M2 as Base64 string.
    * @throws If verification fails or input is invalid.
    */
-  async verifySrpProof(sessionState, a, m1, ctx) {
+  async verifySrpProof(sessionState, a, m1, group) {
+    const ctx = await SrpContextFactory.create(group);
     const A = SecurityUtils.bytesToBigInt(SecurityUtils.fromBase64(a));
     const M1_client = SecurityUtils.fromBase64(m1);
     const b = SecurityUtils.bytesToBigInt(sessionState.privateKeyB);
@@ -695,8 +781,8 @@ var SrpServerService = class {
     const u = await SrpEncoding.hashModuli(ctx, A, B);
     if (u === 0n)
       throw new Error("Error in calculating the parameter u");
-    const vU = SecurityUtils.expMod(v, u, ctx.N);
-    const S = SecurityUtils.expMod(A * vU % ctx.N, b, ctx.N);
+    const vU = await SecurityUtils.expModAsync(v, u, ctx.N);
+    const S = await SecurityUtils.expModAsync(A * vU % ctx.N, b, ctx.N);
     if (S === 0n)
       throw new Error("Critical error: shared secret S is zero (possible malicious A).");
     const sessionKeyK = await SrpEncoding.computeSessionKey(ctx, S);
@@ -708,129 +794,66 @@ var SrpServerService = class {
   }
 };
 
-// src/srp/srp-group.ts
-var SrpGroup = /* @__PURE__ */ ((SrpGroup2) => {
-  SrpGroup2[SrpGroup2["Rfc5054_1024"] = 1] = "Rfc5054_1024";
-  SrpGroup2[SrpGroup2["Rfc5054_1536"] = 2] = "Rfc5054_1536";
-  SrpGroup2[SrpGroup2["Rfc5054_2048"] = 3] = "Rfc5054_2048";
-  SrpGroup2[SrpGroup2["Rfc5054_3072"] = 4] = "Rfc5054_3072";
-  SrpGroup2[SrpGroup2["Rfc5054_4096"] = 5] = "Rfc5054_4096";
-  SrpGroup2[SrpGroup2["Rfc5054_6144"] = 6] = "Rfc5054_6144";
-  SrpGroup2[SrpGroup2["Rfc5054_8192"] = 7] = "Rfc5054_8192";
-  SrpGroup2[SrpGroup2["Custom"] = 99] = "Custom";
-  return SrpGroup2;
-})(SrpGroup || {});
-
-// src/srp/srp-group-params.ts
-var SrpGroupParams = class {
+// src/srp/srp-key-derivation.service.ts
+var SrpKeyDerivationService = class {
   /**
-   * Returns the prime modulus N for the given SRP group.
-   * @param group - SRP group identifier.
-   * @returns N as a bigint.
+   * Derives an SRP-compatible authentication hash (output size = hash output length).
+   * Identity is used as-is in the combined string — caller must normalize 
+   * (trim, lowercase, etc.) before calling.
+   * @param identity - User identity (email, username). Must be pre-normalized by caller.
+   * @param password - User password.
+   * @param salt - Random salt (minimum 16 bytes).
+   * @param srpGroup - SRP group (determines hash algorithm and modulus).
+   * @param version - Crypto version for KDF profile selection.
+   * @returns Raw hash bytes for use as SRP verifier input (x).
    */
-  static getN(group) {
-    switch (group) {
-      case 1 /* Rfc5054_1024 */:
-        return BigInt("0xEEAF0AB9ADB38DD69C33F80AFA8FC5E86072618775FF3C0B9EA2314C9C256576D674DF7496EA81D3383B4813D692C6E0E0D5D8E250B98BE48E495C1D6089DAD15DC7D7B46154D6B6CE8EF4AD69B15D4982559B297BCF1885C529F566660E57EC68EDBC3C05726CC02FD4CBF4976EAA9AFD5138FE8376435B9FC61D2FC0EB06E3");
-      case 2 /* Rfc5054_1536 */:
-        return BigInt("0x9DEF3CAFB939277AB1F12A8617A47BBBDBA51DF499AC4C80BEEEA9614B19CC4D5F4F5F556E27CBDE51C6A94BE4607A291558903BA0D0F84380B655BB9A22E8DCDF028A7CEC67F0D08134B1C8B97989149B609E0BE3BAB63D47548381DBC5B1FC764E3F4B53DD9DA1158BFD3E2B9C8CF56EDF019539349627DB2FD53D24B7C48665772E437D6C7F8CE442734AF7CCB7AE837C264AE3A9BEB87F8A2FE9B8B5292E5A021FFF5E91479E8CE7A28C2442C6F315180F93499A234DCF76E3FED135F9BB");
-      case 3 /* Rfc5054_2048 */:
-        return BigInt("0xAC6BDB41324A9A9BF166DE5E1389582FAF72B6651987EE07FC3192943DB56050A37329CBB4A099ED8193E0757767A13DD52312AB4B03310DCD7F48A9DA04FD50E8083969EDB767B0CF6095179A163AB3661A05FBD5FAAAE82918A9962F0B93B855F97993EC975EEAA80D740ADBF4FF747359D041D5C33EA71D281E446B14773BCA97B43A23FB801676BD207A436C6481F1D2B9078717461A5B9D32E688F87748544523B524B0D57D5EA77A2775D2ECFA032CFBDBF52FB3786160279004E57AE6AF874E7303CE53299CCC041C7BC308D82A5698F3A8D0C38271AE35F8E9DBFBB694B5C803D89F7AE435DE236D525F54759B65E372FCD68EF20FA7111F9E4AFF73");
-      case 4 /* Rfc5054_3072 */:
-        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF");
-      case 5 /* Rfc5054_4096 */:
-        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF");
-      case 6 /* Rfc5054_6144 */:
-        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AACC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DCC4024FFFFFFFFFFFFFFFF");
-      case 7 /* Rfc5054_8192 */:
-        return BigInt("0xFFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E208E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D788719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA993B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AEB06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1BDB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92ECF032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AACC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E438777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300741FA7BF8AFC47ED2576F6936BA424663AAB639C5AE4F5683423B4742BF1C978238F16CBE39D652DE3FDB8BEFC848AD922222E04A4037C0713EB57A81A23F0C73473FC646CEA306B4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A66D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC50846851DF9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F924009438B481C6CD7889A002ED5EE382BC9190DA6FC026E479558E4475677E9AA9E3050E2765694DFC81F56E880B96E7160C980DD98EDD3DFFFFFFFFFFFFFFFFF");
-      default:
-        throw new Error("Unsupported group");
-    }
-  }
-  /**
-   * Returns the generator g for the given SRP group.
-   * @param group - SRP group identifier.
-   * @returns g as a bigint (2, 5, or 19).
-   */
-  static getG(group) {
-    switch (group) {
-      case 1 /* Rfc5054_1024 */:
-        return BigInt(2);
-      case 2 /* Rfc5054_1536 */:
-        return BigInt(2);
-      case 3 /* Rfc5054_2048 */:
-        return BigInt(2);
-      case 4 /* Rfc5054_3072 */:
-        return BigInt(5);
-      case 5 /* Rfc5054_4096 */:
-        return BigInt(5);
-      case 6 /* Rfc5054_6144 */:
-        return BigInt(5);
-      case 7 /* Rfc5054_8192 */:
-        return BigInt(19);
-      default:
-        throw new Error("Unsupported group");
-    }
-  }
-};
-
-// src/srp/srp-options.ts
-var SrpOptions = class {
-  constructor() {
-    /** Diffie-Hellman group. Default Rfc5054_3072 (g=5). */
-    this.group = 4 /* Rfc5054_3072 */;
-    /** Hash algorithm for SRP computations. Default SHA-256. */
-    this.hashAlgorithmName = "SHA-256";
-    /** Salt size in bytes. Default 32. */
-    this.saltSize = 32;
-  }
-  /** Prime modulus N for the selected group. */
-  get N() {
-    return SrpGroupParams.getN(this.group);
-  }
-  /** Generator g for the selected group (2, 5, or 19). */
-  get g() {
-    return SrpGroupParams.getG(this.group);
-  }
-  /** Byte length of N (ceil(bitLength / 8)). */
-  get modulusSize() {
-    return Math.floor((this.N.toString(2).length + 7) / 8);
-  }
-  /**
-   * Computes the multiplier parameter k = H(PAD(N) || PAD(g)) (RFC 5054, 2.5.3).
-   * @returns k as a bigint.
-   */
-  async computeK() {
-    const nBytes = SecurityUtils.bigIntToFixedBytes(this.N, this.modulusSize);
-    const gBytes = SecurityUtils.bigIntToFixedBytes(this.g, this.modulusSize);
-    const combined = new Uint8Array(nBytes.length + gBytes.length);
-    combined.set(nBytes, 0);
-    combined.set(gBytes, nBytes.length);
-    const hash = await crypto.subtle.digest(this.hashAlgorithmName, combined);
-    return SecurityUtils.bytesToBigInt(new Uint8Array(hash));
-  }
-};
-
-// src/srp/srp-context-factory.ts
-var SrpContextFactory = class {
-  /**
-   * Creates an SRP context with the specified group.
-   * @param group - SRP group (default Rfc5054_3072).
-   * @returns A ready-to-use SrpContext.
-   */
-  static async create(group = 4 /* Rfc5054_3072 */) {
-    const opts = new SrpOptions();
-    opts.group = group;
-    opts.hashAlgorithmName = group === 5 /* Rfc5054_4096 */ || group === 6 /* Rfc5054_6144 */ || group === 7 /* Rfc5054_8192 */ ? "SHA-384" : "SHA-256";
-    return {
-      N: opts.N,
-      g: opts.g,
-      k: await opts.computeK(),
-      modulusSize: opts.modulusSize,
-      hashAlgorithmName: opts.hashAlgorithmName,
-      hashSize: opts.hashAlgorithmName === "SHA-256" ? 32 : opts.hashAlgorithmName === "SHA-384" ? 48 : 64
-    };
+  async deriveAuthHashForSrp(identity, password, salt, srpGroup, version) {
+    if (!identity || identity.trim().length === 0)
+      throw new Error("Identity cannot be null or empty.");
+    if (!password || password.trim().length === 0)
+      throw new Error("Password cannot be null or empty.");
+    if (!salt || salt.length < 16)
+      throw new Error("Salt must be at least 16 bytes.");
+    const profile = CryptoProfileRegistry.getProfile(version);
+    const opts = profile.kdfOptions;
+    opts.validate();
+    const ctx = await SrpContextFactory.create(srpGroup);
+    const srpHashAlgorithm = ctx.hashAlgorithmName;
+    const srpHashSize = HashSizes[srpHashAlgorithm];
+    const combinedPassword = `${identity}:${password}`;
+    const passwordBytes = new TextEncoder().encode(combinedPassword);
+    const baseKey = await crypto.subtle.importKey(
+      "raw",
+      passwordBytes,
+      "PBKDF2",
+      false,
+      ["deriveBits"]
+    );
+    const masterKeyBits = await crypto.subtle.deriveBits({
+      name: "PBKDF2",
+      salt,
+      iterations: opts.pbkdf2Iterations,
+      hash: srpHashAlgorithm
+    }, baseKey, srpHashSize * 8);
+    const masterKey = await crypto.subtle.importKey(
+      "raw",
+      masterKeyBits,
+      "HKDF",
+      false,
+      ["deriveBits"]
+    );
+    const info = new TextEncoder().encode("SRP-AUTH-HASH-v1");
+    const authBytes = await crypto.subtle.deriveBits(
+      {
+        name: "HKDF",
+        hash: srpHashAlgorithm,
+        salt: new Uint8Array(0),
+        info
+      },
+      masterKey,
+      srpHashSize * 8
+    );
+    return new Uint8Array(authBytes);
   }
 };
 
@@ -848,6 +871,7 @@ exports.SrpContextFactory = SrpContextFactory;
 exports.SrpEncoding = SrpEncoding;
 exports.SrpGroup = SrpGroup;
 exports.SrpGroupParams = SrpGroupParams;
+exports.SrpKeyDerivationService = SrpKeyDerivationService;
 exports.SrpOptions = SrpOptions;
 exports.SrpServerService = SrpServerService;
 exports.SupportedHashAlgorithms = SupportedHashAlgorithms;