summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_lib.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-06-21 12:17:30 +0100
committerMatt Caswell <matt@openssl.org>2017-06-21 14:45:36 +0100
commit72257204bd2a88773461150765dfd0e0a428ee86 (patch)
tree0f62189accc00c2b1e58de678a7e56c1a8748325 /ssl/ssl_lib.c
parentadfc37868e2dc406b80ab3111163eb475ef06975 (diff)
PSK related tweaks based on review feedback
Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/3670)
Diffstat (limited to 'ssl/ssl_lib.c')
-rw-r--r--ssl/ssl_lib.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index f9c7b4451b..d8dd45eb5b 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -3733,7 +3733,6 @@ int SSL_SESSION_set1_master_key(SSL_SESSION *sess, const unsigned char *in,
memcpy(sess->master_key, in, len);
sess->master_key_length = len;
-
return 1;
}