Commit f2ae2348 authored by Richard Levitte's avatar Richard Levitte
Browse files

Convert modes selftests (cts128 and gcm128) to internal test 



Reviewed-by: default avatarEmilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)
parent 2c166171

crypto/modes/cts128.c

+0 −193
Original line number Diff line number Diff line
@@ -328,196 +328,3 @@ size_t CRYPTO_nistcts128_decrypt(const unsigned char *in, unsigned char *out, 
#endif

    return 16 + len + residue;

}
 


#if defined(SELFTEST)

# include <stdio.h>

# include <openssl/aes.h>



/* test vectors from RFC 3962 */

static const unsigned char test_key[16] = "chicken teriyaki";

static const unsigned char test_input[64] =

    "I would like the" " General Gau's C"

    "hicken, please, " "and wonton soup.";

static const unsigned char test_iv[16] =

    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };



static const unsigned char vector_17[17] = {

    0xc6, 0x35, 0x35, 0x68, 0xf2, 0xbf, 0x8c, 0xb4,

    0xd8, 0xa5, 0x80, 0x36, 0x2d, 0xa7, 0xff, 0x7f,

    0x97

};



static const unsigned char vector_31[31] = {

    0xfc, 0x00, 0x78, 0x3e, 0x0e, 0xfd, 0xb2, 0xc1,

    0xd4, 0x45, 0xd4, 0xc8, 0xef, 0xf7, 0xed, 0x22,

    0x97, 0x68, 0x72, 0x68, 0xd6, 0xec, 0xcc, 0xc0,

    0xc0, 0x7b, 0x25, 0xe2, 0x5e, 0xcf, 0xe5

};



static const unsigned char vector_32[32] = {

    0x39, 0x31, 0x25, 0x23, 0xa7, 0x86, 0x62, 0xd5,

    0xbe, 0x7f, 0xcb, 0xcc, 0x98, 0xeb, 0xf5, 0xa8,

    0x97, 0x68, 0x72, 0x68, 0xd6, 0xec, 0xcc, 0xc0,

    0xc0, 0x7b, 0x25, 0xe2, 0x5e, 0xcf, 0xe5, 0x84

};



static const unsigned char vector_47[47] = {

    0x97, 0x68, 0x72, 0x68, 0xd6, 0xec, 0xcc, 0xc0,

    0xc0, 0x7b, 0x25, 0xe2, 0x5e, 0xcf, 0xe5, 0x84,

    0xb3, 0xff, 0xfd, 0x94, 0x0c, 0x16, 0xa1, 0x8c,

    0x1b, 0x55, 0x49, 0xd2, 0xf8, 0x38, 0x02, 0x9e,

    0x39, 0x31, 0x25, 0x23, 0xa7, 0x86, 0x62, 0xd5,

    0xbe, 0x7f, 0xcb, 0xcc, 0x98, 0xeb, 0xf5

};



static const unsigned char vector_48[48] = {

    0x97, 0x68, 0x72, 0x68, 0xd6, 0xec, 0xcc, 0xc0,

    0xc0, 0x7b, 0x25, 0xe2, 0x5e, 0xcf, 0xe5, 0x84,

    0x9d, 0xad, 0x8b, 0xbb, 0x96, 0xc4, 0xcd, 0xc0,

    0x3b, 0xc1, 0x03, 0xe1, 0xa1, 0x94, 0xbb, 0xd8,

    0x39, 0x31, 0x25, 0x23, 0xa7, 0x86, 0x62, 0xd5,

    0xbe, 0x7f, 0xcb, 0xcc, 0x98, 0xeb, 0xf5, 0xa8

};



static const unsigned char vector_64[64] = {

    0x97, 0x68, 0x72, 0x68, 0xd6, 0xec, 0xcc, 0xc0,

    0xc0, 0x7b, 0x25, 0xe2, 0x5e, 0xcf, 0xe5, 0x84,

    0x39, 0x31, 0x25, 0x23, 0xa7, 0x86, 0x62, 0xd5,

    0xbe, 0x7f, 0xcb, 0xcc, 0x98, 0xeb, 0xf5, 0xa8,

    0x48, 0x07, 0xef, 0xe8, 0x36, 0xee, 0x89, 0xa5,

    0x26, 0x73, 0x0d, 0xbc, 0x2f, 0x7b, 0xc8, 0x40,

    0x9d, 0xad, 0x8b, 0xbb, 0x96, 0xc4, 0xcd, 0xc0,

    0x3b, 0xc1, 0x03, 0xe1, 0xa1, 0x94, 0xbb, 0xd8

};



static AES_KEY encks, decks;



void test_vector(const unsigned char *vector, size_t len)

