5.5 merge

extra/yassl/src/buffer.cpp

@@ -165,7 +165,7 @@ void input_buffer::set_error()
 
 void input_buffer::set_current(uint i) 
 {
-    if (error_ == 0 && i && check(i - 1, size_) == 0)
+    if (error_ == 0 && (i == 0 || check(i - 1, size_) == 0))
         current_ = i;
     else
         error_ = -1;

mysql-test/suite.pm

@@ -52,7 +52,7 @@ sub skip_combinations {
   }
   $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
 
-  $skip{'t/openssl-poodle_6975.test'} = 'no or too old openssl'
+  $skip{'t/openssl_6975.test'} = 'no or too old openssl'
     unless ! IS_WINDOWS and ! system "openssl ciphers TLSv1.2 2>&1 >/dev/null";
 
   %skip;

mysql-test/t/openssl-poodle_6975.combinations → mysql-test/t/openssl_6975.combinations

 [tlsv12]
 loose-ssl-cipher=TLSv1.2
 
-[sslv3]
+[tlsv10]
 loose-ssl-cipher=SSLv3
 

vio/viossl.c

@@ -288,7 +288,7 @@ int vio_ssl_close(Vio *vio)
       break;
     default: /* Shutdown failed */
       DBUG_PRINT("vio_error", ("SSL_shutdown() failed, error: %d",
-                               SSL_get_error(ssl, r)));
+                               (int)SSL_get_error(ssl, r)));
       break;
     }
   }

vio/viosslfactories.c

@@ -203,6 +203,8 @@ new_VioSSLFd(const char *key_file, const char *cert_file,
     DBUG_RETURN(0);
   }
 
+  SSL_CTX_set_options(ssl_fd->ssl_context, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+
   /*
     Set the ciphers that can be used
     NOTE: SSL_CTX_set_cipher_list will return 0 if