diff options
Diffstat (limited to 'test/tls13secretstest.c')
-rw-r--r-- | test/tls13secretstest.c | 136 |
1 files changed, 68 insertions, 68 deletions
diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c index 47e7766..46ccd19 100644 --- a/test/tls13secretstest.c +++ b/test/tls13secretstest.c @@ -213,40 +213,34 @@ static int test_secret(SSL *s, unsigned char *prk, const EVP_MD *md = ssl_handshake_md(s); if (!ssl_handshake_hash(s, hash, sizeof(hash), &hashsize)) { - fprintf(stderr, "Failed to get hash\n"); + TEST_error("Failed to get hash"); return 0; } if (!tls13_hkdf_expand(s, md, prk, label, labellen, hash, gensecret, hashsize)) { - fprintf(stderr, "Secret generation failed\n"); + TEST_error("Secret generation failed"); return 0; } - if (memcmp(gensecret, ref_secret, hashsize) != 0) { - fprintf(stderr, "Generated secret does not match\n"); + if (!TEST_mem_eq(gensecret, hashsize, ref_secret, hashsize)) return 0; - } if (!tls13_derive_key(s, md, gensecret, key, KEYLEN)) { - fprintf(stderr, "Key generation failed\n"); + TEST_error("Key generation failed"); return 0; } - if (memcmp(key, ref_key, KEYLEN) != 0) { - fprintf(stderr, "Generated key does not match\n"); + if (!TEST_mem_eq(key, KEYLEN, ref_key, KEYLEN)) return 0; - } if (!tls13_derive_iv(s, md, gensecret, iv, IVLEN)) { - fprintf(stderr, "IV generation failed\n"); + TEST_error("IV generation failed"); return 0; } - if (memcmp(iv, ref_iv, IVLEN) != 0) { - fprintf(stderr, "Generated IV does not match\n"); + if (!TEST_mem_eq(iv, IVLEN, ref_iv, IVLEN)) return 0; - } return 1; } @@ -261,64 +255,67 @@ static int test_handshake_secrets(void) size_t master_secret_length; ctx = SSL_CTX_new(TLS_method()); - if (ctx == NULL) + if (!TEST_ptr(ctx)) goto err; s = SSL_new(ctx); - if (s == NULL) + if (!TEST_ptr(s )) goto err; s->session = SSL_SESSION_new(); - if (s->session == NULL) + if (!TEST_ptr(s->session)) goto err; - if (!tls13_generate_secret(s, ssl_handshake_md(s), NULL, NULL, 0, - (unsigned char *)&s->early_secret)) { - fprintf(stderr, "Early secret generation failed\n"); + if (!TEST_true(tls13_generate_secret(s, ssl_handshake_md(s), NULL, NULL, 0, + (unsigned char *)&s->early_secret))) { + TEST_info("Early secret generation failed"); goto err; } - if (memcmp(s->early_secret, early_secret, sizeof(early_secret)) != 0) { - fprintf(stderr, "Early secret does not match\n"); + if (!TEST_mem_eq(s->early_secret, sizeof(early_secret), + early_secret, sizeof(early_secret))) { + TEST_info("Early secret does not match"); goto err; } - if (!tls13_generate_handshake_secret(s, ecdhe_secret, - sizeof(ecdhe_secret))) { - fprintf(stderr, "Hanshake secret generation failed\n"); + if (!TEST_true(tls13_generate_handshake_secret(s, ecdhe_secret, + sizeof(ecdhe_secret)))) { + TEST_info("Hanshake secret generation failed"); goto err; } - if (memcmp(s->handshake_secret, handshake_secret, - sizeof(handshake_secret)) != 0) { - fprintf(stderr, "Handshake secret does not match\n"); + if (!TEST_mem_eq(s->handshake_secret, sizeof(handshake_secret), + handshake_secret, sizeof(handshake_secret))) goto err; - } hashsize = EVP_MD_size(ssl_handshake_md(s)); - if (sizeof(client_hts) != hashsize || sizeof(client_hts_key) != KEYLEN - || sizeof(client_hts_iv) != IVLEN) { - fprintf(stderr, "Internal test error\n"); + if (!TEST_size_t_eq(sizeof(client_hts), hashsize)) + goto err; + if (!TEST_size_t_eq(sizeof(client_hts_key), KEYLEN)) + goto err; + if (!TEST_size_t_eq(sizeof(client_hts_iv), IVLEN)) goto err; - } - if (!test_secret(s, s->handshake_secret, (unsigned char *)client_hts_label, - strlen(client_hts_label), client_hts, client_hts_key, - client_hts_iv)) { - fprintf(stderr, "Client handshake secret test failed\n"); + if (!TEST_true(test_secret(s, s->handshake_secret, + (unsigned char *)client_hts_label, + strlen(client_hts_label), client_hts, + client_hts_key, client_hts_iv))) { + TEST_info("Client handshake secret test failed"); goto err; } - if (sizeof(server_hts) != hashsize || sizeof(server_hts_key) != KEYLEN - || sizeof(server_hts_iv) != IVLEN) { - fprintf(stderr, "Internal test error\n"); + if (!TEST_size_t_eq(sizeof(server_hts), hashsize)) + goto err; + if (!TEST_size_t_eq(sizeof(server_hts_key), KEYLEN)) + goto err; + if (!TEST_size_t_eq(sizeof(server_hts_iv), IVLEN)) goto err; - } - if (!test_secret(s, s->handshake_secret, (unsigned char *)server_hts_label, - strlen(server_hts_label), server_hts, server_hts_key, - server_hts_iv)) { - fprintf(stderr, "Server handshake secret test failed\n"); + if (!TEST_true(test_secret(s, s->handshake_secret, + (unsigned char *)server_hts_label, + strlen(server_hts_label), server_hts, + server_hts_key, server_hts_iv))) { + TEST_info("Server handshake secret test failed"); goto err; } @@ -328,43 +325,46 @@ static int test_handshake_secrets(void) */ full_hash = 1; - if (!tls13_generate_master_secret(s, out_master_secret, - s->handshake_secret, hashsize, - &master_secret_length)) { - fprintf(stderr, "Master secret generation failed\n"); + if (!TEST_true(tls13_generate_master_secret(s, out_master_secret, + s->handshake_secret, hashsize, + &master_secret_length))) { + TEST_info("Master secret generation failed"); goto err; } - if (master_secret_length != sizeof(master_secret) || - memcmp(out_master_secret, master_secret, - sizeof(master_secret)) != 0) { - fprintf(stderr, "Master secret does not match\n"); + if (!TEST_mem_eq(out_master_secret, master_secret_length, + master_secret, sizeof(master_secret))) { + TEST_info("Master secret does not match"); goto err; } - if (sizeof(client_ats) != hashsize || sizeof(client_ats_key) != KEYLEN - || sizeof(client_ats_iv) != IVLEN) { - fprintf(stderr, "Internal test error\n"); + if (!TEST_size_t_eq(sizeof(client_ats), hashsize)) + goto err; + if (!TEST_size_t_eq(sizeof(client_ats_key), KEYLEN)) + goto err; + if (!TEST_size_t_eq(sizeof(client_ats_iv), IVLEN)) goto err; - } - if (!test_secret(s, out_master_secret, (unsigned char *)client_ats_label, - strlen(client_ats_label), client_ats, client_ats_key, - client_ats_iv)) { - fprintf(stderr, "Client application data secret test failed\n"); + if (!TEST_true(test_secret(s, out_master_secret, + (unsigned char *)client_ats_label, + strlen(client_ats_label), client_ats, + client_ats_key, client_ats_iv))) { + TEST_info("Client application data secret test failed"); goto err; } - if (sizeof(server_ats) != hashsize || sizeof(server_ats_key) != KEYLEN - || sizeof(server_ats_iv) != IVLEN) { - fprintf(stderr, "Internal test error\n"); + if (!TEST_size_t_eq(sizeof(server_ats), hashsize)) + goto err; + if (!TEST_size_t_eq(sizeof(server_ats_key), KEYLEN)) + goto err; + if (!TEST_size_t_eq(sizeof(server_ats_iv), IVLEN)) goto err; - } - if (!test_secret(s, out_master_secret, (unsigned char *)server_ats_label, - strlen(server_ats_label), server_ats, server_ats_key, - server_ats_iv)) { - fprintf(stderr, "Server application data secret test failed\n"); + if (!TEST_true(test_secret(s, out_master_secret, + (unsigned char *)server_ats_label, + strlen(server_ats_label), server_ats, + server_ats_key, server_ats_iv))) { + TEST_info("Server application data secret test failed"); goto err; } |