QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-27 20:14:32 +00:00
Code Issues Projects Releases Wiki Activity

pass the keystore name to asker

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=658126
This commit is contained in:
Justin Karneges 2007-04-26 01:20:54 +00:00
parent 1624941a6e
commit 95b5a54358
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/qca-gnupg/qca-gnupg.cpp
View File

@ -824,7 +824,7 @@ public:
if(c)
kse.change(c);
asker.ask(Event::StylePassphrase, keyStoreList->storeId(0), kse, 0);
asker.ask(Event::StylePassphrase, keyStoreList->storeId(0), keyStoreList->name(0), kse, 0);
asker.waitForResponse();
global_gpg = &gpg;
keyStoreList->submitPassphrase(0, 0, asker.password());

10
plugins/qca-pkcs11/qca-pkcs11.cpp
View File

@ -1863,7 +1863,7 @@ pkcs11KeyStoreListContext::tokenPrompt (
) {
KeyStoreEntry entry;
KeyStoreEntryContext *context = NULL;
QString storeId;
QString storeId, storeName;
bool ret = false;
QCA_logTextMessage (
@ -1879,16 +1879,19 @@ pkcs11KeyStoreListContext::tokenPrompt (
QString *serialized = (QString *)user_data;
context = entryPassive (*serialized);
storeId = context->storeId ();
storeName = context->storeName ();
entry.change (context);
}
else {
registerTokenId (token_id);
storeId = tokenId2storeId (token_id);
storeName = token_id->label;
}
TokenAsker asker;
asker.ask (
storeId,
storeName,
entry,
context
);
@ -1916,7 +1919,7 @@ pkcs11KeyStoreListContext::pinPrompt (
) {
KeyStoreEntry entry;
KeyStoreEntryContext *context = NULL;
QString storeId;
QString storeId, storeName;
bool ret = false;
QCA_logTextMessage (
@ -1934,17 +1937,20 @@ pkcs11KeyStoreListContext::pinPrompt (
QString *serialized = (QString *)user_data;
context = entryPassive (*serialized);
storeId = context->storeId ();
storeName = context->storeName ();
entry.change (context);
}
else {
registerTokenId (token_id);
storeId = tokenId2storeId (token_id);
storeName = token_id->label;
}
PasswordAsker asker;
asker.ask (
Event::StylePIN,
storeId,
storeName,
entry,
context
);