Merge pull request #270 from gilles-peskine-arm/test_outcome_file-crypto-fix

Fix test case descriptions

Author: gilles-peskine-arm

tests/suites/test_suite_aria.data

@@ -16,18 +16,9 @@ aria_encrypt_ecb:"000102030405060708090a0b0c0d0e0f1011121314151617":"00112233445
 ARIA-192-ECB Decrypt - RFC 5794
 aria_decrypt_ecb:"000102030405060708090a0b0c0d0e0f1011121314151617":"26449c1805dbe7aa25a468ce263a9e79":"00112233445566778899aabbccddeeff":0
 
-ARIA-256-ECB_Encrypt - RFC 5794
+ARIA-256-ECB Encrypt - RFC 5794
 aria_encrypt_ecb:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f":"00112233445566778899aabbccddeeff":"f92bd7c79fb72e2f2b8f80c1972d24fc":0
 
-ARIA-256-ECB_Decrypt - RFC 5794
-aria_decrypt_ecb:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f":"f92bd7c79fb72e2f2b8f80c1972d24fc":"00112233445566778899aabbccddeeff":0
-
-ARIA-128-ECB Decrypt - RFC 5794
-aria_decrypt_ecb:"000102030405060708090a0b0c0d0e0f":"d718fbd6ab644c739da95f3be6451778":"00112233445566778899aabbccddeeff":0
-
-ARIA-192-ECB Decrypt - RFC 5794
-aria_decrypt_ecb:"000102030405060708090a0b0c0d0e0f1011121314151617":"26449c1805dbe7aa25a468ce263a9e79":"00112233445566778899aabbccddeeff":0
-
 ARIA-256-ECB Decrypt - RFC 5794
 aria_decrypt_ecb:"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f":"f92bd7c79fb72e2f2b8f80c1972d24fc":"00112233445566778899aabbccddeeff":0
 

tests/suites/test_suite_blowfish.data

@@ -148,8 +148,8 @@ blowfish_decrypt_ecb:"04b915ba43feb5b6":"353882b109ce8f1a":"42fd443059577fa2":0
 BLOWFISH-ECB Decrypt SSLeay reference #14
 blowfish_decrypt_ecb:"0113b970fd34f2ce":"48f4d0884c379918":"059b5e0851cf143a":0
 
-BLOWFISH-ECB Encrypt SSLeay reference #15
-blowfish_encrypt_ecb:"0170f175468fb5e6":"0756d8e0774761d2":"432193b78951fc98":0
+BLOWFISH-ECB Decrypt SSLeay reference #15
+blowfish_decrypt_ecb:"0170f175468fb5e6":"432193b78951fc98":"0756d8e0774761d2":0
 
 BLOWFISH-ECB Decrypt SSLeay reference #16
 blowfish_decrypt_ecb:"43297fad38e373fe":"13f04154d69d1ae5":"762514b829bf486a":0
@@ -289,16 +289,16 @@ blowfish_encrypt_ecb:"f0e1d2c3b4a5968778695a4b3c2d1e0f00112233445566778899aabbcc
 BLOWFISH-SETKEY Setkey 456 bits
 blowfish_encrypt_ecb:"f0e1d2c3b4a5968778695a4b3c2d1e0f00112233445566778899aabbccddeeff0123456789abcdef0102030405060708090a0b0c0d0e0fffff":"fedcba9876543210":"":MBEDTLS_ERR_BLOWFISH_BAD_INPUT_DATA
 
