[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Wed May 27 22:00:39 UTC 2020
The branch master has been updated
via 4f65bc6f8fc4464631a93002d99f61a4a75b4552 (commit)
via 0839afa747cd0e0ef35179ed49dfd4a481fcc918 (commit)
from 77286fe3ec6b9777934e67e35f3b7007143b0734 (commit)
- Log -----------------------------------------------------------------
commit 4f65bc6f8fc4464631a93002d99f61a4a75b4552
Author: Pauli <paul.dale at oracle.com>
Date: Sat May 23 10:20:46 2020 +1000
fips: add AES OFB mode ciphers to FIPS provider.
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11908)
commit 0839afa747cd0e0ef35179ed49dfd4a481fcc918
Author: Pauli <paul.dale at oracle.com>
Date: Fri May 22 19:30:52 2020 +1000
fips: add AES CFB mode ciphers to FIPS provider.
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11908)
-----------------------------------------------------------------------
Summary of changes:
providers/fips/fipsprov.c | 12 ++++++++
test/recipes/30-test_evp_data/evpciph.txt | 48 -------------------------------
2 files changed, 12 insertions(+), 48 deletions(-)
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c
index bbf95b7505..31217202f2 100644
--- a/providers/fips/fipsprov.c
+++ b/providers/fips/fipsprov.c
@@ -390,6 +390,18 @@ 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),
+ 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 4d7f9f0d94..4f7afd0e1d 100644
--- 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
@@ -459,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
@@ -467,7 +442,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = 50FE67CC996D32B6DA0937E99BAFEC60
Operation = ENCRYPT
@@ -475,7 +449,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = 7789508D16918F03F53C52DAC54ED825
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = D9A4DADA0892239F6B8B3D7680E15674
Operation = ENCRYPT
@@ -483,7 +456,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 9740051E9C5FECF64344F7A82260EDCC
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = A78819583F0308E7A6BF36B1386ABF23
Operation = ENCRYPT
@@ -492,7 +464,6 @@ Ciphertext = 304C6528F659C77866A510D9C1D6AE5E
# OFB-AES128.Decrypt
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = 000102030405060708090A0B0C0D0E0F
Operation = DECRYPT
@@ -500,7 +471,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = 3B3FD92EB72DAD20333449F8E83CFB4A
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = 50FE67CC996D32B6DA0937E99BAFEC60
Operation = DECRYPT
@@ -508,7 +478,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = 7789508D16918F03F53C52DAC54ED825
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = D9A4DADA0892239F6B8B3D7680E15674
Operation = DECRYPT
@@ -516,7 +485,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 9740051E9C5FECF64344F7A82260EDCC
Cipher = AES-128-OFB
-Availablein = default
Key = 2B7E151628AED2A6ABF7158809CF4F3C
IV = A78819583F0308E7A6BF36B1386ABF23
Operation = DECRYPT
@@ -525,7 +493,6 @@ Ciphertext = 304C6528F659C77866A510D9C1D6AE5E
# OFB-AES192.Encrypt
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = 000102030405060708090A0B0C0D0E0F
Operation = ENCRYPT
@@ -533,7 +500,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = A609B38DF3B1133DDDFF2718BA09565E
Operation = ENCRYPT
@@ -541,7 +507,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = FCC28B8D4C63837C09E81700C1100401
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = 52EF01DA52602FE0975F78AC84BF8A50
Operation = ENCRYPT
@@ -549,7 +514,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = BD5286AC63AABD7EB067AC54B553F71D
Operation = ENCRYPT
@@ -558,7 +522,6 @@ Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A
# OFB-AES192.Decrypt
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = 000102030405060708090A0B0C0D0E0F
Operation = ENCRYPT
@@ -566,7 +529,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = CDC80D6FDDF18CAB34C25909C99A4174
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = A609B38DF3B1133DDDFF2718BA09565E
Operation = ENCRYPT
@@ -574,7 +536,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = FCC28B8D4C63837C09E81700C1100401
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = 52EF01DA52602FE0975F78AC84BF8A50
Operation = ENCRYPT
@@ -582,7 +543,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 8D9A9AEAC0F6596F559C6D4DAF59A5F2
Cipher = AES-192-OFB
-Availablein = default
Key = 8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B
IV = BD5286AC63AABD7EB067AC54B553F71D
Operation = ENCRYPT
@@ -591,7 +551,6 @@ Ciphertext = 6D9F200857CA6C3E9CAC524BD9ACC92A
# OFB-AES256.Encrypt
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = 000102030405060708090A0B0C0D0E0F
Operation = ENCRYPT
@@ -599,7 +558,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A
Operation = ENCRYPT
@@ -607,7 +565,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = E1C656305ED1A7A6563805746FE03EDC
Operation = ENCRYPT
@@ -615,7 +572,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = 41635BE625B48AFC1666DD42A09D96E7
Operation = ENCRYPT
@@ -624,7 +580,6 @@ Ciphertext = 0126141D67F37BE8538F5A8BE740E484
# OFB-AES256.Decrypt
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = 000102030405060708090A0B0C0D0E0F
Operation = DECRYPT
@@ -632,7 +587,6 @@ Plaintext = 6BC1BEE22E409F96E93D7E117393172A
Ciphertext = DC7E84BFDA79164B7ECD8486985D3860
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = B7BF3A5DF43989DD97F0FA97EBCE2F4A
Operation = DECRYPT
@@ -640,7 +594,6 @@ Plaintext = AE2D8A571E03AC9C9EB76FAC45AF8E51
Ciphertext = 4FEBDC6740D20B3AC88F6AD82A4FB08D
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = E1C656305ED1A7A6563805746FE03EDC
Operation = DECRYPT
@@ -648,7 +601,6 @@ Plaintext = 30C81C46A35CE411E5FBC1191A0A52EF
Ciphertext = 71AB47A086E86EEDF39D1C5BBA97C408
Cipher = AES-256-OFB
-Availablein = default
Key = 603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4
IV = 41635BE625B48AFC1666DD42A09D96E7
Operation = DECRYPT
More information about the openssl-commits
mailing list