Initial experimental TLSv1.1 support

[openssl.git] / ssl / ssl_lib.c

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index b611c7cf0176c99f3ceaf71d6fb89492e17ecedb..04b6bfcb1c0606fa7e42a29327e65e4122789eb6 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -1357,21 +1357,6 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p,
                j = put_cb ? put_cb(c,p) : ssl_put_cipher_by_char(s,c,p);
                p+=j;
                }
-
-#ifdef OPENSSL_RI_MAGIC
-       if (p == q)
-               return 0;
-       else
-               {
-               /* Bogus "cipher" to send out RI indicator */
-               static SSL_CIPHER ri =
-                       {
-                       0, NULL, OPENSSL_RI_MAGIC, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-                       };
-               j = put_cb ? put_cb(&ri,p) : ssl_put_cipher_by_char(s,&ri,p);
-               p+=j;
-               }
-#endif
        return(p-q);
        }
 
@@ -2395,8 +2380,10 @@ SSL_METHOD *ssl_bad_method(int ver)
 
 const char *SSL_get_version(const SSL *s)
        {
-       if (s->version == TLS1_VERSION)
-               return("TLSv1");
+       if (s->version == TLS1_1_VERSION)
+               return("TLSv1.1");
+       else if (s->version == SSL3_VERSION)
+               return("SSLv3");
        else if (s->version == SSL3_VERSION)
                return("SSLv3");
        else if (s->version == SSL2_VERSION)