aboutsummaryrefslogtreecommitdiff
path: root/include/axolotl/crypto.hh
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-02-25 08:35:53 +0000
committerMark Haines <mjark@negativecurvature.net>2015-02-25 08:35:53 +0000
commit8df4d9e9b5b1e4b87dd67a4a77ac7af93de552e7 (patch)
tree880984fab6ff855814504c9ad40c36c3597f7f60 /include/axolotl/crypto.hh
parent38332e0a122fdb93a7b8d736dc6520545aa177c3 (diff)
Tweak AES cbc to add pcks7 padding bytes
Diffstat (limited to 'include/axolotl/crypto.hh')
-rw-r--r--include/axolotl/crypto.hh10
1 files changed, 2 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,