commit d49e23ec589e32e70f485fac379417097a831897
author Matt Caswell <matt@openssl.org> Tue Feb 21 16:39:43 2017 +0000
committer Matt Caswell <matt@openssl.org> Thu Mar 02 17:44:15 2017 +0000
tree 41f4b6c14723a9df0a8b2cdc0940806b9f2dea3c
parent 923ac8271b35eda36eb8fd9d8909671aee3ca022

Implement the early data changes required in tls13_change_cipher_state()

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)

test/tls13secretstest.c

diff --git a/test/tls13secretstest.c b/test/tls13secretstest.c
index 7f177bf..55424b1 100644
--- a/test/tls13secretstest.c
+++ b/test/tls13secretstest.c
@@ -192,6 +192,11 @@
     return 1;
 }
 
+const EVP_MD *ssl_md(int idx)
+{
+    return EVP_sha256();
+}
+
 /* End of mocked out code */
 
 static int test_secret(SSL *s, unsigned char *prk,
@@ -222,7 +227,7 @@
         return 0;
     }
 
-    if (!tls13_derive_key(s, gensecret, key, KEYLEN)) {
+    if (!tls13_derive_key(s, md, gensecret, key, KEYLEN)) {
         fprintf(stderr, "Key generation failed\n");
         return 0;
     }
@@ -232,7 +237,7 @@
         return 0;
     }
 
-    if (!tls13_derive_iv(s, gensecret, iv, IVLEN)) {
+    if (!tls13_derive_iv(s, md, gensecret, iv, IVLEN)) {
         fprintf(stderr, "IV generation failed\n");
         return 0;
     }