Commit ff715da4 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

test/evp_test.c: exercise in-place encryption. 



Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
parent 6133b4ed

test/evp_test.c

+35 −19
Original line number Diff line number Diff line
@@ -860,6 +860,15 @@ static int cipher_test_enc(struct evp_test *t, int enc, 
        out = cdat->plaintext;

        out_len = cdat->plaintext_len;

    }

    if (inp_misalign == (size_t)-1) {

        /*

         * Exercise in-place encryption

         */

        tmp = OPENSSL_malloc(out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH);

        if (!tmp)

            goto err;

        in = memcpy(tmp + out_misalign, in, in_len);

    } else {

        inp_misalign += 16 - ((out_misalign + in_len) & 15);

        /*

         * 'tmp' will store both output and copy of input. We make the copy
@@ -875,6 +884,7 @@ static int cipher_test_enc(struct evp_test *t, int enc, 
            goto err;

        in = memcpy(tmp + out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH +

                    inp_misalign, in, in_len);

    }

    err = "CIPHERINIT_ERROR";

    if (!EVP_CipherInit_ex(ctx, cdat->cipher, NULL, NULL, NULL, enc))

        goto err;
@@ -999,10 +1009,16 @@ static int cipher_test_run(struct evp_test *t) 
    for (out_misalign = 0; out_misalign <= 1; out_misalign++) {

        static char aux_err[64];

        t->aux_err = aux_err;

        for (inp_misalign = 0; inp_misalign <= 1; inp_misalign++) {

        for (inp_misalign = (size_t)-1; inp_misalign != 2; inp_misalign++) {

            if (inp_misalign == (size_t)-1) {

                /* kludge: inp_misalign == -1 means "exercise in-place" */

                BIO_snprintf(aux_err, sizeof(aux_err), "%s in-place",

                             out_misalign ? "misaligned" : "aligned");

            } else {

                BIO_snprintf(aux_err, sizeof(aux_err), "%s output and %s input",

                             out_misalign ? "misaligned" : "aligned",

                             inp_misalign ? "misaligned" : "aligned");

            }

            if (cdat->enc) {

                rv = cipher_test_enc(t, 1, out_misalign, inp_misalign);

                /* Not fatal errors: return */