Merge master into this branch, resolving conflicts with #457/#576

which recently landed on master.

1 files changed, 10 insertions, 0 deletions

diff --git a/src/lib/stream/rc4/rc4.cpp b/src/lib/stream/rc4/rc4.cpp
index 895f38091..e5ea2e2b8 100644
--- a/src/lib/stream/rc4/rc4.cpp
+++ b/src/lib/stream/rc4/rc4.cpp
@@ -6,6 +6,7 @@
 */
 
 #include <botan/rc4.h>
+#include <botan/exceptn.h>
 
 namespace Botan {
 
@@ -35,6 +36,11 @@ void RC4::cipher(const byte in[], byte out[], size_t length)
    m_position += length;
    }
 
+void RC4::set_iv(const byte*, size_t)
+   {
+   throw Exception("RC4 does not support an IV");
+   }
+
 /*
 * Generate cipher stream
 */
@@ -113,4 +119,8 @@ void RC4::clear()
 */
 RC4::RC4(size_t s) : m_SKIP(s) {}
 
+void RC4::seek(u64bit)
+   {
+   throw Exception("RC4 does not support seeking");
+   }
 }