diff options
author | Mikkel Krautz <mikkel@krautz.dk> | 2017-07-16 11:48:44 +0300 |
---|---|---|
committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-07-17 11:19:13 +0300 |
commit | 72e0a78272d37e473f0b34d244e19bb7821393c2 (patch) | |
tree | 071f819ba4ad83298be9a12d3a4df914a516b94f /src/SSLLocks.h | |
parent | f041bdbde15fd3144f49ab63067a47480b335b09 (diff) |
SSL: register OpenSSL threading callbacks when we can't access Qt's OpenSSL.
We neglected to register our own callbacks for locking and thread IDs
when we removed the restriction that we only allow one copy of OpenSSL
in the address space. (f544524d4c3289bf3341d685277de0e6a6895469)
This commit remedies that by providing our own set of callbacks for
locking and getting thread IDs to OpenSSL.
Previously, we just expected that Qt would properly initialize OpenSSL.
However, when Qt and us use separate copies of OpenSSL -- we have to do
it ourselves.
Diffstat (limited to 'src/SSLLocks.h')
-rw-r--r-- | src/SSLLocks.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/SSLLocks.h b/src/SSLLocks.h new file mode 100644 index 000000000..78bf2172d --- /dev/null +++ b/src/SSLLocks.h @@ -0,0 +1,15 @@ +// Copyright 2005-2017 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. + +#ifndef MUMBLE_SSLLOCKS_H_ +#define MUMBLE_SSLLOCKS_H_ + +class SSLLocks { + public: + static void initialize(); + static void destroy(); +}; + +#endif |