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

Switch the "pix" name to be "pkcs12", which is a bit

Browse Source 
easier to remember.

svn path=/trunk/kdesupport/qca/; revision=597045
This commit is contained in:
Brad Hards 2006-10-19 09:45:52 +00:00
parent df5fc3d380
commit 9681bfc51c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/QtCrypto/qcaprovider.h
View File

@ -325,10 +325,10 @@ public:
virtual CRLContext *updateCRL(const CRLContext &crl, const QList<CRLEntry> &entries, const QDateTime &nextUpdate) const = 0;
};
class QCA_EXPORT PIXContext : public Provider::Context
class QCA_EXPORT PKCS12Context : public Provider::Context
{
public:
PIXContext(Provider *p) : Provider::Context(p, "pix") {}
PKCS12Context(Provider *p) : Provider::Context(p, "pkcs12") {}
virtual QByteArray toPKCS12(const QString &name, const QList<const CertContext*> &chain, const PKeyContext &priv, const QSecureArray &passphrase) const = 0;

4
src/qca_cert.cpp
View File

@ -1309,7 +1309,7 @@ void KeyBundle::setCertificateChainAndKey(const CertificateChain &c, const Priva
QByteArray KeyBundle::toArray(const QSecureArray &passphrase, const QString &provider) const
{
PIXContext *pix = static_cast<PIXContext *>(getContext("pix", provider));
PKCS12Context *pix = static_cast<PKCS12Context *>(getContext("pkcs12", provider));
QList<const CertContext*> list;
for(int n = 0; n < d->chain.count(); ++n)
@ -1332,7 +1332,7 @@ KeyBundle KeyBundle::fromArray(const QByteArray &a, const QSecureArray &passphra
PKeyContext *kc = 0;
KeyBundle bundle;
PIXContext *pix = static_cast<PIXContext *>(getContext("pix", provider));
PKCS12Context *pix = static_cast<PKCS12Context *>(getContext("pkcs12", provider));
ConvertResult r = pix->fromPKCS12(a, passphrase, &name, &list, &kc);
// error converting without passphrase? maybe a passphrase is needed