diff options
| author | Richard J. Moore <rich@kde.org> | 2014-05-12 21:16:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 11:08:01 +0200 |
| commit | 1a8788d966da9698b05c1e0bd271d83c5bca9992 (patch) | |
| tree | e1821d4037b171763172e77878ba8ee8ed730a60 /src/network/ssl/qsslsocket.h | |
| parent | b861c43395b17d5df34f24853faa21b9824a53af (diff) | |
Move the PKCS#12 support from QSslSocket to QSslCertificate.
Discussed with Peter and agreed that it's a slightly better fit there.
Change-Id: If8db777336e2273670a23d75d8542b30c07e0d7b
Reviewed-by: Daniel Molkentin <daniel@molkentin.de>
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
Diffstat (limited to 'src/network/ssl/qsslsocket.h')
| -rw-r--r-- | src/network/ssl/qsslsocket.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index a0c9002529..9cc5e02de3 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -172,11 +172,6 @@ public: static QList<QSslCertificate> defaultCaCertificates(); static QList<QSslCertificate> systemCaCertificates(); - static bool importPKCS12(QIODevice *device, - QSslKey *key, QSslCertificate *cert, - QList<QSslCertificate> *caCertificates=0, - const QByteArray &passPhrase=QByteArray()); - bool waitForConnected(int msecs = 30000); bool waitForEncrypted(int msecs = 30000); bool waitForReadyRead(int msecs = 30000); |