projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't wait for dry at the end of a handshake
[openssl.git]
/
ssl
/
statem
/
extensions_srvr.c
diff --git
a/ssl/statem/extensions_srvr.c
b/ssl/statem/extensions_srvr.c
index ee4cad124c082d1324e12b06f75aec45aabfb1cb..90142eb5051977cbc328b36f2d10b31d658551d6 100644
(file)
--- 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 */