1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SSL backend: Add a decodeDer() method to the private API

Browse Source 
This allows QSslKey to avoid converting to pem format if the backend
supports native der decoding.

Change-Id: I0822a21401ad0ca81c6eeb6c7d53c421e1e2e93a
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Andrew Knight 2014-08-09 11:15:42 +03:00
parent 2fe8efbefe
commit 259cf68e06
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/network/ssl/qsslkey_openssl.cpp
View File

@ -109,6 +109,12 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey)
return false; return false;
} }
void QSslKeyPrivate::decodeDer(const QByteArray &der, const QByteArray &passPhrase,
bool deepClear)
{
decodePem(pemFromDer(der), passPhrase, deepClear);
}
void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhrase, void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhrase,
bool deepClear) bool deepClear)
{ {

7
src/network/ssl/qsslkey_p.cpp
View File

@ -189,9 +189,10 @@ QSslKey::QSslKey(const QByteArray &encoded, QSsl::KeyAlgorithm algorithm,
{ {
d->type = type; d->type = type;
d->algorithm = algorithm; d->algorithm = algorithm;
d->decodePem((encoding == QSsl::Der) if (encoding == QSsl::Der)
? d->pemFromDer(encoded) : encoded, d->decodeDer(encoded, passPhrase);
passPhrase); else
d->decodePem(encoded, passPhrase);
} }
/*! /*!

2
src/network/ssl/qsslkey_p.h
View File

@ -86,6 +86,8 @@ public:
void clear(bool deep = true); void clear(bool deep = true);
bool fromEVP_PKEY(EVP_PKEY *pkey); bool fromEVP_PKEY(EVP_PKEY *pkey);
void decodeDer(const QByteArray &der, const QByteArray &passPhrase,
bool deepClear = true);
void decodePem(const QByteArray &pem, const QByteArray &passPhrase, void decodePem(const QByteArray &pem, const QByteArray &passPhrase,
bool deepClear = true); bool deepClear = true);
QByteArray pemHeader() const; QByteArray pemHeader() const;