Chiebot-Mirror
/
boringssl
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove a layer of indirection from most EVP_CIPHERs

Browse Source 
Historically, the hwaes-based EVP_CIPHERs went through a different
EVP_CIPHER instance than all the others. As of
https://boringssl-review.googlesource.com/c/boringssl/+/28484/, this is
no longer necessary so we can avoid the _generic indirection.

Change-Id: I40972ff8851ecf1a417af991b22c0674a2f34464
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/52726
Reviewed-by: Bob Beck <bbe@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
chromium-5359
David Benjamin 3 years ago committed by Boringssl LUCI CQ
parent cf506f17d0
commit a51821a531
1 changed files with 12 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      crypto/fipsmodule/cipher/e_aes.c

44
crypto/fipsmodule/cipher/e_aes.c
Unescape View File

@ -603,7 +603,7 @@ static int aes_gcm_cipher(EVP_CIPHER_CTX *ctx, uint8_t *out, const uint8_t *in,
} }
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_cbc_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_cbc) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_128_cbc; out->nid = NID_aes_128_cbc;
@ -616,7 +616,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_cbc_generic) {
out->cipher = aes_cbc_cipher; out->cipher = aes_cbc_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ctr_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ctr) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_128_ctr; out->nid = NID_aes_128_ctr;
@ -641,7 +641,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ecb_generic) {
out->cipher = aes_ecb_cipher; out->cipher = aes_ecb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ofb_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_ofb) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_128_ofb128; out->nid = NID_aes_128_ofb128;
@ -654,7 +654,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_ofb_generic) {
out->cipher = aes_ofb_cipher; out->cipher = aes_ofb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_gcm_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_128_gcm) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_128_gcm; out->nid = NID_aes_128_gcm;
@ -671,7 +671,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_128_gcm_generic) {
out->ctrl = aes_gcm_ctrl; out->ctrl = aes_gcm_ctrl;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_cbc_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_cbc) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_192_cbc; out->nid = NID_aes_192_cbc;
@ -684,7 +684,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_cbc_generic) {
out->cipher = aes_cbc_cipher; out->cipher = aes_cbc_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ctr_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ctr) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_192_ctr; out->nid = NID_aes_192_ctr;
@ -709,7 +709,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ecb_generic) {
out->cipher = aes_ecb_cipher; out->cipher = aes_ecb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ofb_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_ofb) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_192_ofb128; out->nid = NID_aes_192_ofb128;
@ -722,7 +722,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_ofb_generic) {
out->cipher = aes_ofb_cipher; out->cipher = aes_ofb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_gcm_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_192_gcm) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_192_gcm; out->nid = NID_aes_192_gcm;
@ -739,7 +739,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_192_gcm_generic) {
out->ctrl = aes_gcm_ctrl; out->ctrl = aes_gcm_ctrl;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_cbc_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_cbc) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_256_cbc; out->nid = NID_aes_256_cbc;
@ -752,7 +752,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_cbc_generic) {
out->cipher = aes_cbc_cipher; out->cipher = aes_cbc_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ctr_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ctr) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_256_ctr; out->nid = NID_aes_256_ctr;
@ -777,7 +777,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ecb_generic) {
out->cipher = aes_ecb_cipher; out->cipher = aes_ecb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ofb_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_ofb) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_256_ofb128; out->nid = NID_aes_256_ofb128;
@ -790,7 +790,7 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_ofb_generic) {
out->cipher = aes_ofb_cipher; out->cipher = aes_ofb_cipher;
} }
DEFINE_LOCAL_DATA(EVP_CIPHER, aes_256_gcm_generic) { DEFINE_METHOD_FUNCTION(EVP_CIPHER, EVP_aes_256_gcm) {
memset(out, 0, sizeof(EVP_CIPHER)); memset(out, 0, sizeof(EVP_CIPHER));
out->nid = NID_aes_256_gcm; out->nid = NID_aes_256_gcm;
@ -875,26 +875,6 @@ DEFINE_LOCAL_DATA(EVP_CIPHER, aes_hw_256_ecb) {
#endif // HWAES_ECB #endif // HWAES_ECB
#define EVP_CIPHER_FUNCTION(keybits, mode) \
const EVP_CIPHER *EVP_aes_##keybits##_##mode(void) { \
return aes_##keybits##_##mode##_generic(); \
}
EVP_CIPHER_FUNCTION(128, cbc)
EVP_CIPHER_FUNCTION(128, ctr)
EVP_CIPHER_FUNCTION(128, ofb)
EVP_CIPHER_FUNCTION(128, gcm)
EVP_CIPHER_FUNCTION(192, cbc)
EVP_CIPHER_FUNCTION(192, ctr)
EVP_CIPHER_FUNCTION(192, ofb)
EVP_CIPHER_FUNCTION(192, gcm)
EVP_CIPHER_FUNCTION(256, cbc)
EVP_CIPHER_FUNCTION(256, ctr)
EVP_CIPHER_FUNCTION(256, ofb)
EVP_CIPHER_FUNCTION(256, gcm)
EVP_ECB_CIPHER_FUNCTION(128) EVP_ECB_CIPHER_FUNCTION(128)
EVP_ECB_CIPHER_FUNCTION(192) EVP_ECB_CIPHER_FUNCTION(192)
EVP_ECB_CIPHER_FUNCTION(256) EVP_ECB_CIPHER_FUNCTION(256)

Write Preview
Loading…
Cancel
Save