diff options
author | Matej Kenda <[email protected]> | 2015-11-19 16:51:27 +0100 |
---|---|---|
committer | Matej Kenda <[email protected]> | 2015-11-19 16:51:27 +0100 |
commit | fb103b7d1fe333b3d7424a36ea2f9b90df8b49ef (patch) | |
tree | 4606a4ba9cc981cc0d975f0ec7724d060424e5e1 /src/lib/stream | |
parent | 94d89769739ebe05e048f217b03672fb0c336fca (diff) | |
parent | 9bff61f4c577661bf4a62a860baf190d4ea8ed6a (diff) |
Merge branch 'master' of github.com:randombit/botan into fix_algo_registry_locking_windows
Diffstat (limited to 'src/lib/stream')
-rw-r--r-- | src/lib/stream/rc4/openssl_rc4.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/lib/stream/rc4/openssl_rc4.cpp b/src/lib/stream/rc4/openssl_rc4.cpp index e4f180a9b..84d739c91 100644 --- a/src/lib/stream/rc4/openssl_rc4.cpp +++ b/src/lib/stream/rc4/openssl_rc4.cpp @@ -23,7 +23,19 @@ class OpenSSL_RC4 : public StreamCipher public: void clear() { clear_mem(&m_rc4, 1); } - std::string name() const { return "RC4"; } + std::string name() const + { + switch(m_skip) + { + case 0: + return "RC4"; + case 256: + return "MARK-4"; + default: + return "RC4_skip(" + std::to_string(m_skip) + ")"; + } + } + StreamCipher* clone() const { return new OpenSSL_RC4; } Key_Length_Specification key_spec() const |