summaryrefslogtreecommitdiff
path: root/src/libs/ssh/sshinit.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-08-14 15:11:27 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-08-14 15:49:47 +0200
commitaaa970fffe904dd4bcaa700fff3942c76b9b124d (patch)
treef783d35edf10c8979ff96514363ca449fa5e7edd /src/libs/ssh/sshinit.cpp
parent21347cd71f5e842af4e09fa39753f39e68b95c6f (diff)
downloadqt-creator-aaa970fffe904dd4bcaa700fff3942c76b9b124d.tar.gz
SSH: Add missing library initialization.
Botan requires to be initialized before first use. We do that on-demand, but currently we miss one of the two places where this is necessary. The problem only manifests itself with multithreading, because Botan itself also does an on-demand initialization, but does not guard against concurrent access when doing so. Task-number: QTCREATORBUG-9980 Change-Id: Id65c428e3d8842c8a6f16942b11d52412239d3c9 Reviewed-by: David Kaspar <dkaspar@blackberry.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'src/libs/ssh/sshinit.cpp')
-rw-r--r--src/libs/ssh/sshinit.cpp52
1 files changed, 52 insertions, 0 deletions
diff --git a/src/libs/ssh/sshinit.cpp b/src/libs/ssh/sshinit.cpp
new file mode 100644
index 0000000000..c1d4f4ae38
--- /dev/null
+++ b/src/libs/ssh/sshinit.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+#include "sshinit_p.h"
+
+#include <botan/botan.h>
+
+#include <QMutex>
+#include <QMutexLocker>
+
+namespace QSsh {
+namespace Internal {
+
+static bool initialized = false;
+static QMutex initMutex;
+
+void initSsh()
+{
+ QMutexLocker locker(&initMutex);
+ if (!initialized) {
+ Botan::LibraryInitializer::initialize("thread_safe=true");
+ initialized = true;
+ }
+}
+
+} // namespace Internal
+} // namespace QSsh