From 1a8788d966da9698b05c1e0bd271d83c5bca9992 Mon Sep 17 00:00:00 2001 From: "Richard J. Moore" Date: Mon, 12 May 2014 21:16:20 +0100 Subject: 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 Reviewed-by: Peter Hartmann --- src/network/ssl/qsslsocket.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'src/network/ssl/qsslsocket.cpp') diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp index 1c77fac769..04c0fb0487 100644 --- a/src/network/ssl/qsslsocket.cpp +++ b/src/network/ssl/qsslsocket.cpp @@ -1455,26 +1455,6 @@ QList QSslSocket::systemCaCertificates() return QSslSocketPrivate::systemCaCertificates(); } -/*! - \since 5.4 - - Imports a PKCS#12 (pfx) file from the specified \a device. A PKCS#12 - file is a bundle that can contain a number of certificates and keys. - This method reads a single \a key, it's \a certificate and any - associated \a caCertificates from the bundle. If a \a passPhrase is - specified then this will be used to decrypt the bundle. Returns - \c true if the PKCS#12 file was successfully loaded. - - \note The \a device must be open and ready to be read from. - */ -bool QSslSocket::importPKCS12(QIODevice *device, - QSslKey *key, QSslCertificate *certificate, - QList *caCertificates, - const QByteArray &passPhrase) -{ - return QSslSocketBackendPrivate::importPKCS12(device, key, certificate, caCertificates, passPhrase); -} - /*! Waits until the socket is connected, or \a msecs milliseconds, whichever happens first. If the connection has been established, -- cgit v1.2.3