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

minor changes: default args and renamed enum items

Browse Source 
svn path=/trunk/kdesupport/qca/; revision=647654
This commit is contained in:
Justin Karneges 2007-03-29 03:12:41 +00:00
parent 73d2a85ff7
commit 3a3fa3c3af
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/QtCrypto/qca_cert.h
View File

@ -1517,7 +1517,7 @@ namespace QCA
\sa fromFile for a more flexible version of the \sa fromFile for a more flexible version of the
same capability. same capability.
*/ */
KeyBundle(const QString &fileName, const QSecureArray &passphrase); KeyBundle(const QString &fileName, const QSecureArray &passphrase = QSecureArray());
/** /**
Standard copy constructor Standard copy constructor
@ -1647,7 +1647,7 @@ namespace QCA
\param result pointer to the result of the import process \param result pointer to the result of the import process
\param provider the provider to use, if a specific provider is required \param provider the provider to use, if a specific provider is required
*/ */
static KeyBundle fromArray(const QByteArray &a, const QSecureArray &passphrase, ConvertResult *result = 0, const QString &provider = QString()); static KeyBundle fromArray(const QByteArray &a, const QSecureArray &passphrase = QSecureArray(), ConvertResult *result = 0, const QString &provider = QString());
/** /**
Import the key bundle from a file in PKCS12 (.p12) format Import the key bundle from a file in PKCS12 (.p12) format
@ -1670,7 +1670,7 @@ namespace QCA
\param result pointer to the result of the import process \param result pointer to the result of the import process
\param provider the provider to use, if a specific provider is required \param provider the provider to use, if a specific provider is required
*/ */
static KeyBundle fromFile(const QString &fileName, const QSecureArray &passphrase, ConvertResult *result = 0, const QString &provider = QString()); static KeyBundle fromFile(const QString &fileName, const QSecureArray &passphrase = QSecureArray(), ConvertResult *result = 0, const QString &provider = QString());
private: private:
class Private; class Private;

12
include/QtCrypto/qca_securelayer.h
View File

@ -257,12 +257,12 @@ namespace QCA
*/ */
enum Error enum Error
{ {
ErrorSignerExpired, ///< local certificate is expired ErrorSignerExpired, ///< local certificate is expired
ErrorSignerInvalid, ///< local certificate is invalid in some way ErrorSignerInvalid, ///< local certificate is invalid in some way
ErrorKeyMismatch, ///< certificate and private key don't match ErrorCertKeyMismatch, ///< certificate and private key don't match
ErrorInit, ///< problem starting up %TLS ErrorInit, ///< problem starting up %TLS
ErrorHandshake, ///< problem during the negotiation ErrorHandshake, ///< problem during the negotiation
ErrorCrypt ///< problem at anytime after ErrorCrypt ///< problem at anytime after
}; };
/** /**

2
include/QtCrypto/qca_securemessage.h
View File

@ -335,7 +335,7 @@ else
ErrorEncryptUntrusted, ///< encrypting key is untrusted ErrorEncryptUntrusted, ///< encrypting key is untrusted
ErrorEncryptInvalid, ///< encrypting key is invalid in some way ErrorEncryptInvalid, ///< encrypting key is invalid in some way
ErrorNeedCard, ///< pgp card is missing ErrorNeedCard, ///< pgp card is missing
ErrorKeyMismatch, ///< certificate and private key don't match ErrorCertKeyMismatch, ///< certificate and private key don't match
ErrorUnknown ///< other error ErrorUnknown ///< other error
}; };