aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/utils
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-02-11 23:16:51 +0000
committerlloyd <[email protected]>2015-02-11 23:16:51 +0000
commit85caef829c9eeb7c224ad3b2e3ffbcfe981c2428 (patch)
tree130b3913b5e82de89042a74c2a8046f103deff1b /src/lib/utils
parent92bc6eac5addf77d610fad21378bc4434ef98119 (diff)
Add version_cstr (returns const char*) and move tag_size from AEAD to
Cipher_Mode. Add missing includes in entropy sources, noticed by clang.
Diffstat (limited to 'src/lib/utils')
-rw-r--r--src/lib/utils/version.cpp5
-rw-r--r--src/lib/utils/version.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/utils/version.cpp b/src/lib/utils/version.cpp
index d13d091ca..f3e01e290 100644
--- a/src/lib/utils/version.cpp
+++ b/src/lib/utils/version.cpp
@@ -21,6 +21,11 @@ namespace Botan {
*/
std::string version_string()
{
+ return std::string(version_cstr());
+ }
+
+const char* version_cstr()
+ {
#define QUOTE(name) #name
#define STR(macro) QUOTE(macro)
diff --git a/src/lib/utils/version.h b/src/lib/utils/version.h
index c2f070433..3fc6f5fe7 100644
--- a/src/lib/utils/version.h
+++ b/src/lib/utils/version.h
@@ -24,6 +24,8 @@ namespace Botan {
*/
BOTAN_DLL std::string version_string();
+BOTAN_DLL const char* version_cstr();
+
/**
* Return the date this version of botan was released, in an integer of
* the form YYYYMMDD. For instance a version released on May 21, 2013