diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-18 09:38:53 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:20 +0000 |
| commit | 4ff65f77b62df12ad75ec232b38627c5fe131041 (patch) | |
| tree | fee31f3b9d20107f97e153fbadaf9a9ae823a5ff /ssl/statem/statem_locl.h | |
| parent | fc24f0bf45085c0f6272af8bb3ff03602face505 (diff) | |
| download | openssl-4ff65f77b62df12ad75ec232b38627c5fe131041.zip openssl-4ff65f77b62df12ad75ec232b38627c5fe131041.tar.gz openssl-4ff65f77b62df12ad75ec232b38627c5fe131041.tar.bz2 | |
Add support for client side parsing of the PSK extension
Requires a refactor of the ServerHello parsing, so that we parse first and
then subsequently process. This is because the resumption information is
held in the extensions block which is parsed last - but we need to know that
information earlier.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
Diffstat (limited to 'ssl/statem/statem_locl.h')
| -rw-r--r-- | ssl/statem/statem_locl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/statem/statem_locl.h b/ssl/statem/statem_locl.h index 6785805..99f67e5 100644 --- a/ssl/statem/statem_locl.h +++ b/ssl/statem/statem_locl.h @@ -321,3 +321,4 @@ int tls_parse_stoc_etm(SSL *s, PACKET *pkt, X509 *x, size_t chainidx, int *al); int tls_parse_stoc_ems(SSL *s, PACKET *pkt, X509 *x, size_t chainidx, int *al); int tls_parse_stoc_key_share(SSL *s, PACKET *pkt, X509 *x, size_t chainidx, int *al); +int tls_parse_stoc_psk(SSL *s, PACKET *pkt, X509 *x, size_t chainidx, int *al); |