the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 15:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Only ask S/MIME private key passphrase when it is encrypted #259

Browse source
This commit is contained in:
the-djmaze 2024-02-20 11:10:43 +01:00
parent f06b6edef5
commit f5f3a90275
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dev/View/Popup/Compose.js
View file

@ -1538,8 +1538,10 @@ export class ComposePopupView extends AbstractViewPopup {
} else if (this.canSMimeSign()) {
params.signCertificate = identity.smimeCertificate();
params.signPrivateKey = identity.smimeKey();
const pass = await AskPopupView.password('S/MIME key', 'CRYPTO/SIGN');
params.signPassphrase = pass?.password;
if (identity.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----')) {
const pass = await AskPopupView.password('S/MIME private key', 'CRYPTO/SIGN');
params.signPassphrase = pass?.password;
}
}
}
if (encrypt) {
@ -1555,7 +1557,7 @@ export class ComposePopupView extends AbstractViewPopup {
params.encryptFingerprints = JSON.stringify(GnuPGUserStore.getPublicKeyFingerprints(recipients));
// } else {
// // S/MIME
// params.encryptCertificates = '';
// params.encryptCertificates = [];
} else {
throw 'Encryption with ' + encrypt + ' not yet implemented';
}