diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2022-08-04 08:02:32 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2022-08-04 08:02:32 +0000 |
| commit | 2e0c6fde2c7d60bd4b6d75a2aa764953e34fb440 (patch) | |
| tree | f5811f44991405d283d3341a03884b4745eb7517 /lib/libcrypto | |
| parent | 7244fa7691495f8834123a5b8d545c48f24048f3 (diff) | |
Mop up EVP_CIPH_FLAG_FIPS usage.
LibreSSL does not do FIPS and nothing else sets or checks these.
ok tb@
Diffstat (limited to 'lib/libcrypto')
| -rw-r--r-- | lib/libcrypto/evp/e_aes.c | 118 |
1 files changed, 59 insertions, 59 deletions
diff --git a/lib/libcrypto/evp/e_aes.c b/lib/libcrypto/evp/e_aes.c index 14b39dba7d4..67b447320cb 100644 --- a/lib/libcrypto/evp/e_aes.c +++ b/lib/libcrypto/evp/e_aes.c @@ -1,4 +1,4 @@ -/* $OpenBSD: e_aes.c,v 1.44 2022/08/04 08:00:11 jsing Exp $ */ +/* $OpenBSD: e_aes.c,v 1.45 2022/08/04 08:02:31 jsing Exp $ */ /* ==================================================================== * Copyright (c) 2001-2011 The OpenSSL Project. All rights reserved. * @@ -543,7 +543,7 @@ static const EVP_CIPHER aesni_128_cbc = { .block_size = 16, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aesni_init_key, .do_cipher = aesni_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -555,7 +555,7 @@ static const EVP_CIPHER aes_128_cbc = { .block_size = 16, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aes_init_key, .do_cipher = aes_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -577,7 +577,7 @@ static const EVP_CIPHER aesni_128_ecb = { .block_size = 16, .key_len = 128 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aesni_init_key, .do_cipher = aesni_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -589,7 +589,7 @@ static const EVP_CIPHER aes_128_ecb = { .block_size = 16, .key_len = 128 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aes_init_key, .do_cipher = aes_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -611,7 +611,7 @@ static const EVP_CIPHER aesni_128_ofb = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aesni_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -623,7 +623,7 @@ static const EVP_CIPHER aes_128_ofb = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aes_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -645,7 +645,7 @@ static const EVP_CIPHER aesni_128_cfb = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -657,7 +657,7 @@ static const EVP_CIPHER aes_128_cfb = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -679,7 +679,7 @@ static const EVP_CIPHER aesni_128_cfb1 = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -691,7 +691,7 @@ static const EVP_CIPHER aes_128_cfb1 = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -713,7 +713,7 @@ static const EVP_CIPHER aesni_128_cfb8 = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -725,7 +725,7 @@ static const EVP_CIPHER aes_128_cfb8 = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -747,7 +747,7 @@ static const EVP_CIPHER aesni_128_ctr = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aesni_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -759,7 +759,7 @@ static const EVP_CIPHER aes_128_ctr = { .block_size = 1, .key_len = 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aes_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -782,7 +782,7 @@ static const EVP_CIPHER aesni_192_cbc = { .block_size = 16, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aesni_init_key, .do_cipher = aesni_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -794,7 +794,7 @@ static const EVP_CIPHER aes_192_cbc = { .block_size = 16, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aes_init_key, .do_cipher = aes_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -816,7 +816,7 @@ static const EVP_CIPHER aesni_192_ecb = { .block_size = 16, .key_len = 192 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aesni_init_key, .do_cipher = aesni_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -828,7 +828,7 @@ static const EVP_CIPHER aes_192_ecb = { .block_size = 16, .key_len = 192 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aes_init_key, .do_cipher = aes_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -850,7 +850,7 @@ static const EVP_CIPHER aesni_192_ofb = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aesni_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -862,7 +862,7 @@ static const EVP_CIPHER aes_192_ofb = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aes_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -884,7 +884,7 @@ static const EVP_CIPHER aesni_192_cfb = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -896,7 +896,7 @@ static const EVP_CIPHER aes_192_cfb = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -918,7 +918,7 @@ static const EVP_CIPHER aesni_192_cfb1 = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -930,7 +930,7 @@ static const EVP_CIPHER aes_192_cfb1 = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -952,7 +952,7 @@ static const EVP_CIPHER aesni_192_cfb8 = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -964,7 +964,7 @@ static const EVP_CIPHER aes_192_cfb8 = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -986,7 +986,7 @@ static const EVP_CIPHER aesni_192_ctr = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aesni_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -998,7 +998,7 @@ static const EVP_CIPHER aes_192_ctr = { .block_size = 1, .key_len = 192 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aes_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1021,7 +1021,7 @@ static const EVP_CIPHER aesni_256_cbc = { .block_size = 16, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aesni_init_key, .do_cipher = aesni_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1033,7 +1033,7 @@ static const EVP_CIPHER aes_256_cbc = { .block_size = 16, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CBC_MODE, .init = aes_init_key, .do_cipher = aes_cbc_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1055,7 +1055,7 @@ static const EVP_CIPHER aesni_256_ecb = { .block_size = 16, .key_len = 256 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aesni_init_key, .do_cipher = aesni_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1067,7 +1067,7 @@ static const EVP_CIPHER aes_256_ecb = { .block_size = 16, .key_len = 256 / 8, .iv_len = 0, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_ECB_MODE, .init = aes_init_key, .do_cipher = aes_ecb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1089,7 +1089,7 @@ static const EVP_CIPHER aesni_256_ofb = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aesni_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1101,7 +1101,7 @@ static const EVP_CIPHER aes_256_ofb = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_OFB_MODE, .init = aes_init_key, .do_cipher = aes_ofb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1123,7 +1123,7 @@ static const EVP_CIPHER aesni_256_cfb = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1135,7 +1135,7 @@ static const EVP_CIPHER aes_256_cfb = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_FLAG_DEFAULT_ASN1 | EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1157,7 +1157,7 @@ static const EVP_CIPHER aesni_256_cfb1 = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1169,7 +1169,7 @@ static const EVP_CIPHER aes_256_cfb1 = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb1_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1191,7 +1191,7 @@ static const EVP_CIPHER aesni_256_cfb8 = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aesni_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1203,7 +1203,7 @@ static const EVP_CIPHER aes_256_cfb8 = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CFB_MODE, + .flags = EVP_CIPH_CFB_MODE, .init = aes_init_key, .do_cipher = aes_cfb8_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1225,7 +1225,7 @@ static const EVP_CIPHER aesni_256_ctr = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aesni_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1237,7 +1237,7 @@ static const EVP_CIPHER aes_256_ctr = { .block_size = 1, .key_len = 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS | EVP_CIPH_CTR_MODE, + .flags = EVP_CIPH_CTR_MODE, .init = aes_init_key, .do_cipher = aes_ctr_cipher, .ctx_size = sizeof(EVP_AES_KEY), @@ -1639,7 +1639,7 @@ static const EVP_CIPHER aesni_128_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aesni_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1655,7 +1655,7 @@ static const EVP_CIPHER aes_128_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aes_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1681,7 +1681,7 @@ static const EVP_CIPHER aesni_192_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 192 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aesni_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1697,7 +1697,7 @@ static const EVP_CIPHER aes_192_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 192 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aes_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1723,7 +1723,7 @@ static const EVP_CIPHER aesni_256_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aesni_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1739,7 +1739,7 @@ static const EVP_CIPHER aes_256_gcm = { (EVP_CIPH_GCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, + .flags = EVP_CIPH_FLAG_AEAD_CIPHER|CUSTOM_FLAGS | EVP_CIPH_GCM_MODE, .init = aes_gcm_init_key, .do_cipher = aes_gcm_cipher, .cleanup = aes_gcm_cleanup, @@ -1895,7 +1895,7 @@ static const EVP_CIPHER aesni_128_xts = { (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, + .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, .init = aesni_xts_init_key, .do_cipher = aes_xts_cipher, .cleanup = aes_xts_cleanup, @@ -1911,7 +1911,7 @@ static const EVP_CIPHER aes_128_xts = { (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, + .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, .init = aes_xts_init_key, .do_cipher = aes_xts_cipher, .cleanup = aes_xts_cleanup, @@ -1937,7 +1937,7 @@ static const EVP_CIPHER aesni_256_xts = { (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, + .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, .init = aesni_xts_init_key, .do_cipher = aes_xts_cipher, .cleanup = aes_xts_cleanup, @@ -1953,7 +1953,7 @@ static const EVP_CIPHER aes_256_xts = { (EVP_CIPH_XTS_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 16, - .flags = EVP_CIPH_FLAG_FIPS|XTS_FLAGS | EVP_CIPH_XTS_MODE, + .flags = XTS_FLAGS | EVP_CIPH_XTS_MODE, .init = aes_xts_init_key, .do_cipher = aes_xts_cipher, .cleanup = aes_xts_cleanup, @@ -2140,7 +2140,7 @@ static const EVP_CIPHER aesni_128_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aesni_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, @@ -2156,7 +2156,7 @@ static const EVP_CIPHER aes_128_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 128 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aes_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, @@ -2182,7 +2182,7 @@ static const EVP_CIPHER aesni_192_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 192 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aesni_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, @@ -2198,7 +2198,7 @@ static const EVP_CIPHER aes_192_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 192 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aes_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, @@ -2224,7 +2224,7 @@ static const EVP_CIPHER aesni_256_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aesni_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, @@ -2240,7 +2240,7 @@ static const EVP_CIPHER aes_256_ccm = { (EVP_CIPH_CCM_MODE == EVP_CIPH_XTS_MODE ? 2 : 1) * 256 / 8, .iv_len = 12, - .flags = EVP_CIPH_FLAG_FIPS|CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, + .flags = CUSTOM_FLAGS | EVP_CIPH_CCM_MODE, .init = aes_ccm_init_key, .do_cipher = aes_ccm_cipher, .cleanup = aes_ccm_cleanup, |