Commit 695fea20 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add function and reason checking to evp_test 



Add options to check the function and reason code matches expected values.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(cherry picked from commit 99f2f1dc)
parent 6212179e

test/evp_test.c

+58 −4
Original line number Original line Diff line number Diff line
@@ -210,6 +210,10 @@ struct evp_test { 
    const char *err, *aux_err;

    const char *err, *aux_err;

    /* Expected error value of test */

    /* Expected error value of test */

    char *expected_err;

    char *expected_err;

    /* Expected error function string */

    char *func;

    /* Expected error reason string */

    char *reason;

    /* Number of tests */

    /* Number of tests */

    int ntests;

    int ntests;

    /* Error count */

    /* Error count */
@@ -296,6 +300,10 @@ static void free_expected(struct evp_test *t) 
{

{

    OPENSSL_free(t->expected_err);

    OPENSSL_free(t->expected_err);

    t->expected_err = NULL;

    t->expected_err = NULL;

    OPENSSL_free(t->func);

    t->func = NULL;

    OPENSSL_free(t->reason);

    t->reason = NULL;

    OPENSSL_free(t->out_expected);

    OPENSSL_free(t->out_expected);

    OPENSSL_free(t->out_received);

    OPENSSL_free(t->out_received);

    t->out_expected = NULL;

    t->out_expected = NULL;
@@ -317,6 +325,9 @@ static void print_expected(struct evp_test *t) 




static int check_test_error(struct evp_test *t)

static int check_test_error(struct evp_test *t)

{

{

    unsigned long err;

    const char *func;

    const char *reason;

    if (!t->err && !t->expected_err)

    if (!t->err && !t->expected_err)

        return 1;

        return 1;

    if (t->err && !t->expected_err) {

    if (t->err && !t->expected_err) {
@@ -335,14 +346,41 @@ static int check_test_error(struct evp_test *t) 
                t->start_line, t->expected_err);

                t->start_line, t->expected_err);

        return 0;

        return 0;

    }

    }

    if (strcmp(t->err, t->expected_err) == 0)

        return 1;





    if (strcmp(t->err, t->expected_err) != 0) {

        fprintf(stderr, "Test line %d: expecting %s got %s\n",

        fprintf(stderr, "Test line %d: expecting %s got %s\n",

                t->start_line, t->expected_err, t->err);

                t->start_line, t->expected_err, t->err);

        return 0;

        return 0;

    }

    }





    if (t->func == NULL && t->reason == NULL)

        return 1;



    if (t->func == NULL || t->reason == NULL) {

        fprintf(stderr, "Test line %d: missing function or reason code\n",

                t->start_line);

        return 0;

    }



    err = ERR_peek_error();

    if (err == 0) {

        fprintf(stderr, "Test line %d, expected error \"%s:%s\" not set\n",

                t->start_line, t->func, t->reason);

        return 0;

    }



    func = ERR_func_error_string(err);

    reason = ERR_reason_error_string(err);



    if (strcmp(func, t->func) == 0 && strcmp(reason, t->reason) == 0)

        return 1;



    fprintf(stderr, "Test line %d: expected error \"%s:%s\", got \"%s:%s\"\n",

            t->start_line, t->func, t->reason, func, reason);



    return 0;

}



/* Setup a new test, run any existing test */

/* Setup a new test, run any existing test */





static int setup_test(struct evp_test *t, const struct evp_test_method *tmeth)

static int setup_test(struct evp_test *t, const struct evp_test_method *tmeth)
@@ -494,7 +532,23 @@ static int process_test(struct evp_test *t, char *buf, int verbose) 
            return 0;

            return 0;

        }

        }

        t->expected_err = OPENSSL_strdup(value);

        t->expected_err = OPENSSL_strdup(value);

        if (!t->expected_err)

        if (t->expected_err == NULL)

            return 0;

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

        if (t->func != NULL) {

            fprintf(stderr, "Line %d: multiple function lines\n", t->line);

            return 0;

        }

        t->func = OPENSSL_strdup(value);

        if (t->func == NULL)

            return 0;

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

        if (t->reason != NULL) {

            fprintf(stderr, "Line %d: multiple reason lines\n", t->line);

            return 0;

        }

        t->reason = OPENSSL_strdup(value);

        if (t->reason == NULL)

            return 0;

            return 0;

    } else {

    } else {

        /* Must be test specific line: try to parse it */

        /* Must be test specific line: try to parse it */

test/evptests.txt

+8 −0
Original line number Original line Diff line number Diff line
@@ -2773,11 +2773,15 @@ Output = c09d402423cbf233d26cae21f954547bc43fe80fd41360a0336cfdbe9aedad05bef6fd2 
# Illegal RSA key derivation

# Illegal RSA key derivation

Derive = RSA-2048

Derive = RSA-2048

Result = KEYOP_INIT_ERROR

Result = KEYOP_INIT_ERROR

Function = EVP_PKEY_derive_init

Reason = operation not supported for this keytype





# Invalid ctrl

# Invalid ctrl

Sign = RSA-2048

Sign = RSA-2048

Ctrl = rsa_mgf1_md:sha1

Ctrl = rsa_mgf1_md:sha1

Result = PKEY_CTRL_INVALID

Result = PKEY_CTRL_INVALID

Function = pkey_rsa_ctrl

Reason = invalid mgf1 md





# EC tests

# EC tests
@@ -3602,6 +3606,10 @@ SharedSecret=4A5D9D5BA4CE2DE1728E3BF480350F25E07E21C947D19E3376F09B3C1E161742 




Sign=Alice-25519

Sign=Alice-25519

Result = KEYOP_INIT_ERROR

Result = KEYOP_INIT_ERROR

Function = EVP_PKEY_sign_init

Reason = operation not supported for this keytype





Verify=Alice-25519

Verify=Alice-25519

Result = KEYOP_INIT_ERROR

Result = KEYOP_INIT_ERROR

Function = EVP_PKEY_verify_init

Reason = operation not supported for this keytype