diff options
| author | Davide Beatrici <davidebeatrici@gmail.com> | 2019-09-12 23:44:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 23:44:16 +0300 |
| commit | a38d19a7595c3e672f5ed549400b36348e01e442 (patch) | |
| tree | 34bd1c4db9b95748d263aea811e849dec7e5525c /src/murmur/Cert.cpp | |
| parent | 713b92c3c233f8f38200c4a458e0196d3d39a3b0 (diff) | |
| parent | 15831dbca85dd906edbad2bfff2b147527a456e2 (diff) | |
Merge PR #3644: Don't include PCH headers directly, add missing includes
Diffstat (limited to 'src/murmur/Cert.cpp')
| -rw-r--r-- | src/murmur/Cert.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 1f102bc26..3a1fe10b1 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -3,12 +3,24 @@ // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. -#include "murmur_pch.h" +#include <QtCore/QtGlobal> + +#ifdef Q_OS_WIN +# include "win.h" +#endif #include "Meta.h" #include "Server.h" #include "SelfSignedCertificate.h" +#include <openssl/err.h> +#include <openssl/evp.h> +#include <openssl/x509.h> + +#ifdef Q_OS_WIN +# include <winsock2.h> +#endif + bool Server::isKeyForCert(const QSslKey &key, const QSslCertificate &cert) { if (key.isNull() || cert.isNull() || (key.type() != QSsl::PrivateKey)) return false; |