diff options
| author | Bodo Möller <bodo@openssl.org> | 2006-01-07 20:44:29 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2006-01-07 20:44:29 +0000 |
| commit | 01c76c6606c51013222626875218e0f1ed5bcc7e (patch) | |
| tree | 0c67554b8ebce852d328ba1131237e6e139354fb | |
| parent | d32f888db1ead22f0beaa1b457c77fffcbbd22d1 (diff) | |
| download | openssl-01c76c6606c51013222626875218e0f1ed5bcc7e.tar.gz | |
There's no such things as DTLS1_AD_MISSING_HANDSHAKE_MESSAGE.
For now, anyway.
| -rw-r--r-- | ssl/d1_pkt.c | 9 | ||||
| -rw-r--r-- | ssl/dtls1.h | 2 | ||||
| -rw-r--r-- | ssl/t1_enc.c | 2 | ||||
| -rw-r--r-- | ssl/tls1.h | 3 |
4 files changed, 11 insertions, 5 deletions
diff --git a/ssl/d1_pkt.c b/ssl/d1_pkt.c index 4e302943c1..c4f38e3cb7 100644 --- a/ssl/d1_pkt.c +++ b/ssl/d1_pkt.c @@ -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) diff --git a/ssl/dtls1.h b/ssl/dtls1.h index 284e531bd3..c5b1b9cab5 100644 --- a/ssl/dtls1.h +++ b/ssl/dtls1.h @@ -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 diff --git a/ssl/t1_enc.c b/ssl/t1_enc.c index fb1ea50153..6b4884ab1f 100644 --- a/ssl/t1_enc.c +++ b/ssl/t1_enc.c @@ -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); } } diff --git a/ssl/tls1.h b/ssl/tls1.h index 532852d3e8..26a7ae52d6 100644 --- a/ssl/tls1.h +++ b/ssl/tls1.h @@ -360,6 +360,3 @@ SSL_ctrl(s,SSL_CTRL_SET_TLSEXT_SERVERNAME_DONE,t, NULL) } #endif #endif - - - |