diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-08-08 17:30:19 +0300 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@digia.com> | 2014-08-09 08:28:56 +0200 |
| commit | 6f1299c0b44c969137d28da346fc6539aac20f3b (patch) | |
| tree | c00f78242c68905f52bfa888b7c328801ea6453b /src/network/ssl/qsslkey_p.h | |
| parent | 9aaa61562675ddcdbf835e5acaf044db2a08f155 (diff) | |
SSL: split ssl files into general and "_openssl" implementation
In order to prepare the addition of WinRT and iOS (SecureTransport)
implementations of SSL the structure of some SSL files has to be
redone. Parts of certificate that probably can be reused by other
ports stayed in qsslcertificate.cpp while other parts were moved
to qsslcertificate_openssl.cpp. qsslcontext, qsslkey and qsslsocket
were suffixed by _openssl to show that these are pure openssl
implementations.
Change-Id: I7b022dec49759f882274999c0991bf95788f2a3a
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
Diffstat (limited to 'src/network/ssl/qsslkey_p.h')
| -rw-r--r-- | src/network/ssl/qsslkey_p.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/network/ssl/qsslkey_p.h b/src/network/ssl/qsslkey_p.h index 658be85621..fd5f97c291 100644 --- a/src/network/ssl/qsslkey_p.h +++ b/src/network/ssl/qsslkey_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -40,8 +40,8 @@ ****************************************************************************/ -#ifndef QSSLKEY_P_H -#define QSSLKEY_P_H +#ifndef QSSLKEY_OPENSSL_P_H +#define QSSLKEY_OPENSSL_P_H #include "qsslkey.h" @@ -58,8 +58,14 @@ #include "qsslsocket_p.h" // includes wincrypt.h +#ifndef QT_NO_OPENSSL #include <openssl/rsa.h> #include <openssl/dsa.h> +#else +struct RSA; +struct DSA; +struct EVP_PKEY; +#endif QT_BEGIN_NAMESPACE @@ -87,6 +93,10 @@ public: QByteArray pemFromDer(const QByteArray &der) const; QByteArray derFromPem(const QByteArray &pem) const; + int length() const; + QByteArray toPem(const QByteArray &passPhrase) const; + Qt::HANDLE handle() const; + bool isNull; QSsl::KeyType type; QSsl::KeyAlgorithm algorithm; @@ -102,4 +112,4 @@ private: QT_END_NAMESPACE -#endif // QSSLKEY_P_H +#endif // QSSLKEY_OPENSSL_P_H |