Commit 1d0f116e authored by Rich Salz's avatar Rich Salz
Browse files

Add "Title" directive to evp_test 



Reviewed-by: default avatarStephen Henson <steve@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3454)
parent 80a2fc41

test/evp_test.c

+5 −2
Original line number Diff line number Diff line
@@ -564,8 +564,11 @@ static int parse_test_line(EVP_TEST *t, char *buf) 
    }

    if (t->skip)

        return 1;

    if (strcmp(keyword, "Result") == 0) {

        if (t->expected_err) {

    if (strcmp(keyword, "Title") == 0) {

        TEST_info("Starting %s tests", value);

        set_test_title(value);

    } else if (strcmp(keyword, "Result") == 0) {

        if (t->expected_err != NULL) {

            TEST_info("Line %d: multiple result lines", t->line);

            return 0;

        }

test/evpciph.txt

+3 −2
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#   -K 000102030405060708090A0B0C0D0E0F1011121314151617 -iv 0001020304050607 |

#  xxd -ps -u



Title = DES EDE3 CFB1

Cipher = DES-EDE3-CFB1

Key = 000102030405060708090A0B0C0D0E0F1011121314151617

IV = 0001020304050607
@@ -32,8 +33,7 @@ Operation = DECRYPT 
Plaintext = "Hello World"

Ciphertext = 3CF55D656E9C0664513358



# AES 128 ECB tests (from FIPS-197 test vectors, encrypt)



Title = AES (from FIPS-197 test vectors)

Cipher = AES-128-ECB

Key = 000102030405060708090A0B0C0D0E0F

Operation = ENCRYPT
@@ -94,6 +94,7 @@ Ciphertext = 8EA2B7CA516745BFEAFC49904B496089 
# For all ECB encrypts and decrypts, the transformed sequence is

#   AES-bits-ECB:key::plaintext:ciphertext:encdec

# ECB-AES128.Encrypt and ECB-AES128.Decrypt

Title = AES tests from NIST document SP800-38A

Cipher = AES-128-ECB

Key = 2B7E151628AED2A6ABF7158809CF4F3C

Plaintext = 6BC1BEE22E409F96E93D7E117393172A

test/evpdigest.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
# Which is currently unsupported by OpenSSL.  They were generated using the

# reference implementation.  RFC7693 also mentions the 616263 / "abc" values.



Title = BLAKE2s256 Tests

Digest = BLAKE2s256

Input = 

Output = 69217a3079908094e11121d042354a7c1f55b6482ca1a51e1b250dfd1ed0eef9

test/evpencod.txt

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
# and continue until a blank line.  Lines starting with a pound sign,

# like this prolog, are ignored.



# Base64 tests



Title = Base64 tests

Encoding = canonical

Input = ""

Output = ""

test/evpkdf.txt

+1 −2
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ 
# and continue until a blank line.  Lines starting with a pound sign,

# like this prolog, are ignored.



# TLS1 PRF tests, from NIST test vectors



Title = TLS1 PRF tests, from NIST test vectors

KDF=TLS1-PRF

Ctrl.md = md:MD5-SHA1

Ctrl.Secret = hexsecret:bded7fa5c1699c010be23dd06ada3a48349f21e5f86263d512c0c5cc379f0e780ec55d9844b2f1db02a96453513568d0