aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/block/serpent
diff options
context:
space:
mode:
authorJack Lloyd <[email protected]>2016-09-15 21:08:51 -0400
committerJack Lloyd <[email protected]>2016-09-15 21:08:51 -0400
commit45a8210d63c2fc0b0ab0411dba55c903da226123 (patch)
tree9bc380f1134738f624700645f8a9692c363dc7bc /src/lib/block/serpent
parent04bf8dc51861bab37d6260de8b318dc71ea4bba7 (diff)
Change T::provider to return std::string
Diffstat (limited to 'src/lib/block/serpent')
-rw-r--r--src/lib/block/serpent/serpent.cpp2
-rw-r--r--src/lib/block/serpent/serpent.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/block/serpent/serpent.cpp b/src/lib/block/serpent/serpent.cpp
index f2a6035f1..07088211d 100644
--- a/src/lib/block/serpent/serpent.cpp
+++ b/src/lib/block/serpent/serpent.cpp
@@ -231,7 +231,7 @@ void Serpent::clear()
zap(m_round_key);
}
-const char* Serpent::provider() const
+std::string Serpent::provider() const
{
#if defined(BOTAN_HAS_SERPENT_SIMD)
if(CPUID::has_simd_32())
diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h
index 72c26d452..218772e0c 100644
--- a/src/lib/block/serpent/serpent.h
+++ b/src/lib/block/serpent/serpent.h
@@ -23,7 +23,7 @@ class BOTAN_DLL Serpent final : public Block_Cipher_Fixed_Params<16, 16, 32, 8>
void decrypt_n(const byte in[], byte out[], size_t blocks) const override;
void clear() override;
- const char* provider() const override;
+ std::string provider() const override;
std::string name() const override { return "Serpent"; }
BlockCipher* clone() const override { return new Serpent; }