diff options
| author | Matt Caswell <matt@openssl.org> | 2017-11-23 11:41:40 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-12-04 13:31:48 +0000 |
| commit | 635c8f771574fbf48281b2372a2f7aba0c673544 (patch) | |
| tree | 4e996ad6f5822d258e8091b8bd034a59cdcf3633 /ssl/statem/extensions_srvr.c | |
| parent | d273b60b41d88cad8d2fcf66e3e85057bbb67706 (diff) | |
Fix up a few places in the state machine that got missed with SSLfatal()
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4778)
Diffstat (limited to 'ssl/statem/extensions_srvr.c')
| -rw-r--r-- | ssl/statem/extensions_srvr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c index 7adb555e44..ca1cef59a8 100644 --- a/ssl/statem/extensions_srvr.c +++ b/ssl/statem/extensions_srvr.c @@ -858,8 +858,7 @@ int tls_parse_ctos_psk(SSL *s, PACKET *pkt, unsigned int context, X509 *x, (const unsigned char *)s->init_buf->data, binderoffset, PACKET_data(&binder), NULL, sess, 0, ext) != 1) { - SSLfatal(s, SSL_AD_DECODE_ERROR, SSL_F_TLS_PARSE_CTOS_PSK, - SSL_R_BAD_EXTENSION); + /* SSLfatal() already called */ goto err; } |