Revert "SSH: Work around issue with dynamic_cast."

This reverts commit 6f7ce3f48e2ac4ebe5e04492b11d3a70bed37fb2.
The workaround turned out to be incomplete and has therefore
been superseded.

Change-Id: Ic60cd810f72ca833c1725024d2816baf5ce47372
Reviewed-by: hjk <qthjk@ovi.com>

2 files changed, 0 insertions, 61 deletions

diff --git a/src/libs/3rdparty/botan/botan.cpp b/src/libs/3rdparty/botan/botan.cpp
index 4431ce17fbd..000c3ea823c 100644
--- a/src/libs/3rdparty/botan/botan.cpp
+++ b/src/libs/3rdparty/botan/botan.cpp
@@ -47182,44 +47182,3 @@ u32bit version_minor() { return BOTAN_VERSION_MINOR; }
 u32bit version_patch() { return BOTAN_VERSION_PATCH; }
 
 }
-
-namespace Botan {
-PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n)
-{
-    return PublicKeyPtr(new RSA_PublicKey(e, n));
-}
-
-PublicKeyPtr createDsaPublicKey(const DL_Group &group, const BigInt &y)
-{
-    return PublicKeyPtr(new DSA_PublicKey(group, y));
-}
-
-PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator &rng, const BigInt &p, const BigInt &q,
-        const BigInt &e, const BigInt &d, const BigInt &n)
-{
-    return PrivateKeyPtr(new RSA_PrivateKey(rng, p, q, e, d, n));
-}
-
-PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator &rng, size_t bits, size_t exp)
-{
-    return PrivateKeyPtr(new RSA_PrivateKey(rng, bits, exp));
-}
-
-PrivateKeyPtr createDsaPrivateKey(RandomNumberGenerator &rng, const DL_Group &group,
-        const BigInt &private_key)
-{
-    return PrivateKeyPtr(new DSA_PrivateKey(rng, group, private_key));
-}
-
-PrivateKeyPtr loadPkcs8PrivateKey(DataSource& source, RandomNumberGenerator& rng,
-        const User_Interface& ui)
-{
-    return PrivateKeyPtr(PKCS8::load_key(source, rng, ui));
-}
-
-DhPrivateKeyPtr createDhPrivateKey(RandomNumberGenerator &rng, const DL_Group &grp, const BigInt &x)
-{
-    return DhPrivateKeyPtr(new DH_PrivateKey(rng, grp, x));
-}
-
-}
diff --git a/src/libs/3rdparty/botan/botan.h b/src/libs/3rdparty/botan/botan.h
index 13ec9fd00b6..a073890986c 100644
--- a/src/libs/3rdparty/botan/botan.h
+++ b/src/libs/3rdparty/botan/botan.h
@@ -9,7 +9,6 @@
 #define BOTAN_AMALGAMATION_H__
 
 #include <QtGlobal>
-#include <QSharedPointer>
 
 #include <iosfwd>
 #include <map>
@@ -16182,26 +16181,7 @@ class BOTAN_DLL ANSI_X919_MAC : public MessageAuthenticationCode
       SecureVector<byte> state;
       size_t position;
    };
-}
-
-namespace Botan {
-typedef QSharedPointer<Public_Key> PublicKeyPtr;
-BOTAN_DLL PublicKeyPtr createRsaPublicKey(const BigInt &e, const BigInt &n);
-BOTAN_DLL PublicKeyPtr createDsaPublicKey(const DL_Group& group, const BigInt& y);
-
-typedef QSharedPointer<Private_Key> PrivateKeyPtr;
-BOTAN_DLL PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator& rng, const BigInt& p,
-        const BigInt& q, const BigInt& e, const BigInt& d = 0, const BigInt& n = 0);
-BOTAN_DLL PrivateKeyPtr createRsaPrivateKey(RandomNumberGenerator& rng, size_t bits,
-        size_t exp = 65537);
-BOTAN_DLL PrivateKeyPtr createDsaPrivateKey(RandomNumberGenerator& rng, const DL_Group& group,
-        const BigInt& private_key = 0);
-BOTAN_DLL PrivateKeyPtr loadPkcs8PrivateKey(DataSource& source, RandomNumberGenerator& rng,
-        const User_Interface& ui);
 
-typedef QSharedPointer<DH_PrivateKey> DhPrivateKeyPtr;
-BOTAN_DLL DhPrivateKeyPtr createDhPrivateKey(RandomNumberGenerator& rng, const DL_Group& grp,
-        const BigInt& x = 0);
 }