Tweak AES cbc to add pcks7 padding bytes

2 files changed, 7 insertions, 8 deletions

diff --git a/include/axolotl/crypto.hh b/include/axolotl/crypto.hh
index c8113c5..42c154b 100644
--- a/include/axolotl/crypto.hh
+++ b/include/axolotl/crypto.hh
@@ -42,17 +42,11 @@ struct Aes256Iv {
 };
 
 
-std::size_t aes_pkcs_7_padded_length(
+std::size_t aes_encrypt_cbc_length(
     std::size_t input_length
 );
 
 
-void aes_pkcs_7_padding(
-    std::uint8_t const * input, std::size_t input_length,
-    std::uint8_t * output
-);
-
-
 void aes_encrypt_cbc(
     Aes256Key const & key,
     Aes256Iv const & iv,
@@ -61,7 +55,7 @@ void aes_encrypt_cbc(
 );
 
 
-void aes_decrypt_cbc(
+std::size_t aes_decrypt_cbc(
     Aes256Key const & key,
     Aes256Iv const & iv,
     std::uint8_t const * input, std::size_t input_length,
diff --git a/include/axolotl/list.hh b/include/axolotl/list.hh
index b76abdd..ae41baa 100644
--- a/include/axolotl/list.hh
+++ b/include/axolotl/list.hh
@@ -16,6 +16,11 @@ public:
     T const * end() const { return _end; }
 
     /**
+     * Is the list empty?
+     */
+    bool empty() { return _end == _data; }
+
+    /**
      * The number of items in the list.
      */
     std::size_t size() { return _end - _data; }