X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=test%2Ftls13encryptiontest.c;h=a5580a29928994c7b63ca12b0d79b9302e024543;hp=5815f851935570ae92e91d48b58d770705053e8f;hb=dbc6268f68e50b2e49d7c5b1157b4f6bcea5d6f9;hpb=f01675c6b7bad65af49c20c8920fa93e751423c8 diff --git a/test/tls13encryptiontest.c b/test/tls13encryptiontest.c index 5815f85193..a5580a2992 100644 --- a/test/tls13encryptiontest.c +++ b/test/tls13encryptiontest.c @@ -1,7 +1,7 @@ /* - * 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 + * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy * in the file LICENSE in the source distribution or at * https://www.openssl.org/source/license.html @@ -11,132 +11,241 @@ #include #include "../ssl/ssl_locl.h" #include "../ssl/record/record_locl.h" - +#include "internal/nelem.h" #include "testutil.h" -#include "test_main.h" -struct record_data { - const char *plaintext; - const char *ciphertext; +/* + * Based on the test vectors provided in: + * https://tools.ietf.org/html/draft-ietf-tls-tls13-vectors-06 + */ + +typedef struct { + /* + * We split these into 3 chunks in order to work around the 509 character + * limit that the standard specifies for string literals + */ + const char *plaintext[3]; + const char *ciphertext[3]; const char *key; const char *iv; const char *seq; -} refdata[] = { +} RECORD_DATA; + +/* + * Note 1: The plaintext values given here have an additional "16" or "17" byte + * added to the end when compared to the official vectors. The official vectors + * do not include the inner content type, but we require it. + * + * Note 2: These are the vectors for the "Simple 1-RTT Handshake" + */ +static RECORD_DATA refdata[] = { { - "0800001e001c000a00140012001d0017001800190100010101020103010400000000" - "0b0001b9000001b50001b0308201ac30820115a003020102020102300d06092a8648" - "86f70d01010b0500300e310c300a06035504031303727361301e170d313630373330" - "3031323335395a170d3236303733303031323335395a300e310c300a060355040313" - "0372736130819f300d06092a864886f70d010101050003818d0030818902818100b4" - "bb498f8279303d980836399b36c6988c0c68de55e1bdb826d3901a2461eafd2de49a" - "91d015abbc9a95137ace6c1af19eaa6af98c7ced43120998e187a80ee0ccb0524b1b" - "018c3e0b63264d449a6d38e22a5fda430846748030530ef0461c8ca9d9efbfae8ea6" - "d1d03e2bd193eff0ab9a8002c47428a6d35a8d88d79f7f1e3f0203010001a31a3018" - "30090603551d1304023000300b0603551d0f0404030205a0300d06092a864886f70d" - "01010b05000381810085aad2a0e5b9276b908c65f73a7267170618a54c5f8a7b337d" - "2df7a594365417f2eae8f8a58c8f8172f9319cf36b7fd6c55b80f21a030151567260" - "96fd335e5e67f2dbf102702e608ccae6bec1fc63a42a99be5c3eb7107c3c54e9b9eb" - "2bd5203b1c3b84e0a8b2f759409ba3eac9d91d402dcc0cc8f8961229ac9187b42b4d" - "e100000f00008408040080134e22eac57321ab47db6b38b2992cec2dd79bd065a034" - "a9af6b9e3d03475e4309e6523ccdf055453fb480804a3a7e996229eb28e734f6702b" - "ea2b32149899ac043a4b44468197868da77147ce9f73c0543c4e3fc33e306cac8506" - "faa80a959c5f1edccbee76eda1ad7a4fa440de35dcb87e82ec94e8725355ce750771" - "3a609e140000207304bb73321f01b71dd94622fae98daf634490d220e4c8f3ffa255" - "9911a56e5116", - "40ae92071a3a548b26af31e116dfc0ba4549210b17e70da16cfbda9ccdad844d9426" - "4a9ae65b786b3eaf0de20aa89c6babb448b6f32d07f233584296eefe19316bd97965" - "9472ee8567cb01d70b0366cddb3c60eb9e1d789a3691dc254c14de73f4f201005045" - "44ce184d44547e124b1f18303b4859f8f2e2b04423d23a866b43866374d54af41649" - "d25f4a3ec2cecd5d4e6de1b24953440b46fbb74c1dbec6fbb1f16bc21d4aa0e1e936" - "a49c07127e19719bc652a2f0b7f8df4a150b2b3c9e9e353d6ed101970ddc611abad0" - "632c6793f9379c9d06846c311fcbd6f85edd569b8782c4c5f62294c4611ae60f8323" - "0a53aa95e3bcbed204f19a7a1db83c0fbfec1edd2c17498fa7b5aa2321248a92592d" - "891e4947df6bcef52f4481797d032ad332046a384abece6454b3e356d7249bfa5696" - "793c7f7d3048dc87fa7409a4691887caaf0982c402b902d699f62dc4d5e153f13e85" - "89e4a6206c7f74eb26ddefbb92309fb753decfea972dec7de02eda9c6d26acd7be53" - "a8aa20f1a93f082ae6eb927a6a1b7bd9153551aedfaf94f61dd4cb9355ad7ab09f61" - "5d9f92c21712c732c0e7e117797f38cbdc184e3a65e15a89f46cb3624f5fdb8dbbd2" - "75f2c8492f8d95bdbd8d1dc1b9f21107bd433acbbac247239c073a2f24a4a9f8074f" - "325f277d579b6bff0269ff19aed3809a9ddd21dd29c1363c9dc44812dd41d2111f9c" - "2e8342046c14133b853262676f15e94de18660e04ae5c0c661ea43559af5842e161c" - "83dd29f64508b2ec3e635a2134fc0e1a39d3ecb51dcddfcf8382c88ffe2a737842ad" - "1de7fe505b6c4d1673870f6fc2a0f2f7972acaee368a1599d64ba18798f10333f977" - "9bd5b05f9b084d03dab2f3d80c2eb74ec70c9866ea31c18b491cd597aae3e941205f" - "cc38a3a10ce8c0269f02ccc9c51278e25f1a0f0731a9", - "d2dd45f87ad87801a85ac38187f9023b", - "f0a14f808692cef87a3daf70", + /* + * Server: EncryptedExtensions, Certificate, CertificateVerify and + * Finished + */ + { + "080000240022000a00140012001d00170018001901000101010201030104001c" + "00024001000000000b0001b9000001b50001b0308201ac30820115a003020102" + "020102300d06092a864886f70d01010b0500300e310c300a0603550403130372" + "7361301e170d3136303733303031323335395a170d3236303733303031323335" + "395a300e310c300a0603550403130372736130819f300d06092a864886f70d01" + "0101050003818d0030818902818100b4bb498f8279303d980836399b36c6988c" + "0c68de55e1bdb826d3901a2461eafd2de49a91d015abbc9a95137ace6c1af19e", + "aa6af98c7ced43120998e187a80ee0ccb0524b1b018c3e0b63264d449a6d38e2" + "2a5fda430846748030530ef0461c8ca9d9efbfae8ea6d1d03e2bd193eff0ab9a" + "8002c47428a6d35a8d88d79f7f1e3f0203010001a31a301830090603551d1304" + "023000300b0603551d0f0404030205a0300d06092a864886f70d01010b050003" + "81810085aad2a0e5b9276b908c65f73a7267170618a54c5f8a7b337d2df7a594" + "365417f2eae8f8a58c8f8172f9319cf36b7fd6c55b80f21a03015156726096fd" + "335e5e67f2dbf102702e608ccae6bec1fc63a42a99be5c3eb7107c3c54e9b9eb", + "2bd5203b1c3b84e0a8b2f759409ba3eac9d91d402dcc0cc8f8961229ac9187b4" + "2b4de100000f00008408040080754040d0ddab8cf0e2da2bc4995b868ad745c8" + "e1564e33cde17880a42392cc624aeef6b67bb3f0ae71d9d54a2309731d87dc59" + "f642d733be2eb27484ad8a8c8eb3516a7ac57f2625e2b5c0888a8541f4e734f7" + "3d054761df1dd02f0e3e9a33cfa10b6e3eb4ebf7ac053b01fdabbddfc54133bc" + "d24c8bbdceb223b2aa03452a2914000020ac86acbc9cd25a45b57ad5b64db15d" + "4405cf8c80e314583ebf3283ef9a99310c16" + }, + { + "f10b26d8fcaf67b5b828f712122216a1cd14187465b77637cbcd78539128bb93" + "246dcca1af56f1eaa271666077455bc54965d85f05f9bd36d6996171eb536aff" + "613eeddc42bad5a2d2227c4606f1215f980e7afaf56bd3b85a51be130003101a" + "758d077b1c891d8e7a22947e5a229851fd42a9dd422608f868272abf92b3d43f" + "b46ac420259346067f66322fd708885680f4b4433c29116f2dfa529e09bba53c" + "7cd920121724809eaddcc84307ef46fc51a0b33d99d39db337fcd761ce0f2b02" + "dc73dedb6fddb77c4f8099bde93d5bee08bcf2131f29a2a37ff07949e8f8bcdd", + "3e8310b8bf8b3444c85aaf0d2aeb2d4f36fd14d5cb51fcebff418b3827136ab9" + "529e9a3d3f35e4c0ae749ea2dbc94982a1281d3e6daab719aa4460889321a008" + "bf10fa06ac0c61cc122cc90d5e22c0030c986ae84a33a0c47df174bcfbd50bf7" + "8ffdf24051ab423db63d5815db2f830040f30521131c98c66f16c362addce2fb" + "a0602cf0a7dddf22e8def7516cdfee95b4056cc9ad38c95352335421b5b1ffba" + "df75e5212fdad7a75f52a2801486a1eec3539580bee0e4b337cda6085ac9eccd" + "1a0f1a46cebfbb5cdfa3251ac28c3bc826148c6d8c1eb6a06f77f6ff632c6a83", + "e283e8f9df7c6dbabf1c6ea40629a85b43ab0c73d34f9d5072832a104eda3f75" + "f5d83da6e14822a18e14099d749eafd823ca2ac7542086501eca206ce7887920" + "008573757ce2f230a890782b99cc682377beee812756d04f9025135fb599d746" + "fefe7316c922ac265ca0d29021375adb63c1509c3e242dfb92b8dee891f7368c" + "4058399b8db9075f2dcc8216194e503b6652d87d2cb41f99adfdcc5be5ec7e1e" + "6326ac22d70bd3ba652827532d669aff005173597f8039c3ea4922d3ec757670" + "222f6ac29b93e90d7ad3f6dd96328e429cfcfd5cca22707fe2d86ad1dcb0be75" + "6e8e" + }, + "c66cb1aec519df44c91e10995511ac8b", + "f7f6884c4981716c2d0d29a4", "0000000000000000" }, { - "1400002078367856d3c8cc4e0a95eb98906ca7a48bd3cc7029f48bd4ae0dc91ab903" - "ca8916", - "fa15e92daa21cd05d8f9c3152a61748d9aaf049da559718e583f95aacecad657b52a" - "6562da09a5819e864d86ac2989360a1eb22795", - "40e1201d75d419627f04c88530a15c9d", - "a0f073f3b35e18f96969696b", + /* Client: Finished */ + { + "14000020b9027a0204b972b52cdefa58950fa1580d68c9cb124dbe691a7178f2" + "5c554b2316", "", "" + }, + { + "9539b4ae2f87fd8e616b295628ea953d9e3858db274970d19813ec136cae7d96" + "e0417775fcabd3d8858fdc60240912d218f5afb21c", "", "" + }, + "2679a43e1d76784034ea1797d5ad2649", + "5482405290dd0d2f81c0d942", "0000000000000000" }, { - "040000a60002a3004abe594b00924e535321cadc96238da09caf9b02fecafdd65e3e" - "418f03e43772cf512ed8066100503b1c08abbbf298a9d138ce821dd12fe1710e2137" - "cd12e6a85cd3fd7f73706e7f5dddefb87c1ef83824638464099c9d1363e3c64ed207" - "5c16b8ccd8e524a6bbd7a6a6e34ea1579782b15bbe7dfed5c0c0d980fb330f9d8ab2" - "52ffe7be1277d418b6828ead4dae3b30d448442417ef76af0008002e000400020000" - "16", - "45a6626fa13b66ce2c5b3ef807e299a118296f26a2dd9ec7487a0673e2460d4c79f4" - "0087dcd014c59c51379c90d26b4e4f9bb2b78f5b6761594f013ff3e4c78d83690522" - "9eac811c4ef8b2faa89867e9ffc586f7f03c216591aa5e620eac3c62dfe60f846036" - "bd7ecc4464b584af184e9644e94ee1d7834dba408a51cbe4248004796ed9c558e0f5" - "f96115a6f6ba487e17d16a2e20a3d3a650a9a070fb53d9da82864b5621d77650bd0c" - "7947e9889917b53d0515627c72b0ded521", - "3381f6b3f94500f16226de440193e858", - "4f1d73cc1d465eb30021c41f", + /* Server: NewSessionTicket */ + { + "040000c90000001e2fd3992f02000000b2ff099f9676cdff8b0bf8825d000000" + "007905a9d28efeef4a47c6f9b06a0cecdb0070d920b898997c75b79636943ed4" + "2046a96142bd084a04acfa0c490f452d756dea02c0f927259f1f3231ac0d541a" + "769129b740ce38090842b828c27fd729f59737ba98aa7b42e043c5da28f8dca8" + "590b2df410d5134fd6c4cacad8b30370602afa35d265bf4d127976bb36dbda6a" + "626f0270e20eebc73d6fcae2b1a0da122ee9042f76be56ebf41aa469c3d2c9da" + "9197d80008002a00040000040016", "", "" + }, + { + "3680c2b2109d25caa26c3b06eea9fdc5cb31613ba702176596da2e886bf6af93" + "507bd68161ad9cb4780653842e1041ecbf0088a65ac4ef438419dd1d95ddd9bd" + "2ad4484e7e167d0e6c008448ae58a0418713b6fc6c51e4bb23a537fb75a74f73" + "de31fe6aa0bc522515f8b25f8955428b5de5ac06762cec22b0aa78c94385ef8e" + "70fa24945b7c1f268510871689bbbbfaf2e7f4a19277024f95f1143ab12a31ec" + "63adb128cb390711fd6d06a498df3e98615d8eb102e23353b480efcca5e8e026" + "7a6d0fe2441f14c8c9664aefb2cfff6ae9e0442728b6a0940c1e824fda06", + "", "" + + }, + "a688ebb5ac826d6f42d45c0cc44b9b7d", + "c1cad4425a438b5de714830a", "0000000000000000" }, { - "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f2021" - "22232425262728292a2b2c2d2e2f303117", - "e306178ad97f74bb64f35eaf3c39846b83aef8472cbc9046749b81a949dfb12cfbc6" - "5cbabd20ade92c1f944605892ceeb12fdee8a927bce77c83036ac5a794a8f54a69", - "eb23a804904b80ba4fe8399e09b1ce42", - "efa8c50c06b9c9b8c483e174", + /* Client: Application Data */ + { + "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" + "202122232425262728292a2b2c2d2e2f303117", "", "" + }, + { + "8c3497da00ae023e53c01b4324b665404c1b49e78fe2bf4d17f6348ae8340551" + "e363a0cd05f2179c4fef5ad689b5cae0bae94adc63632e571fb79aa91544c639" + "4d28a1", "", "" + + }, + "88b96ad686c84be55ace18a59cce5c87", + "b99dc58cd5ff5ab082fdad19", "0000000000000000" }, + + { - "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20212" - "2232425262728292a2b2c2d2e2f303117", - "467d99a807dbf778e6ffd8be52456c70665f890811ef2f3c495d5bbe983feedab0c25" - "1dde596bc7e2b135909ec9f9166fb0152e8c16a84e4b1039256467f9538be4463", - "3381f6b3f94500f16226de440193e858", - "4f1d73cc1d465eb30021c41f", + /* Server: Application Data */ + { + "000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" + "202122232425262728292a2b2c2d2e2f303117", "", "" + }, + { + "f65f49fd2df6cd2347c3d30166e3cfddb6308a5906c076112c6a37ff1dbd406b" + "5813c0abd734883017a6b2833186b13c14da5d75f33d8760789994e27d82043a" + "b88d65", "", "" + }, + "a688ebb5ac826d6f42d45c0cc44b9b7d", + "c1cad4425a438b5de714830a", "0000000000000001" }, { - "010015", - "6bdf60847ba6fb650da36e872adc684a4af2e8", - "eb23a804904b80ba4fe8399e09b1ce42", - "efa8c50c06b9c9b8c483e174", + /* Client: CloseNotify */ + { + "010015", "", "" + }, + { + "2c2148163d7938a35f6acf2a6606f8cbd1d9f2", "", "" + }, + "88b96ad686c84be55ace18a59cce5c87", + "b99dc58cd5ff5ab082fdad19", "0000000000000001" }, { - "010015", - "621b7cc1962cd8a70109fee68a52efedf87d2e", - "3381f6b3f94500f16226de440193e858", - "4f1d73cc1d465eb30021c41f", + /* Server: CloseNotify */ + { + "010015", "", "" + }, + { + "f8141ebdb5eda511e0bce639a56ff9ea825a21", "", "" + + }, + "a688ebb5ac826d6f42d45c0cc44b9b7d", + "c1cad4425a438b5de714830a", "0000000000000002" } }; -static int load_record(SSL3_RECORD *rec, size_t recnum, unsigned char **key, +/* + * Same thing as OPENSSL_hexstr2buf() but enables us to pass the string in + * 3 chunks + */ +static unsigned char *multihexstr2buf(const char *str[3], size_t *len) +{ + size_t outer, inner, curr = 0; + unsigned char *outbuf; + size_t totlen = 0; + + /* Check lengths of all input strings are even */ + for (outer = 0; outer < 3; outer++) { + totlen += strlen(str[outer]); + if ((totlen & 1) != 0) + return NULL; + } + + totlen /= 2; + outbuf = OPENSSL_malloc(totlen); + if (outbuf == NULL) + return NULL; + + for (outer = 0; outer < 3; outer++) { + for (inner = 0; str[outer][inner] != 0; inner += 2) { + int hi, lo; + + hi = OPENSSL_hexchar2int(str[outer][inner]); + lo = OPENSSL_hexchar2int(str[outer][inner + 1]); + + if (hi < 0 || lo < 0) { + OPENSSL_free(outbuf); + return NULL; + } + outbuf[curr++] = (hi << 4) | lo; + } + } + + *len = totlen; + return outbuf; +} + +static int load_record(SSL3_RECORD *rec, RECORD_DATA *recd, unsigned char **key, unsigned char *iv, size_t ivlen, unsigned char *seq) { - unsigned char *pt = NULL, *sq = NULL, *ivtmp = NULL;; - long ptlen; + unsigned char *pt = NULL, *sq = NULL, *ivtmp = NULL; + size_t ptlen; - *key = OPENSSL_hexstr2buf(refdata[recnum].key, NULL); - ivtmp = OPENSSL_hexstr2buf(refdata[recnum].iv, NULL); - sq = OPENSSL_hexstr2buf(refdata[recnum].seq, NULL); - pt = OPENSSL_hexstr2buf(refdata[recnum].plaintext, &ptlen); + *key = OPENSSL_hexstr2buf(recd->key, NULL); + ivtmp = OPENSSL_hexstr2buf(recd->iv, NULL); + sq = OPENSSL_hexstr2buf(recd->seq, NULL); + pt = multihexstr2buf(recd->plaintext, &ptlen); if (*key == NULL || ivtmp == NULL || sq == NULL || pt == NULL) goto err; @@ -157,40 +266,31 @@ static int load_record(SSL3_RECORD *rec, size_t recnum, unsigned char **key, return 1; err: OPENSSL_free(*key); + *key = NULL; OPENSSL_free(ivtmp); OPENSSL_free(sq); OPENSSL_free(pt); return 0; } -static int test_record(SSL3_RECORD *rec, size_t recnum, int enc) +static int test_record(SSL3_RECORD *rec, RECORD_DATA *recd, int enc) { int ret = 0; unsigned char *refd; - long refdatalenl; size_t refdatalen; if (enc) - refd = OPENSSL_hexstr2buf(refdata[recnum].ciphertext, &refdatalenl); + refd = multihexstr2buf(recd->ciphertext, &refdatalen); else - refd = OPENSSL_hexstr2buf(refdata[recnum].plaintext, &refdatalenl); + refd = multihexstr2buf(recd->plaintext, &refdatalen); - if (refd == NULL) { - fprintf(stderr, "Failed to get reference data for record %"OSSLzu - "\n", recnum); + if (!TEST_ptr(refd)) { + TEST_info("Failed to get reference data"); goto err; } - refdatalen = (size_t)refdatalenl; - if (rec->length != refdatalen) { - fprintf(stderr, "Unexpected length for record %"OSSLzu"\n", recnum); + if (!TEST_mem_eq(rec->data, rec->length, refd, refdatalen)) goto err; - } - - if (memcmp(rec->data, refd, refdatalen) != 0) { - fprintf(stderr, "Data does not match for record %"OSSLzu"\n", recnum); - goto err; - } ret = 1; @@ -198,6 +298,9 @@ static int test_record(SSL3_RECORD *rec, size_t recnum, int enc) OPENSSL_free(refd); return ret; } + +#define TLS13_AES_128_GCM_SHA256_BYTES ((const unsigned char *)"\x13\x01") + static int test_tls13_encryption(void) { SSL_CTX *ctx = NULL; @@ -208,69 +311,79 @@ 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; } for (ctr = 0; ctr < OSSL_NELEM(refdata); ctr++) { - /* - * Load the record, set up the read/write sequences and load the key into - * the EVP_CIPHER_CTXs - */ + /* Load the record */ ivlen = EVP_CIPHER_iv_length(ciph); - if (!load_record(&rec, ctr, &key, s->read_iv, ivlen, + 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; - } + } + /* Set up the read/write sequences */ memcpy(RECORD_LAYER_get_write_sequence(&s->rlayer), RECORD_LAYER_get_read_sequence(&s->rlayer), SEQ_NUM_SIZE); memcpy(s->write_iv, s->read_iv, ivlen); + /* Load the key into the EVP_CIPHER_CTXs */ 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\n"); + 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, ctr, 1)) { - fprintf(stderr, "Record encryption test failed\n"); + 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\n"); + 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, ctr, 0)) { - fprintf(stderr, "Record decryption test failed\n"); + if (!TEST_true(test_record(&rec, &refdata[ctr], 0))) { + TEST_info("Record %zu decryption test failed", ctr); goto err; } @@ -284,8 +397,9 @@ 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: OPENSSL_free(rec.data); OPENSSL_free(key); @@ -293,11 +407,11 @@ static int test_tls13_encryption(void) OPENSSL_free(seq); SSL_free(s); SSL_CTX_free(ctx); - return ret; } -void register_tests(void) +int setup_tests(void) { ADD_TEST(test_tls13_encryption); + return 1; }