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

specify keystore name in asker

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=658125
This commit is contained in:
Justin Karneges 2007-04-26 01:19:55 +00:00
parent 880d1f315b
commit 1624941a6e
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/eventhandlerdemo/eventhandlerdemo.cpp
View File

@ -147,7 +147,7 @@ void asker_procedure()
QCA::TokenAsker tokenAsker;
tokenAsker.ask( QString( "Token 1" ), QString( "Entry 3" ), 0 );
tokenAsker.ask( QString( "Token 1" ), QString ( "My Token" ), QCA::KeyStoreEntry(), 0 );
tokenAsker.waitForResponse();

15
include/QtCrypto/qca_core.h
View File

@ -1182,6 +1182,13 @@ namespace QCA
*/
QString keyStoreId() const;
/**
The name of the KeyStore associated with this event
This is not meaningful unless the Source is KeyStore.
*/
QString keyStoreName() const;
/**
The KeyStoreEntry associated with this event
@ -1212,7 +1219,7 @@ namespace QCA
\param keyStoreEntry the entry in the keystore that the information is required for
\param ptr opaque data
*/
void setPasswordKeyStore(PasswordStyle pstyle, const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr);
void setPasswordKeyStore(PasswordStyle pstyle, const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr);
/**
Set the values for this Event
@ -1234,7 +1241,7 @@ namespace QCA
\param keyStoreEntry the entry in the keystore that the token is required for
\param ptr opaque data
*/
void setToken(const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr);
void setToken(const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr);
private:
class Private;
@ -1347,7 +1354,7 @@ namespace QCA
\param keyStoreEntry the item in the key store that the information is required for (if applicable)
\param ptr opaque data
*/
void ask(Event::PasswordStyle pstyle, const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr);
void ask(Event::PasswordStyle pstyle, const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr);
/**
queue a password / passphrase request associated with a file
@ -1427,7 +1434,7 @@ namespace QCA
\param keyStoreEntry the item in the key store that the information is required for (if applicable)
\param ptr opaque data
*/
void ask(const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr);
void ask(const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr);
/**
Cancel the pending password / passphrase request

21
src/qca_core.cpp
View File

@ -1339,7 +1339,7 @@ public:
Type type;
Source source;
PasswordStyle style;
QString ks;
QString ks, ksName;
KeyStoreEntry kse;
QString fname;
void *ptr;
@ -1389,6 +1389,11 @@ QString Event::keyStoreId() const
return d->ks;
}
QString Event::keyStoreName() const
{
return d->ksName;
}
KeyStoreEntry Event::keyStoreEntry() const
{
return d->kse;
@ -1404,7 +1409,7 @@ void *Event::ptr() const
return d->ptr;
}
void Event::setPasswordKeyStore(PasswordStyle pstyle, const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr)
void Event::setPasswordKeyStore(PasswordStyle pstyle, const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr)
{
if(!d)
d = new Private;
@ -1412,6 +1417,7 @@ void Event::setPasswordKeyStore(PasswordStyle pstyle, const QString &keyStoreId,
d->source = KeyStore;
d->style = pstyle;
d->ks = keyStoreId;
d->ksName = keyStoreName;
d->kse = keyStoreEntry;
d->fname = QString();
d->ptr = ptr;
@ -1430,7 +1436,7 @@ void Event::setPasswordData(PasswordStyle pstyle, const QString &fileName, void
d->ptr = ptr;
}
void Event::setToken(const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr)
void Event::setToken(const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr)
{
if(!d)
d = new Private;
@ -1438,6 +1444,7 @@ void Event::setToken(const QString &keyStoreId, const KeyStoreEntry &keyStoreEnt
d->source = KeyStore;
d->style = StylePassword;
d->ks = keyStoreId;
d->ksName = keyStoreName;
d->kse = keyStoreEntry;
d->fname = QString();
d->ptr = ptr;
@ -1933,10 +1940,10 @@ PasswordAsker::~PasswordAsker()
delete d;
}
void PasswordAsker::ask(Event::PasswordStyle pstyle, const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr)
void PasswordAsker::ask(Event::PasswordStyle pstyle, const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr)
{
Event e;
e.setPasswordKeyStore(pstyle, keyStoreId, keyStoreEntry, ptr);
e.setPasswordKeyStore(pstyle, keyStoreId, keyStoreName, keyStoreEntry, ptr);
d->ask(e);
}
@ -1994,10 +2001,10 @@ TokenAsker::~TokenAsker()
delete d;
}
void TokenAsker::ask(const QString &keyStoreId, const KeyStoreEntry &keyStoreEntry, void *ptr)
void TokenAsker::ask(const QString &keyStoreId, const QString &keyStoreName, const KeyStoreEntry &keyStoreEntry, void *ptr)
{
Event e;
e.setToken(keyStoreId, keyStoreEntry, ptr);
e.setToken(keyStoreId, keyStoreName, keyStoreEntry, ptr);
d->ask(e);
}