diff options
author | Jack Lloyd <[email protected]> | 2015-12-19 16:34:42 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2015-12-19 16:34:42 -0500 |
commit | a8b20fc90c6f2dc1df9f8533964c72cf29c947e0 (patch) | |
tree | fefe3754796f238bac73d1ce27cbb5056bfe455e /src/lib/utils | |
parent | 0fae1884079518e4f6d1c049cc7f341cd96c8a65 (diff) |
Merge the openssl code together.
Having the code diffused all over the place was ugly and would
not scale well to multiple alternative providers.
GH #368
Diffstat (limited to 'src/lib/utils')
-rw-r--r-- | src/lib/utils/openssl/info.txt | 16 | ||||
-rw-r--r-- | src/lib/utils/openssl/openssl.h | 35 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/lib/utils/openssl/info.txt b/src/lib/utils/openssl/info.txt deleted file mode 100644 index 13ea92cbf..000000000 --- a/src/lib/utils/openssl/info.txt +++ /dev/null @@ -1,16 +0,0 @@ -define OPENSSL 20150829 - -# This base module doesn't have any code, but other code using openssl -# rely on it either macro check for BOTAN_HAS_OPENSSL or a module -# dependency on openssl to test for the existence of and desire to use -# OpenSSL for certain operations. - -load_on vendor - -<header:internal> -openssl.h -</header:internal> - -<libs> -all -> crypto -</libs> diff --git a/src/lib/utils/openssl/openssl.h b/src/lib/utils/openssl/openssl.h deleted file mode 100644 index 05d3e953f..000000000 --- a/src/lib/utils/openssl/openssl.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -* Utils for calling OpenSSL -* (C) 2015 Jack Lloyd -* -* Botan is released under the Simplified BSD License (see license.txt) -*/ - -#ifndef BOTAN_OPENSSL_H__ -#define BOTAN_OPENSSL_H__ - -#include <botan/secmem.h> -#include <botan/exceptn.h> -#include <memory> - -#include <openssl/err.h> - -namespace Botan { - -class OpenSSL_Error : public Exception - { - public: - OpenSSL_Error(const std::string& what) : - Exception(what + " failed: " + ERR_error_string(ERR_get_error(), nullptr)) {} - }; - -#define BOTAN_OPENSSL_BLOCK_PRIO 150 -#define BOTAN_OPENSSL_HASH_PRIO 150 -#define BOTAN_OPENSSL_RC4_PRIO 150 - -#define BOTAN_OPENSSL_RSA_PRIO 90 -#define BOTAN_OPENSSL_ECDSA_PRIO 90 - -} - -#endif |