summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2018-12-26 15:11:04 +0000
committertb <>2018-12-26 15:11:04 +0000
commit9641c932f4cf7d975c8a05c0ce14f13304cb4791 (patch)
tree2a1f646ffcdcb1e0bafd1f1c7a0d6c23e81ec290 /src
parent570bdfdcca6456a7407cf20a8edff872b64f8a0c (diff)
downloadopenbsd-9641c932f4cf7d975c8a05c0ce14f13304cb4791.tar.gz
openbsd-9641c932f4cf7d975c8a05c0ce14f13304cb4791.tar.bz2
openbsd-9641c932f4cf7d975c8a05c0ce14f13304cb4791.zip
Make AES CCM available in tables.
Omission reported by reyk and Alice Wonder. ok bcook jsing
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/evp/c_all.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
index 85322d90e8..5ed55f67f6 100644
--- a/src/lib/libcrypto/evp/c_all.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_all.c,v 1.23 2018/11/11 07:07:44 tb Exp $ */ 1/* $OpenBSD: c_all.c,v 1.24 2018/12/26 15:11:04 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -152,6 +152,7 @@ OpenSSL_add_all_ciphers_internal(void)
152#ifndef OPENSSL_NO_AES 152#ifndef OPENSSL_NO_AES
153 EVP_add_cipher(EVP_aes_128_ecb()); 153 EVP_add_cipher(EVP_aes_128_ecb());
154 EVP_add_cipher(EVP_aes_128_cbc()); 154 EVP_add_cipher(EVP_aes_128_cbc());
155 EVP_add_cipher(EVP_aes_128_ccm());
155 EVP_add_cipher(EVP_aes_128_cfb()); 156 EVP_add_cipher(EVP_aes_128_cfb());
156 EVP_add_cipher(EVP_aes_128_cfb1()); 157 EVP_add_cipher(EVP_aes_128_cfb1());
157 EVP_add_cipher(EVP_aes_128_cfb8()); 158 EVP_add_cipher(EVP_aes_128_cfb8());
@@ -163,6 +164,7 @@ OpenSSL_add_all_ciphers_internal(void)
163 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128"); 164 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
164 EVP_add_cipher(EVP_aes_192_ecb()); 165 EVP_add_cipher(EVP_aes_192_ecb());
165 EVP_add_cipher(EVP_aes_192_cbc()); 166 EVP_add_cipher(EVP_aes_192_cbc());
167 EVP_add_cipher(EVP_aes_192_ccm());
166 EVP_add_cipher(EVP_aes_192_cfb()); 168 EVP_add_cipher(EVP_aes_192_cfb());
167 EVP_add_cipher(EVP_aes_192_cfb1()); 169 EVP_add_cipher(EVP_aes_192_cfb1());
168 EVP_add_cipher(EVP_aes_192_cfb8()); 170 EVP_add_cipher(EVP_aes_192_cfb8());
@@ -173,6 +175,7 @@ OpenSSL_add_all_ciphers_internal(void)
173 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192"); 175 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
174 EVP_add_cipher(EVP_aes_256_ecb()); 176 EVP_add_cipher(EVP_aes_256_ecb());
175 EVP_add_cipher(EVP_aes_256_cbc()); 177 EVP_add_cipher(EVP_aes_256_cbc());
178 EVP_add_cipher(EVP_aes_256_ccm());
176 EVP_add_cipher(EVP_aes_256_cfb()); 179 EVP_add_cipher(EVP_aes_256_cfb());
177 EVP_add_cipher(EVP_aes_256_cfb1()); 180 EVP_add_cipher(EVP_aes_256_cfb1());
178 EVP_add_cipher(EVP_aes_256_cfb8()); 181 EVP_add_cipher(EVP_aes_256_cfb8());