Remove the DTLS1_BAD_VER thing from 0.9.9-dev. It is present in 0.9.8

but has been omitted from HEAD (0.9.9), see commit
  http://cvs.openssl.org/chngview?cn=16627
by appro.

diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index 1438b2513117b5de93a0abaa8573e12a411a6fcd..6548a98f035168421f5acd987c9bc26fd323ccb1 100644 (file)
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -68,7 +68,6 @@ extern "C" {
 #endif
 
 #define DTLS1_VERSION                  0xFEFF
 #endif
 
 #define DTLS1_VERSION                  0xFEFF

-#define DTLS1_BAD_VER                  0x0100

 
 #if 0
 /* this alert description is not specified anywhere... */
 
 #if 0
 /* this alert description is not specified anywhere... */

diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 1d6760e5154870a9acdb6f0bcfbbbd4523287442..561ba5cf255a9aa611254bac5599c0608293c11f 100644 (file)
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -829,8 +829,7 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
                        return(s->s3->wpend_ret);
                        }
                else if (i <= 0) {
                        return(s->s3->wpend_ret);
                        }
                else if (i <= 0) {

-                       if (s->version == DTLS1_VERSION ||
-                           s->version == DTLS1_BAD_VER) {
+                       if (s->version == DTLS1_VERSION) {

                                /* For DTLS, just drop it. That's kind of the wh
 ole
                                   point in using a datagram service */
                                /* For DTLS, just drop it. That's kind of the wh
 ole
                                   point in using a datagram service */