diff options
| author | Matt Caswell <matt@openssl.org> | 2018-03-19 12:58:05 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2018-03-19 14:47:12 +0000 |
| commit | c2b290c3d0ff878c33b3540df530f64af23163bf (patch) | |
| tree | c9632bd9750f843ad40ee52587373b358ee203ff /ssl/statem/extensions_srvr.c | |
| parent | 69e2b8d67d980b4dea8c5f2cb17cd86455989bb7 (diff) | |
Fix no-psk
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5667)
Diffstat (limited to 'ssl/statem/extensions_srvr.c')
| -rw-r--r-- | ssl/statem/extensions_srvr.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index ee4cad124c..90142eb505 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -1047,6 +1047,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, return 0; } +#ifndef OPENSSL_NO_PSK if(sess == NULL && s->psk_server_callback != NULL && idlen <= PSK_MAX_IDENTITY_LEN) { @@ -1097,6 +1098,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, OPENSSL_cleanse(pskdata, pskdatalen); } } +#endif /* OPENSSL_NO_PSK */ if (sess != NULL) { /* We found a PSK */ |