summaryrefslogtreecommitdiffstats
path: root/providers/fips/fipsprov.c
diff options
context:
space:
mode:
authorShane Lontis <shane.lontis@oracle.com>2019-09-14 09:27:49 +1000
committerShane Lontis <shane.lontis@oracle.com>2019-09-14 09:27:49 +1000
commit3a9f26f3308c5b3e59ec0e589310fd137b0399f6 (patch)
tree7eee906072dbc4679fbb2007ab8bf14f4ee91637 /providers/fips/fipsprov.c
parent88d870824f1f913877f0f978ae60879575daf56d (diff)
Add aes_xts cipher to providers
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9327)
Diffstat (limited to 'providers/fips/fipsprov.c')
-rw-r--r--providers/fips/fipsprov.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index e5bb9b41d6..cff172921c 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -268,6 +268,10 @@ const char *ossl_prov_util_nid_to_name(int nid)
return "AES-192-CTR";
case NID_aes_128_ctr:
return "AES-128-CTR";
+ case NID_aes_256_xts:
+ return "AES-256-XTS";
+ case NID_aes_128_xts:
+ return "AES-128-XTS";
/* TODO(3.0) Change these when we have aliases */
case NID_aes_256_gcm:
return "id-aes256-GCM";
@@ -320,6 +324,8 @@ static const OSSL_ALGORITHM fips_ciphers[] = {
{ "AES-256-CTR", "fips=yes", aes256ctr_functions },
{ "AES-192-CTR", "fips=yes", aes192ctr_functions },
{ "AES-128-CTR", "fips=yes", aes128ctr_functions },
+ { "AES-256-XTS", "fips=yes", aes256xts_functions },
+ { "AES-128-XTS", "fips=yes", aes128xts_functions },
/* TODO(3.0) Add aliases for these ciphers */
{ "id-aes256-GCM", "fips=yes", aes256gcm_functions },
{ "id-aes192-GCM", "fips=yes", aes192gcm_functions },