summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2017-03-25 13:37:40 +0000
committerjsing <>2017-03-25 13:37:40 +0000
commit7b5cce65fc86edbfad17759b56ff9acc4b537b5e (patch)
tree18fcbb7ca6142c832f73b4f0a69b299043317a0f
parent2625b1c3926492fbcc823928f95ea1591467a7af (diff)
downloadopenbsd-7b5cce65fc86edbfad17759b56ff9acc4b537b5e.tar.gz
openbsd-7b5cce65fc86edbfad17759b56ff9acc4b537b5e.tar.bz2
openbsd-7b5cce65fc86edbfad17759b56ff9acc4b537b5e.zip
Update regress to match changes to tls1_PRF().
-rw-r--r--src/regress/lib/libssl/unit/tls_prf.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/regress/lib/libssl/unit/tls_prf.c b/src/regress/lib/libssl/unit/tls_prf.c
index ab92547ad5..5040ba2ce3 100644
--- a/src/regress/lib/libssl/unit/tls_prf.c
+++ b/src/regress/lib/libssl/unit/tls_prf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls_prf.c,v 1.2 2017/03/18 12:59:07 jsing Exp $ */ 1/* $OpenBSD: tls_prf.c,v 1.3 2017/03/25 13:37:40 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -19,10 +19,10 @@
19 19
20#include "ssl_locl.h" 20#include "ssl_locl.h"
21 21
22int tls1_PRF(SSL *s, const void *seed1, int seed1_len, const void *seed2, 22int tls1_PRF(SSL *s, const unsigned char *secret, size_t secret_len,
23 int seed2_len, const void *seed3, int seed3_len, const void *seed4, 23 const void *seed1, size_t seed1_len, const void *seed2, size_t seed2_len,
24 int seed4_len, const void *seed5, int seed5_len, const unsigned char *sec, 24 const void *seed3, size_t seed3_len, const void *seed4, size_t seed4_len,
25 int slen, unsigned char *out, int olen); 25 const void *seed5, size_t seed5_len, unsigned char *out, size_t out_len);
26 26
27#define TLS_PRF_OUT_LEN 128 27#define TLS_PRF_OUT_LEN 128
28 28
@@ -202,11 +202,11 @@ do_tls_prf_test(int test_no, struct tls_prf_test *tpt)
202 for (len = 1; len <= TLS_PRF_OUT_LEN; len++) { 202 for (len = 1; len <= TLS_PRF_OUT_LEN; len++) {
203 memset(out, 'A', TLS_PRF_OUT_LEN); 203 memset(out, 'A', TLS_PRF_OUT_LEN);
204 204
205 if (tls1_PRF(ssl, TLS_PRF_SEED1, sizeof(TLS_PRF_SEED1), 205 if (tls1_PRF(ssl, TLS_PRF_SECRET, sizeof(TLS_PRF_SECRET),
206 TLS_PRF_SEED2, sizeof(TLS_PRF_SEED2), TLS_PRF_SEED3, 206 TLS_PRF_SEED1, sizeof(TLS_PRF_SEED1), TLS_PRF_SEED2,
207 sizeof(TLS_PRF_SEED3), TLS_PRF_SEED4, sizeof(TLS_PRF_SEED4), 207 sizeof(TLS_PRF_SEED2), TLS_PRF_SEED3, sizeof(TLS_PRF_SEED3),
208 TLS_PRF_SEED5, sizeof(TLS_PRF_SEED5), TLS_PRF_SECRET, 208 TLS_PRF_SEED4, sizeof(TLS_PRF_SEED4), TLS_PRF_SEED5,
209 sizeof(TLS_PRF_SECRET), out, len) != 1) { 209 sizeof(TLS_PRF_SEED5), out, len) != 1) {
210 fprintf(stderr, "FAIL: tls_PRF failed for len %i\n", 210 fprintf(stderr, "FAIL: tls_PRF failed for len %i\n",
211 len); 211 len);
212 goto failure; 212 goto failure;