diff options
| author | Oliver Wolff <oliver.wolff@digia.com> | 2014-08-12 20:04:05 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2014-08-13 21:09:48 +0200 |
| commit | cec893e4f0d6480a9b3e38af38c7b887a29f206d (patch) | |
| tree | cd16cb218299e45c47a5b7763c7f96e04e3d1aca /src/network/ssl/qsslsocket_p.h | |
| parent | 2be0bf0765aae2d8c7ec794241733b170d61c981 (diff) | |
Introduce secure transport backend for Windows Runtime
The change creates a stub implementation for WinRT, adding the needed
files and classes to build SSL support on that platform.
Task-number: QTBUG-37497
Change-Id: Idc3e8aa91c5eb8a938705f2385d1074fe6c1d83e
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'src/network/ssl/qsslsocket_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_p.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index a86fac8f94..06e12297a4 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -72,11 +72,13 @@ #include <CoreFoundation/CFArray.h> #elif defined(Q_OS_WIN) #include <QtCore/qt_windows.h> +#ifndef Q_OS_WINRT #include <wincrypt.h> +#endif // !Q_OS_WINRT #ifndef HCRYPTPROV_LEGACY #define HCRYPTPROV_LEGACY HCRYPTPROV -#endif -#endif +#endif // !HCRYPTPROV_LEGACY +#endif // Q_OS_WIN QT_BEGIN_NAMESPACE @@ -86,7 +88,7 @@ QT_BEGIN_NAMESPACE typedef OSStatus (*PtrSecTrustCopyAnchorCertificates)(CFArrayRef*); #endif -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) #if defined(Q_OS_WINCE) typedef HCERTSTORE (WINAPI *PtrCertOpenSystemStoreW)(LPCSTR, DWORD, HCRYPTPROV_LEGACY, DWORD, const void*); #else @@ -94,7 +96,7 @@ QT_BEGIN_NAMESPACE #endif typedef PCCERT_CONTEXT (WINAPI *PtrCertFindCertificateInStore)(HCERTSTORE, DWORD, DWORD, DWORD, const void*, PCCERT_CONTEXT); typedef BOOL (WINAPI *PtrCertCloseStore)(HCERTSTORE, DWORD); -#endif +#endif // Q_OS_WIN && !Q_OS_WINRT @@ -153,11 +155,11 @@ public: static PtrSecCertificateCopyData ptrSecCertificateCopyData; static PtrSecTrustSettingsCopyCertificates ptrSecTrustSettingsCopyCertificates; static PtrSecTrustCopyAnchorCertificates ptrSecTrustCopyAnchorCertificates; -#elif defined(Q_OS_WIN) +#elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT) static PtrCertOpenSystemStoreW ptrCertOpenSystemStoreW; static PtrCertFindCertificateInStore ptrCertFindCertificateInStore; static PtrCertCloseStore ptrCertCloseStore; -#endif +#endif // Q_OS_WIN && !Q_OS_WINRT // The socket itself, including private slots. QTcpSocket *plainSocket; @@ -178,7 +180,7 @@ public: void _q_flushWriteBuffer(); void _q_flushReadBuffer(); void _q_resumeImplementation(); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) virtual void _q_caRootLoaded(QSslCertificate,QSslCertificate) = 0; #endif |