-BLOWFISH-CBC Encrypt
+BLOWFISH-CBC Encrypt [#1]
 blowfish_encrypt_cbc:"0123456789ABCDEFF0E1D2C3B4A59687":"FEDCBA9876543210":"37363534333231204E6F77206973207468652074696D6520666F722000000000":"6b77b4d63006dee605b156e27403979358deb9e7154616d959f1652bd5ff92cc":0
 
-BLOWFISH-CBC Decrypt
+BLOWFISH-CBC Decrypt [#1]
 blowfish_decrypt_cbc:"0123456789ABCDEFF0E1D2C3B4A59687":"FEDCBA9876543210":"6B77B4D63006DEE605B156E27403979358DEB9E7154616D959F1652BD5FF92CC":"37363534333231204e6f77206973207468652074696d6520666f722000000000":0
 
-BLOWFISH-CBC Encrypt
+BLOWFISH-CBC Encrypt [#2]
 blowfish_encrypt_cbc:"0123456789ABCDEFF0E1D2C3B4A59687":"FEDCBA9876543210":"37363534333231204E6F77206973207468652074696D6520666F7220000000":"":MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH
 
-BLOWFISH-CBC Decrypt
+BLOWFISH-CBC Decrypt [#2]
 blowfish_decrypt_cbc:"0123456789ABCDEFF0E1D2C3B4A59687":"FEDCBA9876543210":"6B77B4D63006DEE605B156E27403979358DEB9E7154616D959F1652BD5FF92CC00":"":MBEDTLS_ERR_BLOWFISH_INVALID_INPUT_LENGTH
 
 BLOWFISH-CFB Encrypt

tests/suites/test_suite_camellia.data

@@ -13,16 +13,16 @@ camellia_encrypt_ecb:"0123456789abcdeffedcba98765432100011223344556677":"0123456
 Camellia-256-ECB Encrypt RFC3713 #1
 camellia_encrypt_ecb:"0123456789abcdeffedcba987654321000112233445566778899aabbccddeeff":"0123456789abcdeffedcba9876543210":"9acc237dff16d76c20ef7c919e3a7509":0
 
-Camellia-128-ECB Encrypt Perl EVP #1
+Camellia-128-ECB Encrypt Perl EVP #1 [#1]
 camellia_encrypt_ecb:"000102030405060708090A0B0C0D0E0F":"00112233445566778899AABBCCDDEEFF":"77CF412067AF8270613529149919546F":0
 
-Camellia-192-ECB Encrypt Perl EVP #1
+Camellia-192-ECB Encrypt Perl EVP #1 [#1]
 camellia_encrypt_ecb:"000102030405060708090A0B0C0D0E0F1011121314151617":"00112233445566778899AABBCCDDEEFF":"B22F3C36B72D31329EEE8ADDC2906C68":0
 
-Camellia-256-ECB Encrypt Perl EVP #1
+Camellia-256-ECB Encrypt Perl EVP #1 [#1]
 camellia_encrypt_ecb:"000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F":"00112233445566778899AABBCCDDEEFF":"2EDF1F3418D53B88841FC8985FB1ECF2":0
 
-Camellia-128-ECB Encrypt Perl EVP #1
+Camellia-128-ECB Encrypt Perl EVP #1 [#2]
 camellia_encrypt_ecb:"2B7E151628AED2A6ABF7158809CF4F3C":"6BC1BEE22E409F96E93D7E117393172A":"432FC5DCD628115B7C388D770B270C96":0
 
 Camellia-128-ECB Encrypt Perl EVP #2
@@ -34,7 +34,7 @@ camellia_encrypt_ecb:"2B7E151628AED2A6ABF7158809CF4F3C":"30C81C46A35CE411E5FBC11
 Camellia-128-ECB Encrypt Perl EVP #4
 camellia_encrypt_ecb:"2B7E151628AED2A6ABF7158809CF4F3C":"F69F2445DF4F9B17AD2B417BE66C3710":"E61925E0D5DFAA9BB29F815B3076E51A":0
 
-Camellia-192-ECB Encrypt Perl EVP #1
+Camellia-192-ECB Encrypt Perl EVP #1 [#2]
 camellia_encrypt_ecb:"8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B":"6BC1BEE22E409F96E93D7E117393172A":"CCCC6C4E138B45848514D48D0D3439D3":0
 
 Camellia-192-ECB Encrypt Perl EVP #2
@@ -46,7 +46,7 @@ camellia_encrypt_ecb:"8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B":"30C81C4
 Camellia-192-ECB Encrypt Perl EVP #4
 camellia_encrypt_ecb:"8E73B0F7DA0E6452C810F32B809079E562F8EAD2522C6B7B":"F69F2445DF4F9B17AD2B417BE66C3710":"909DBD95799096748CB27357E73E1D26":0
 
-Camellia-256-ECB Encrypt Perl EVP #1
+Camellia-256-ECB Encrypt Perl EVP #1 [#2]
 camellia_encrypt_ecb:"603DEB1015CA71BE2B73AEF0857D77811F352C073B6108D72D9810A30914DFF4":"6BC1BEE22E409F96E93D7E117393172A":"BEFD219B112FA00098919CD101C9CCFA":0
 
 Camellia-256-ECB Encrypt Perl EVP #2

tests/suites/test_suite_cipher.arc4.data

@@ -42,11 +42,11 @@ ARC4 Encrypt and decrypt 31 bytes
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf:MBEDTLS_CIPHER_ARC4_128:"ARC4-128":128:31:-1
 
-ARC4 Encrypt and decrypt 32 bytes
+ARC4 Encrypt and decrypt 32 bytes [#1]
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf:MBEDTLS_CIPHER_ARC4_128:"ARC4-128":128:32:-1
 
-ARC4 Encrypt and decrypt 32 bytes
+ARC4 Encrypt and decrypt 32 bytes [#2]
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf:MBEDTLS_CIPHER_ARC4_128:"ARC4-128":128:33:-1
 
@@ -90,15 +90,15 @@ ARC4 Encrypt and decrypt 16 bytes in multiple parts 4
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf_multipart:MBEDTLS_CIPHER_ARC4_128:128:15:1:-1:15:1:15:1
 
-ARC4 Encrypt and decrypt 22 bytes in multiple parts 1
+ARC4 Encrypt and decrypt 22 bytes in multiple parts 1 [#1]
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf_multipart:MBEDTLS_CIPHER_ARC4_128:128:15:7:-1:15:7:15:7
 
-ARC4 Encrypt and decrypt 22 bytes in multiple parts 1
+ARC4 Encrypt and decrypt 22 bytes in multiple parts 1 [#2]
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf_multipart:MBEDTLS_CIPHER_ARC4_128:128:16:6:-1:16:6:16:6
 
-ARC4 Encrypt and decrypt 22 bytes in multiple parts 1
+ARC4 Encrypt and decrypt 22 bytes in multiple parts 1 [#3]
 depends_on:MBEDTLS_ARC4_C
 enc_dec_buf_multipart:MBEDTLS_CIPHER_ARC4_128:128:17:6:-1:17:6:17:6