mirror of
https://github.com/openssl/openssl.git
synced 2024-11-24 10:34:12 +08:00
There's no such things as DTLS1_AD_MISSING_HANDSHAKE_MESSAGE.
For now, anyway.
This commit is contained in:
parent
d32f888db1
commit
01c76c6606
@ -1551,6 +1551,7 @@ int dtls1_dispatch_alert(SSL *s)
|
||||
*ptr++ = s->s3->send_alert[0];
|
||||
*ptr++ = s->s3->send_alert[1];
|
||||
|
||||
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
|
||||
if (s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE)
|
||||
{
|
||||
s2n(s->d1->handshake_read_seq, ptr);
|
||||
@ -1566,6 +1567,7 @@ int dtls1_dispatch_alert(SSL *s)
|
||||
#endif
|
||||
l2n3(s->d1->r_msg_hdr.frag_off, ptr);
|
||||
}
|
||||
#endif
|
||||
|
||||
i = do_dtls1_write(s, SSL3_RT_ALERT, &buf[0], sizeof(buf), 0);
|
||||
if (i <= 0)
|
||||
@ -1575,8 +1577,11 @@ int dtls1_dispatch_alert(SSL *s)
|
||||
}
|
||||
else
|
||||
{
|
||||
if ( s->s3->send_alert[0] == SSL3_AL_FATAL ||
|
||||
s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE)
|
||||
if (s->s3->send_alert[0] == SSL3_AL_FATAL
|
||||
#ifdef DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
|
||||
|| s->s3->send_alert[1] == DTLS1_AD_MISSING_HANDSHAKE_MESSAGE
|
||||
#endif
|
||||
)
|
||||
(void)BIO_flush(s->wbio);
|
||||
|
||||
if (s->msg_callback)
|
||||
|
@ -71,7 +71,9 @@ extern "C" {
|
||||
#define DTLS1_VERSION_MAJOR 0x01
|
||||
#define DTLS1_VERSION_MINOR 0x00
|
||||
|
||||
#if 0
|
||||
#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
|
||||
#endif
|
||||
|
||||
/* lengths of messages */
|
||||
#define DTLS1_COOKIE_LENGTH 32
|
||||
|
@ -828,8 +828,10 @@ int tls1_alert_code(int code)
|
||||
case SSL_AD_UNRECOGNIZED_NAME: return(TLS1_AD_UNRECOGNIZED_NAME);
|
||||
case SSL_AD_BAD_CERTIFICATE_STATUS_RESPONSE: return(TLS1_AD_BAD_CERTIFICATE_STATUS_RESPONSE);
|
||||
case SSL_AD_BAD_CERTIFICATE_HASH_VALUE: return(TLS1_AD_BAD_CERTIFICATE_HASH_VALUE);
|
||||
#if 0 /* not appropriate for TLS, not used for DTLS */
|
||||
case DTLS1_AD_MISSING_HANDSHAKE_MESSAGE: return
|
||||
(DTLS1_AD_MISSING_HANDSHAKE_MESSAGE);
|
||||
#endif
|
||||
default: return(-1);
|
||||
}
|
||||
}
|
||||
|
@ -360,6 +360,3 @@ SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_SERVERNAME_DONE,t, NULL)
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user