aboutsummaryrefslogtreecommitdiff
path: root/ssl/s3_lib.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2015-09-11 17:08:11 +0100
committerDr. Stephen Henson <steve@openssl.org>2015-10-11 13:38:01 +0100
commit9076bd25bfad9c661cad928331295bd5ec9b5af3 (patch)
tree2ebe76122bd1d2da2916ce8eae75915f1317ed43 /ssl/s3_lib.c
parentc69ce9351336f5b4a8b33890756b3fd185528210 (diff)
downloadopenssl-9076bd25bfad9c661cad928331295bd5ec9b5af3.zip
openssl-9076bd25bfad9c661cad928331295bd5ec9b5af3.tar.gz
openssl-9076bd25bfad9c661cad928331295bd5ec9b5af3.tar.bz2
Make no-psk compile without warnings.
PR#4035 Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
-rw-r--r--ssl/s3_lib.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 4b11e60..5e7b618 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -5228,8 +5228,9 @@ int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen,
s->method->ssl3_enc->generate_master_secret(s,
s->session->master_key,
pms, pmslen);
-
+#ifndef OPENSSL_NO_PSK
err:
+#endif
if (pms) {
if (free_pms)
OPENSSL_clear_free(pms, pmslen);