diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2014-08-31 14:55:06 +0300 |
|---|---|---|
| committer | Richard J. Moore <rich@kde.org> | 2014-09-02 23:16:25 +0200 |
| commit | cd3dece750aa30b15091f211a72b6fcf67d49853 (patch) | |
| tree | 36594c8282b07fde103d893da48a94201d67a8c5 /src/network/ssl/qsslkey_openssl.cpp | |
| parent | b17365cda91a6ecc8d12e995d83f4ff479c59b5f (diff) | |
ssl: common key parser support for encrypted keys
This adds the infrastructure for reading and writing encrypted private keys
when using non-OpenSSL backends. Each platform must provide its cryptographic
encrypt / decrypt functions.
As WinRT already uses the common parser, this commit includes an
implementation for that platform.
Done-with: Andrew Knight <andrew.knight@digia.com>
Task-number: QTBUG-40688
Change-Id: I0d153425ce63601ff03b784a111e13962061025f
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslkey_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey_openssl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/ssl/qsslkey_openssl.cpp b/src/network/ssl/qsslkey_openssl.cpp index 7e78ac0fee..6b0fa954eb 100644 --- a/src/network/ssl/qsslkey_openssl.cpp +++ b/src/network/ssl/qsslkey_openssl.cpp @@ -111,7 +111,8 @@ bool QSslKeyPrivate::fromEVP_PKEY(EVP_PKEY *pkey) void QSslKeyPrivate::decodeDer(const QByteArray &der, bool deepClear) { - decodePem(pemFromDer(der), QByteArray(), deepClear); + QMap<QByteArray, QByteArray> headers; + decodePem(pemFromDer(der, headers), QByteArray(), deepClear); } void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhrase, |