summaryrefslogtreecommitdiffstats
path: root/providers/common/ciphers
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2019-04-08 18:13:01 +0200
committerMatt Caswell <matt@openssl.org>2019-04-19 10:31:54 +0200
commit75dd6d64f1f3afd6fda024d8d91bc2a216bbfcf9 (patch)
tree4cc10c516eee0da299ede753f9545a7be9566f20 /providers/common/ciphers
parentImplement AES OFB ciphers in the default provider (diff)
downloadopenssl-75dd6d64f1f3afd6fda024d8d91bc2a216bbfcf9.tar.xz
openssl-75dd6d64f1f3afd6fda024d8d91bc2a216bbfcf9.zip
Implement AES CFB ciphers in the default provider
Reviewed-by: Paul Dale <paul.dale@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8700)
Diffstat (limited to 'providers/common/ciphers')
-rw-r--r--providers/common/ciphers/aes.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/providers/common/ciphers/aes.c b/providers/common/ciphers/aes.c
index 1f3a4136eb..a7af6a6773 100644
--- a/providers/common/ciphers/aes.c
+++ b/providers/common/ciphers/aes.c
@@ -205,6 +205,19 @@ IMPLEMENT_new_ctx(ofb, OFB, 256)
IMPLEMENT_new_ctx(ofb, OFB, 192)
IMPLEMENT_new_ctx(ofb, OFB, 128)
+/* CFB */
+IMPLEMENT_new_params(cfb, CFB)
+IMPLEMENT_new_params(cfb1, CFB)
+IMPLEMENT_new_params(cfb8, CFB)
+IMPLEMENT_new_ctx(cfb, CFB, 256)
+IMPLEMENT_new_ctx(cfb, CFB, 192)
+IMPLEMENT_new_ctx(cfb, CFB, 128)
+IMPLEMENT_new_ctx(cfb1, CFB, 256)
+IMPLEMENT_new_ctx(cfb1, CFB, 192)
+IMPLEMENT_new_ctx(cfb1, CFB, 128)
+IMPLEMENT_new_ctx(cfb8, CFB, 256)
+IMPLEMENT_new_ctx(cfb8, CFB, 192)
+IMPLEMENT_new_ctx(cfb8, CFB, 128)
static void aes_freectx(void *vctx)
{
@@ -338,3 +351,14 @@ IMPLEMENT_block_funcs(cbc, 128, 16)
IMPLEMENT_stream_funcs(ofb, 256, 16)
IMPLEMENT_stream_funcs(ofb, 192, 16)
IMPLEMENT_stream_funcs(ofb, 128, 16)
+
+/* CFB */
+IMPLEMENT_stream_funcs(cfb, 256, 16)
+IMPLEMENT_stream_funcs(cfb, 192, 16)
+IMPLEMENT_stream_funcs(cfb, 128, 16)
+IMPLEMENT_stream_funcs(cfb1, 256, 16)
+IMPLEMENT_stream_funcs(cfb1, 192, 16)
+IMPLEMENT_stream_funcs(cfb1, 128, 16)
+IMPLEMENT_stream_funcs(cfb8, 256, 16)
+IMPLEMENT_stream_funcs(cfb8, 192, 16)
+IMPLEMENT_stream_funcs(cfb8, 128, 16)