{

    unsigned char iv[sizeof(test_iv)];

    unsigned char cleartext[64], ciphertext[64];

    size_t tail;



    printf("vector_%d\n", len);

    fflush(stdout);



    if ((tail = len % 16) == 0)

        tail = 16;

    tail += 16;



    /* test block-based encryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_cts128_encrypt_block(test_input, ciphertext, len, &encks, iv,

                                (block128_f) AES_encrypt);

    if (memcmp(ciphertext, vector, len))

        fprintf(stderr, "output_%d mismatch\n", len), exit(1);

    if (memcmp(iv, vector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(1);



    /* test block-based decryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_cts128_decrypt_block(ciphertext, cleartext, len, &decks, iv,

                                (block128_f) AES_decrypt);

    if (memcmp(cleartext, test_input, len))

        fprintf(stderr, "input_%d mismatch\n", len), exit(2);

    if (memcmp(iv, vector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(2);



    /* test streamed encryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_cts128_encrypt(test_input, ciphertext, len, &encks, iv,

                          (cbc128_f) AES_cbc_encrypt);

    if (memcmp(ciphertext, vector, len))

        fprintf(stderr, "output_%d mismatch\n", len), exit(3);

    if (memcmp(iv, vector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(3);



    /* test streamed decryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_cts128_decrypt(ciphertext, cleartext, len, &decks, iv,

                          (cbc128_f) AES_cbc_encrypt);

    if (memcmp(cleartext, test_input, len))

        fprintf(stderr, "input_%d mismatch\n", len), exit(4);

    if (memcmp(iv, vector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(4);

}



void test_nistvector(const unsigned char *vector, size_t len)

{

    unsigned char iv[sizeof(test_iv)];

    unsigned char cleartext[64], ciphertext[64], nistvector[64];

    size_t tail;



    printf("nistvector_%d\n", len);

    fflush(stdout);



    if ((tail = len % 16) == 0)

        tail = 16;



    len -= 16 + tail;

    memcpy(nistvector, vector, len);

    /* flip two last blocks */

    memcpy(nistvector + len, vector + len + 16, tail);

    memcpy(nistvector + len + tail, vector + len, 16);

    len += 16 + tail;

    tail = 16;



    /* test block-based encryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_nistcts128_encrypt_block(test_input, ciphertext, len, &encks, iv,

                                    (block128_f) AES_encrypt);

    if (memcmp(ciphertext, nistvector, len))

        fprintf(stderr, "output_%d mismatch\n", len), exit(1);

    if (memcmp(iv, nistvector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(1);



    /* test block-based decryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_nistcts128_decrypt_block(ciphertext, cleartext, len, &decks, iv,

                                    (block128_f) AES_decrypt);

    if (memcmp(cleartext, test_input, len))

        fprintf(stderr, "input_%d mismatch\n", len), exit(2);

    if (memcmp(iv, nistvector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(2);



    /* test streamed encryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_nistcts128_encrypt(test_input, ciphertext, len, &encks, iv,

                              (cbc128_f) AES_cbc_encrypt);

    if (memcmp(ciphertext, nistvector, len))

        fprintf(stderr, "output_%d mismatch\n", len), exit(3);

    if (memcmp(iv, nistvector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(3);



    /* test streamed decryption */

    memcpy(iv, test_iv, sizeof(test_iv));

    CRYPTO_nistcts128_decrypt(ciphertext, cleartext, len, &decks, iv,

                              (cbc128_f) AES_cbc_encrypt);

    if (memcmp(cleartext, test_input, len))

        fprintf(stderr, "input_%d mismatch\n", len), exit(4);

    if (memcmp(iv, nistvector + len - tail, sizeof(iv)))

        fprintf(stderr, "iv_%d mismatch\n", len), exit(4);

}



int main()

{

    AES_set_encrypt_key(test_key, 128, &encks);

    AES_set_decrypt_key(test_key, 128, &decks);



    test_vector(vector_17, sizeof(vector_17));

    test_vector(vector_31, sizeof(vector_31));

    test_vector(vector_32, sizeof(vector_32));

    test_vector(vector_47, sizeof(vector_47));

    test_vector(vector_48, sizeof(vector_48));

    test_vector(vector_64, sizeof(vector_64));



    test_nistvector(vector_17, sizeof(vector_17));

    test_nistvector(vector_31, sizeof(vector_31));

    test_nistvector(vector_32, sizeof(vector_32));

    test_nistvector(vector_47, sizeof(vector_47));

    test_nistvector(vector_48, sizeof(vector_48));

    test_nistvector(vector_64, sizeof(vector_64));



    return 0;

}

#endif

crypto/modes/gcm128.c

+0 −636

File changed.

Preview size limit exceeded, changes collapsed.

test/build.info

+11 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ IF[{- !$disabled{tests} -}] 
  # Note that when building with static libraries, none of those extra files

  # are needed, since all symbols are available anyway, regardless of what's

  # listed in util/*.num.

  PROGRAMS_NO_INST=asn1_internal_test

  PROGRAMS_NO_INST=asn1_internal_test modes_internal_test

  IF[{- !$disabled{poly1305} -}]

    PROGRAMS_NO_INST=poly1305_internal_test

  ENDIF
@@ -339,6 +339,16 @@ IF[{- !$disabled{tests} -}] 
  ENDIF

  INCLUDE[asn1_internal_test]=.. ../include ../crypto/include

  DEPEND[asn1_internal_test]=../libcrypto



  SOURCE[modes_internal_test]=modes_internal_test.c testutil.c

  IF[{- !$disabled{shared} -}]

    SOURCE[modes_internal_test]= {- $target{cpuid_asm_src}

                                    ? "../crypto/".$target{cpuid_asm_src}

                                    : "" -} \

        ../crypto/cryptlib.c

  ENDIF

  INCLUDE[modes_internal_test]=.. ../include

  DEPEND[modes_internal_test]=../libcrypto

ENDIF



{-

test/modes_internal_test.c

0 → 100644
+1085 −0

File added.

Preview size limit exceeded, changes collapsed.