Skip to content

fix: bind EXPORT_VERSION to HKDF info string in key backup (v3.1) #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 2 commits into from
Closed

fix: bind EXPORT_VERSION to HKDF info string in key backup (v3.1) #73

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c075f26
Initial plan
Copilot Jun 2, 2026
93ac6b2
fix: bind EXPORT_VERSION to HKDF info string in key backup (bump to v…
Copilot Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions src/lib/crypto/private-key-manager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { postQuantumEncryption } from './post-quantum-encryption.js';
/**
* Export format version for compatibility
*/
const EXPORT_VERSION = '3.0'; // Post-quantum: ChaCha20-Poly1305 + HKDF
const EXPORT_VERSION = '3.1'; // Post-quantum: ChaCha20-Poly1305 + HKDF (version-bound HKDF info)

/**
* Private key import/export manager
Expand Down Expand Up @@ -62,7 +62,7 @@ export class PrivateKeyManager {
const passwordKey = await this._deriveKeyFromPassword(password, pbkdfSalt);

// Derive ChaCha20 key using HKDF (post-quantum key derivation)
const chachaKey = await HKDF.derive(passwordKey, hkdfSalt, 'QryptChat-KeyBackup-ChaCha20', 32);
const chachaKey = await HKDF.derive(passwordKey, hkdfSalt, `QryptChat-KeyBackup-v${EXPORT_VERSION}-ChaCha20`, 32);

// Generate nonce for ChaCha20-Poly1305
const nonce = SecureRandom.getRandomBytes(12);
Expand Down Expand Up @@ -126,15 +126,19 @@ export class PrivateKeyManager {

let decryptedJson;

if (parsedData.version === '3.0' && parsedData.algorithm === 'ChaCha20-Poly1305-HKDF') {
// v3.0: ChaCha20-Poly1305 + HKDF (post-quantum)
if ((parsedData.version === '3.0' || parsedData.version === '3.1') && parsedData.algorithm === 'ChaCha20-Poly1305-HKDF') {
// v3.0/v3.1: ChaCha20-Poly1305 + HKDF (post-quantum)
// v3.0 used a static HKDF info string; v3.1+ binds the version to the info string
const encryptedKeysBuffer = new Uint8Array(Base64.decode(parsedData.encryptedKeys));
const pbkdfSalt = new Uint8Array(Base64.decode(parsedData.pbkdfSalt));
const hkdfSalt = new Uint8Array(Base64.decode(parsedData.hkdfSalt));
const nonce = new Uint8Array(Base64.decode(parsedData.nonce));

const passwordKey = await this._deriveKeyFromPassword(password, pbkdfSalt);
const chachaKey = await HKDF.derive(passwordKey, hkdfSalt, 'QryptChat-KeyBackup-ChaCha20', 32);
const hkdfInfo = parsedData.version === '3.0'
? 'QryptChat-KeyBackup-ChaCha20'
: `QryptChat-KeyBackup-v${parsedData.version}-ChaCha20`;
const chachaKey = await HKDF.derive(passwordKey, hkdfSalt, hkdfInfo, 32);

let plaintext;
try {
Expand Down
Loading