@session.js/blinded-session-id 1.0.0 → 1.0.1

package/dist/index.d.ts

@@ -1,8 +1,8 @@
 export declare function crypto_sign_curve25519_pk_to_ed25519(pk: Uint8Array): Uint8Array;
 export declare const convertToEd25519Key: (key: string) => string;
 export declare const convertToX25519Key: (key: string) => string;
-export declare const generateKAs: (sessionId: string, serverPk: string) => Uint8Array[];
-export declare const generateBlindedIds: (sessionId: string, serverPk: string) => string[];
+export declare const generateKA: (sessionId: string, serverPk: string) => Uint8Array;
+export declare const generateBlindedKeys: (sessionId: string, serverPk: string) => Uint8Array[];
 export declare const blindSessionId: ({ sessionId, serverPk }: {
     sessionId: string;
     serverPk: string;

package/dist/index.js

@@ -524,23 +524,25 @@ const generateBlindingFactor = (serverPk) => {
     const serverPkHash = sodium.crypto_generichash(64, hexServerPk);
     return sodium.crypto_core_ed25519_scalar_reduce(serverPkHash);
 };
-export const generateKAs = (sessionId, serverPk) => {
+export const generateKA = (sessionId, serverPk) => {
     const sessionIdNoPrefix = sessionId.substring(2);
     const kBytes = generateBlindingFactor(serverPk);
     const xEd25519Key = sodium.from_hex(convertToEd25519Key(sessionIdNoPrefix));
     const kA = combineKeys(kBytes, xEd25519Key);
-    const kA2 = cloneDeep(kA);
-    kA2[31] = kA[31] ^ 0b1000_0000;
-    return [kA, kA2];
+    return kA;
 };
-export const generateBlindedIds = (sessionId, serverPk) => {
-    const [kA, kA2] = generateKAs(sessionId, serverPk);
-    return ['15' + sodium.to_hex(kA), '15' + sodium.to_hex(kA2)];
+export const generateBlindedKeys = (sessionId, serverPk) => {
+    const kA = generateKA(sessionId, serverPk);
+    const key1 = kA;
+    const modifiedByte = kA[31] & 0x7F;
+    const key2 = Buffer.concat([kA.slice(0, 31), Buffer.from([modifiedByte])]);
+    return [key1, key2];
 };
 export const blindSessionId = ({ sessionId, serverPk }) => {
-    const [kA, kA2] = generateKAs(sessionId, serverPk);
-    if (!(kA[31] & 0x80)) {
-        return '15' + sodium.to_hex(kA2);
+    const [key1, key2] = generateBlindedKeys(sessionId, serverPk);
+    const isKey2 = key1[31] & 0x80;
+    if (isKey2) {
+        return '15' + sodium.to_hex(key2);
     }
-    return '15' + sodium.to_hex(kA);
+    return '15' + sodium.to_hex(key1);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@session.js/blinded-session-id",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "Viktor Shchelochkov <hi@hloth.dev> (https://hloth.dev)",