Have cipher modes also verify that the nonce is set prior to use

1 files changed, 2 insertions, 0 deletions

diff --git a/src/lib/modes/cfb/cfb.cpp b/src/lib/modes/cfb/cfb.cpp
index 1010cf450..e1bee0427 100644
--- a/src/lib/modes/cfb/cfb.cpp
+++ b/src/lib/modes/cfb/cfb.cpp
@@ -117,6 +117,7 @@ void CFB_Mode::shift_register()
 size_t CFB_Encryption::process(uint8_t buf[], size_t sz)
    {
    verify_key_set(m_keystream.size());
+   BOTAN_STATE_CHECK(m_state.empty() == false);
 
    const size_t shift = feedback();
 
@@ -181,6 +182,7 @@ inline void xor_copy(uint8_t buf[], uint8_t key_buf[], size_t len)
 size_t CFB_Decryption::process(uint8_t buf[], size_t sz)
    {
    verify_key_set(m_keystream.size());
+   BOTAN_STATE_CHECK(m_state.empty() == false);
 
    const size_t shift = feedback();