summaryrefslogtreecommitdiffstats
path: root/providers/common/ciphers/block.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2019-08-22 11:42:54 +1000
committerShane Lontis <shane.lontis@oracle.com>2019-08-22 11:42:54 +1000
commite1178600cc5d40b1e21c4a01d224afd2d8c7498a (patch)
tree9601f94492fbab46a72f96e0982025d7ec7ed236 /providers/common/ciphers/block.c
parent85d09e8848012d0dfdacf827d9d56730fa5daf16 (diff)
Add basic aria and camellia ciphers modes to default provider
The aes code has been refactored into generic and algorithn specific parts, so that most of the code can be shared. The cipher related files have been broken up into smaller parts. Add chunked variant of mode ciphers - aria uses this (many other ciphers will use this new code instead of the generic code used by aes). Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9451)
Diffstat (limited to 'providers/common/ciphers/block.c')
-rw-r--r--providers/common/ciphers/block.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/providers/common/ciphers/block.c b/providers/common/ciphers/block.c
index 7014b9d997..73e17e1a11 100644
--- a/providers/common/ciphers/block.c
+++ b/providers/common/ciphers/block.c
@@ -7,12 +7,8 @@
* https://www.openssl.org/source/license.html
*/
-#include <string.h>
-#include <openssl/evp.h>
-#include <openssl/err.h>
-#include "ciphers_locl.h"
#include <assert.h>
-#include "internal/providercommonerr.h"
+#include "cipher_locl.h"
/*
* Fills a single block of buffered data from the input, and returns the amount