X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Ftls13encryptiontest.c;h=4c5d575b2440f50fac3d922d0a917e525bff0375;hp=33a70a17c0d558d3e0436ae6be2b7ef5284829c1;hb=84e68a1bbaa98889cc6c20e9f35f0f96148d9642;hpb=f60d68dc5385722608f3813d430842c3f5216e37 diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c index 33a70a17c0..4c5d575b24 100644 --- a/test/tls13encryptiontest.c +++ b/test/tls13encryptiontest.c @@ -1,5 +1,5 @@ /* - * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 2016-2018 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the OpenSSL license (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -9,11 +9,21 @@ #include #include + +#ifdef __VMS +# pragma names save +# pragma names as_is,shortened +#endif + #include "../ssl/ssl_locl.h" #include "../ssl/record/record_locl.h" +#ifdef __VMS +# pragma names restore +#endif + +#include "internal/nelem.h" #include "testutil.h" -#include "test_main.h" /* * Based on the test vectors provided in: @@ -32,8 +42,12 @@ typedef struct { const char *seq; } RECORD_DATA; -RECORD_DATA refdata[] = { +static RECORD_DATA refdata[] = { { + /* + * Server: EncryptedExtensions, Certificate, CertificateVerify and + * Finished + */ { "0800001e001c000a00140012001d001700180019010001010102010301040000" "00000b0001b9000001b50001b0308201ac30820115a003020102020102300d06" @@ -78,26 +92,28 @@ RECORD_DATA refdata[] = { "83dd29f64508b2ec3e635a2134fc0e1a39d3ecb51dcddfcf8382c88ffe2a7378" "42ad1de7fe505b6c4d1673870f6fc2a0f2f7972acaee368a1599d64ba18798f1" "0333f9779bd5b05f9b084d03dab2f3d80c2eb74ec70c9866ea31c18b491cd597" - "aae3e941205fcc38a3a10ce8c0269f02ccc9c51278e25f1a0f0731a9" + "aae3e941205fcc38a3a10ce8f2e230d97e3406b77ee53d84d89ca548" }, "d2dd45f87ad87801a85ac38187f9023b", "f0a14f808692cef87a3daf70", "0000000000000000" }, { + /* Client: Finished */ { "1400002078367856d3c8cc4e0a95eb98906ca7a48bd3cc7029f48bd4ae0dc91a" "b903ca8916","","" }, { "fa15e92daa21cd05d8f9c3152a61748d9aaf049da559718e583f95aacecad657" - "b52a6562da09a5819e864d86ac2989360a1eb22795","","" + "b52a6562da66864fd14969acc30dc04a78c38283c5","","" }, "40e1201d75d419627f04c88530a15c9d", "a0f073f3b35e18f96969696b", "0000000000000000" }, { + /* Server: NewSessionTicket */ { "040000a60002a3004abe594b00924e535321cadc96238da09caf9b02fecafdd6" "5e3e418f03e43772cf512ed8066100503b1c08abbbf298a9d138ce821dd12fe1" @@ -112,57 +128,61 @@ RECORD_DATA refdata[] = { "836905229eac811c4ef8b2faa89867e9ffc586f7f03c216591aa5e620eac3c62" "dfe60f846036bd7ecc4464b584af184e9644e94ee1d7834dba408a51cbe42480" "04796ed9c558e0f5f96115a6f6ba487e17d16a2e20a3d3a650a9a070fb53d9da" - "82864b5621d77650bd0c7947e9889917b53d0515627c72b0ded521","","" + "82864b5621d77650bd0c7972f592aa8546de09b8e46921fab4d876","","" }, "3381f6b3f94500f16226de440193e858", "4f1d73cc1d465eb30021c41f", "0000000000000000" }, { + /* Client: Application Data */ { "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" "202122232425262728292a2b2c2d2e2f303117","","" }, { "e306178ad97f74bb64f35eaf3c39846b83aef8472cbc9046749b81a949dfb12c" - "fbc65cbabd20ade92c1f944605892ceeb12fdee8a927bce77c83036ac5a794a8" - "f54a69","","" + "fbc65cbabd20ade92c1f944605892ceeb12fde5781d40e2ca080fc921b750b8c" + "21bd8d","","" }, "eb23a804904b80ba4fe8399e09b1ce42", "efa8c50c06b9c9b8c483e174", "0000000000000000" }, { + /* Server: Application Data */ { "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" "202122232425262728292a2b2c2d2e2f303117","","" }, { "467d99a807dbf778e6ffd8be52456c70665f890811ef2f3c495d5bbe983feeda" - "b0c251dde596bc7e2b135909ec9f9166fb0152e8c16a84e4b1039256467f9538" - "be4463","","" + "b0c251dde596bc7e2b135909ec9f9166fb01526c70c7e42b6df52d63b0000222" + "cb2047","","" }, "3381f6b3f94500f16226de440193e858", "4f1d73cc1d465eb30021c41f", "0000000000000001" }, { + /* Client: CloseNotify */ { "010015","","" }, { - "6bdf60847ba6fb650da36e872adc684a4af2e8","","" + "6bdf609107610cff95d70387a67b89e2494f0d","","" }, "eb23a804904b80ba4fe8399e09b1ce42", "efa8c50c06b9c9b8c483e174", "0000000000000001" }, { + /* Server: CloseNotify */ { "010015","","" }, { - "621b7cc1962cd8a70109fee68a52efedf87d2e","","" + "621b7c60d32528b149b36a78c8891a8d2f65ad","","" }, "3381f6b3f94500f16226de440193e858", "4f1d73cc1d465eb30021c41f", @@ -259,20 +279,13 @@ static int test_record(SSL3_RECORD *rec, RECORD_DATA *recd, int enc) else refd = multihexstr2buf(recd->plaintext, &refdatalen); - if (refd == NULL) { - fprintf(stderr, "Failed to get reference data\n"); - goto err; - } - - if (rec->length != refdatalen) { - fprintf(stderr, "Unexpected length\n"); + if (!TEST_ptr(refd)) { + TEST_info("Failed to get reference data"); goto err; } - if (memcmp(rec->data, refd, refdatalen) != 0) { - fprintf(stderr, "Data does not match\n"); + if (!TEST_mem_eq(rec->data, rec->length, refd, refdatalen)) goto err; - } ret = 1; @@ -281,6 +294,8 @@ static int test_record(SSL3_RECORD *rec, RECORD_DATA *recd, int enc) return ret; } +#define TLS13_AES_128_GCM_SHA256_BYTES ((const unsigned char *)"\x13\x01") + static int test_tls13_encryption(void) { SSL_CTX *ctx = NULL; @@ -291,24 +306,37 @@ static int test_tls13_encryption(void) int ret = 0; size_t ivlen, ctr; + /* + * Encrypted TLSv1.3 records always have an outer content type of + * application data, and a record version of TLSv1.2. + */ rec.data = NULL; + rec.type = SSL3_RT_APPLICATION_DATA; + rec.rec_version = TLS1_2_VERSION; ctx = SSL_CTX_new(TLS_method()); - if (ctx == NULL) { - fprintf(stderr, "Failed creating SSL_CTX\n"); + if (!TEST_ptr(ctx)) { + TEST_info("Failed creating SSL_CTX"); goto err; } s = SSL_new(ctx); - if (s == NULL) { - fprintf(stderr, "Failed creating SSL\n"); + if (!TEST_ptr(s)) { + TEST_info("Failed creating SSL"); goto err; } s->enc_read_ctx = EVP_CIPHER_CTX_new(); + if (!TEST_ptr(s->enc_read_ctx)) + goto err; + s->enc_write_ctx = EVP_CIPHER_CTX_new(); - if (s->enc_read_ctx == NULL || s->enc_write_ctx == NULL) { - fprintf(stderr, "Failed creating EVP_CIPHER_CTX\n"); + if (!TEST_ptr(s->enc_write_ctx)) + goto err; + + s->s3->tmp.new_cipher = SSL_CIPHER_find(s, TLS13_AES_128_GCM_SHA256_BYTES); + if (!TEST_ptr(s->s3->tmp.new_cipher)) { + TEST_info("Failed to find cipher"); goto err; } @@ -317,7 +345,7 @@ static int test_tls13_encryption(void) ivlen = EVP_CIPHER_iv_length(ciph); if (!load_record(&rec, &refdata[ctr], &key, s->read_iv, ivlen, RECORD_LAYER_get_read_sequence(&s->rlayer))) { - fprintf(stderr, "Failed loading key into EVP_CIPHER_CTX\n"); + TEST_error("Failed loading key into EVP_CIPHER_CTX"); goto err; } @@ -330,27 +358,27 @@ static int test_tls13_encryption(void) if (EVP_CipherInit_ex(s->enc_write_ctx, ciph, NULL, key, NULL, 1) <= 0 || EVP_CipherInit_ex(s->enc_read_ctx, ciph, NULL, key, NULL, 0) <= 0) { - fprintf(stderr, "Failed loading key into EVP_CIPHER_CTX\n"); + TEST_error("Failed loading key into EVP_CIPHER_CTX\n"); goto err; } /* Encrypt it */ - if (tls13_enc(s, &rec, 1, 1) != 1) { - fprintf(stderr, "Failed to encrypt record %"OSSLzu"\n", ctr); + if (!TEST_size_t_eq(tls13_enc(s, &rec, 1, 1), 1)) { + TEST_info("Failed to encrypt record %zu", ctr); goto err; } - if (!test_record(&rec, &refdata[ctr], 1)) { - fprintf(stderr, "Record %"OSSLzu" encryption test failed\n", ctr); + if (!TEST_true(test_record(&rec, &refdata[ctr], 1))) { + TEST_info("Record %zu encryption test failed", ctr); goto err; } /* Decrypt it */ - if (tls13_enc(s, &rec, 1, 0) != 1) { - fprintf(stderr, "Failed to decrypt record %"OSSLzu"\n", ctr); + if (!TEST_int_eq(tls13_enc(s, &rec, 1, 0), 1)) { + TEST_info("Failed to decrypt record %zu", ctr); goto err; } - if (!test_record(&rec, &refdata[ctr], 0)) { - fprintf(stderr, "Record %"OSSLzu" decryption test failed\n", ctr); + if (!TEST_true(test_record(&rec, &refdata[ctr], 0))) { + TEST_info("Record %zu decryption test failed", ctr); goto err; } @@ -364,7 +392,7 @@ static int test_tls13_encryption(void) seq = NULL; } - fprintf(stderr, "PASS: %"OSSLzu" records tested\n", ctr); + TEST_note("PASS: %zu records tested", ctr); ret = 1; err: @@ -377,7 +405,8 @@ static int test_tls13_encryption(void) return ret; } -void register_tests(void) +int setup_tests(void) { ADD_TEST(test_tls13_encryption); + return 1; }