fips: add AES CFB mode ciphers to FIPS provider.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11908)

diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index bbf95b750560ca6576dd6e735c86d13fae8bd95f..6b3973c01c31ddfab29a6b26790c1fcf74e5dcb8 100644 (file)
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -390,6 +390,15 @@ static const OSSL_ALGORITHM_CAPABLE fips_ciphers[] = {
     ALG("AES-256-CBC", aes256cbc_functions),
     ALG("AES-192-CBC", aes192cbc_functions),
     ALG("AES-128-CBC", aes128cbc_functions),
+    ALG("AES-256-CFB", aes256cfb_functions),
+    ALG("AES-192-CFB", aes192cfb_functions),
+    ALG("AES-128-CFB", aes128cfb_functions),
+    ALG("AES-256-CFB1", aes256cfb1_functions),
+    ALG("AES-192-CFB1", aes192cfb1_functions),
+    ALG("AES-128-CFB1", aes128cfb1_functions),
+    ALG("AES-256-CFB8", aes256cfb8_functions),
+    ALG("AES-192-CFB8", aes192cfb8_functions),
+    ALG("AES-128-CFB8", aes128cfb8_functions),
     ALG("AES-256-CTR", aes256ctr_functions),
     ALG("AES-192-CTR", aes192ctr_functions),
     ALG("AES-128-CTR", aes128ctr_functions),

diff --git a/test/recipes/30-test_evp_data/evpciph.txt b/test/recipes/30-test_evp_data/evpciph.txt
index 4d7f9f0d94f5f096828becb7c3d45ee31377fab6..d78f5c33487a73d72bd07f2837e7107d56b76e6b 100644 (file)
--- a/test/recipes/30-test_evp_data/evpciph.txt
+++ b/test/recipes/30-test_evp_data/evpciph.txt
@@ -259,7 +259,6 @@ Ciphertext = B2EB05E2C39BE9FCDA6C19078C6A9D1B
 #   AES-bits-CFB:key:IV/ciphertext':plaintext:ciphertext:encdec
 # CFB128-AES128.Encrypt
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
@@ -267,7 +266,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 3B3FD92EB72DAD20333449F8E83CFB4A
 Operation = ENCRYPT
@@ -275,7 +273,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 Operation = ENCRYPT
@@ -283,7 +280,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 26751F67A3CBB140B1808CF187A4F4DF
 Operation = ENCRYPT
@@ -292,7 +288,6 @@ Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6
 
 # CFB128-AES128.Decrypt
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
@@ -300,7 +295,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 3B3FD92EB72DAD20333449F8E83CFB4A
 Operation = DECRYPT
@@ -308,7 +302,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = C8A64537A0B3A93FCDE3CDAD9F1CE58B
 Operation = DECRYPT
@@ -316,7 +309,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 26751F67A3CBB140B1808CF187A4F4DF
 
 Cipher = AES-128-CFB
-Availablein = default
 Key = 2B7E151628AED2A6ABF7158809CF4F3C
 IV = 26751F67A3CBB140B1808CF187A4F4DF
 Operation = DECRYPT
@@ -325,7 +317,6 @@ Ciphertext = C04B05357C5D1C0EEAC4C66F9FF7F2E6
 
 # CFB128-AES192.Encrypt
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
@@ -333,7 +324,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = CDC80D6FDDF18CAB34C25909C99A4174
 Operation = ENCRYPT
@@ -341,7 +331,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 67CE7F7F81173621961A2B70171D3D7A
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 67CE7F7F81173621961A2B70171D3D7A
 Operation = ENCRYPT
@@ -349,7 +338,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 Operation = ENCRYPT
@@ -358,7 +346,6 @@ Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF
 
 # CFB128-AES192.Decrypt
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
@@ -366,7 +353,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = CDC80D6FDDF18CAB34C25909C99A4174
 Operation = DECRYPT
@@ -374,7 +360,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 67CE7F7F81173621961A2B70171D3D7A
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 67CE7F7F81173621961A2B70171D3D7A
 Operation = DECRYPT
@@ -382,7 +367,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 
 Cipher = AES-192-CFB
-Availablein = default
 Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
 IV = 2E1E8A1DD59B88B1C8E60FED1EFAC4C9
 Operation = DECRYPT
@@ -391,7 +375,6 @@ Ciphertext = C05F9F9CA9834FA042AE8FBA584B09FF
 
 # CFB128-AES256.Encrypt
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = ENCRYPT
@@ -399,7 +382,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = DC7E84BFDA79164B7ECD8486985D3860
 Operation = ENCRYPT
@@ -407,7 +389,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 39FFED143B28B1C832113C6331E5407B
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 39FFED143B28B1C832113C6331E5407B
 Operation = ENCRYPT
@@ -415,7 +396,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = DF10132415E54B92A13ED0A8267AE2F9
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = DF10132415E54B92A13ED0A8267AE2F9
 Operation = ENCRYPT
@@ -424,7 +404,6 @@ Ciphertext = 75A385741AB9CEF82031623D55B1E471
 
 # CFB128-AES256.Decrypt
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 000102030405060708090A0B0C0D0E0F
 Operation = DECRYPT
@@ -432,7 +411,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
 Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = DC7E84BFDA79164B7ECD8486985D3860
 Operation = DECRYPT
@@ -440,7 +418,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
 Ciphertext = 39FFED143B28B1C832113C6331E5407B
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = 39FFED143B28B1C832113C6331E5407B
 Operation = DECRYPT
@@ -448,7 +425,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
 Ciphertext = DF10132415E54B92A13ED0A8267AE2F9
 
 Cipher = AES-256-CFB
-Availablein = default
 Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
 IV = DF10132415E54B92A13ED0A8267AE2F9
 Operation = DECRYPT