Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix: store in Passphrases

Browse source
This commit is contained in:
the-djmaze 2024-02-23 03:22:29 +01:00
parent 6f33bc23d3
commit a7041b4efb
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/Stores/User/GnuPG.js
View file

@ -70,8 +70,7 @@ export const GnuPGUserStore = new class {
}; };
if (isPrivate) { if (isPrivate) {
key.password = async (btnTxt = 'SIGN') => { key.password = async (btnTxt = 'SIGN') => {
const pass = await Passphrases.ask( const pass = await Passphrases.ask(key,
key,
'GnuPG key<br>' + key.id + ' ' + key.emails[0], 'GnuPG key<br>' + key.id + ' ' + key.emails[0],
'CRYPTO/'+btnTxt 'CRYPTO/'+btnTxt
); );

5
dev/Stores/User/OpenPGP.js
View file

@ -24,8 +24,7 @@ const
return privateKey.key; return privateKey.key;
} }
const key = privateKey.id, const key = privateKey.id,
pass = await Passphrases.ask( pass = await Passphrases.ask(privateKey,
key,
'OpenPGP.js key<br>' + key + ' ' + privateKey.emails[0], 'OpenPGP.js key<br>' + key + ' ' + privateKey.emails[0],
'CRYPTO/'+btnTxt 'CRYPTO/'+btnTxt
); );
@ -35,7 +34,7 @@ const
privateKey: privateKey.key, privateKey: privateKey.key,
passphrase passphrase
}); });
result && pass.remember && Passphrases.set(key, passphrase); result && pass.remember && Passphrases.set(privateKey, passphrase);
return result; return result;
} }
}, },

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

@ -1566,8 +1566,7 @@ export class ComposePopupView extends AbstractViewPopup {
params.signCertificate = identity.smimeCertificate(); params.signCertificate = identity.smimeCertificate();
params.signPrivateKey = identity.smimeKey(); params.signPrivateKey = identity.smimeKey();
if (identity.smimeKeyEncrypted()) { if (identity.smimeKeyEncrypted()) {
const pass = await Passphrases.ask( const pass = await Passphrases.ask(identity,
identity.smimeKey(),
i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email()}), i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email()}),
'CRYPTO/DECRYPT' 'CRYPTO/DECRYPT'
); );