From 4f65bc6f8fc4464631a93002d99f61a4a75b4552 Mon Sep 17 00:00:00 2001 From: Pauli Date: Sat, 23 May 2020 10:20:46 +1000 Subject: [PATCH] fips: add AES OFB mode ciphers to FIPS provider. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/11908) --- providers/fips/fipsprov.c | 3 +++ test/recipes/30-test_evp_data/evpciph.txt | 24 ----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 6b3973c01c..31217202f2 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -390,6 +390,9 @@ 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-OFB", aes256ofb_functions), + ALG("AES-192-OFB", aes192ofb_functions), + ALG("AES-128-OFB", aes128ofb_functions), ALG("AES-256-CFB", aes256cfb_functions), ALG("AES-192-CFB", aes192cfb_functions), ALG("AES-128-CFB", aes128cfb_functions), diff --git a/test/recipes/30-test_evp_data/evpciph.txt b/test/recipes/30-test_evp_data/evpciph.txt index d78f5c3348..4f7afd0e1d 100644 --- a/test/recipes/30-test_evp_data/evpciph.txt +++ b/test/recipes/30-test_evp_data/evpciph.txt @@ -435,7 +435,6 @@ Ciphertext = 75A385741AB9CEF82031623D55B1E471 # AES-bits-CFB:key:IV/output':plaintext:ciphertext:encdec # OFB-AES128.Encrypt Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = 000102030405060708090A0B0C0D0E0F Operation = ENCRYPT @@ -443,7 +442,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = 50FE67CC996D32B6DA0937E99BAFEC60 Operation = ENCRYPT @@ -451,7 +449,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = 7789508D16918F03F53C52DAC54ED825 Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = D9A4DADA0892239F6B8B3D7680E15674 Operation = ENCRYPT @@ -459,7 +456,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 9740051E9C5FECF64344F7A82260EDCC Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = A78819583F0308E7A6BF36B1386ABF23 Operation = ENCRYPT @@ -468,7 +464,6 @@ Ciphertext = 304C6528F659C77866A510D9C1D6AE5E # OFB-AES128.Decrypt Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = 000102030405060708090A0B0C0D0E0F Operation = DECRYPT @@ -476,7 +471,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = 50FE67CC996D32B6DA0937E99BAFEC60 Operation = DECRYPT @@ -484,7 +478,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = 7789508D16918F03F53C52DAC54ED825 Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = D9A4DADA0892239F6B8B3D7680E15674 Operation = DECRYPT @@ -492,7 +485,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 9740051E9C5FECF64344F7A82260EDCC Cipher = AES-128-OFB -Availablein = default Key = 2B7E151628AED2A6ABF7158809CF4F3C IV = A78819583F0308E7A6BF36B1386ABF23 Operation = DECRYPT @@ -501,7 +493,6 @@ Ciphertext = 304C6528F659C77866A510D9C1D6AE5E # OFB-AES192.Encrypt Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = 000102030405060708090A0B0C0D0E0F Operation = ENCRYPT @@ -509,7 +500,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = A609B38DF3B1133DDDFF2718BA09565E Operation = ENCRYPT @@ -517,7 +507,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = FCC28B8D4C63837C09E81700C1100401 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = 52EF01DA52602FE0975F78AC84BF8A50 Operation = ENCRYPT @@ -525,7 +514,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = BD5286AC63AABD7EB067AC54B553F71D Operation = ENCRYPT @@ -534,7 +522,6 @@ Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A # OFB-AES192.Decrypt Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = 000102030405060708090A0B0C0D0E0F Operation = ENCRYPT @@ -542,7 +529,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = A609B38DF3B1133DDDFF2718BA09565E Operation = ENCRYPT @@ -550,7 +536,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = FCC28B8D4C63837C09E81700C1100401 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = 52EF01DA52602FE0975F78AC84BF8A50 Operation = ENCRYPT @@ -558,7 +543,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2 Cipher = AES-192-OFB -Availablein = default Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B IV = BD5286AC63AABD7EB067AC54B553F71D Operation = ENCRYPT @@ -567,7 +551,6 @@ Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A # OFB-AES256.Encrypt Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = 000102030405060708090A0B0C0D0E0F Operation = ENCRYPT @@ -575,7 +558,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A Operation = ENCRYPT @@ -583,7 +565,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = E1C656305ED1A7A6563805746FE03EDC Operation = ENCRYPT @@ -591,7 +572,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = 41635BE625B48AFC1666DD42A09D96E7 Operation = ENCRYPT @@ -600,7 +580,6 @@ Ciphertext = 0126141D67F37BE8538F5A8BE740E484 # OFB-AES256.Decrypt Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = 000102030405060708090A0B0C0D0E0F Operation = DECRYPT @@ -608,7 +587,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A Ciphertext = DC7E84BFDA79164B7ECD8486985D3860 Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A Operation = DECRYPT @@ -616,7 +594,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51 Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = E1C656305ED1A7A6563805746FE03EDC Operation = DECRYPT @@ -624,7 +601,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408 Cipher = AES-256-OFB -Availablein = default Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4 IV = 41635BE625B48AFC1666DD42A09D96E7 Operation = DECRYPT -- 2.25.1