Merge lp:~sergei.glushchenko/percona-server/5.6-ps-bug1201033 into lp:percona-server/5.6

[Sergei Glushchenko]

Avoid to invoke EVP_EncryptUpdate with zero source length, because it fails on old versions of OpenSSL.
5.1 and 5.5 are not affected because use internal implementation of AES algorithm not an OpenSSL.
Oracle's builds are not affected because use YASSL/Taocrypt.

[Sergei Glushchenko (sergei.glushchenko)]

http://jenkins.percona.com/view/PS%205.6/job/percona-server-5.6-param/332/

[Laurynas Biveinis (laurynas-biveinis)]

Sergei -

So bug 1201033 is an upstream bug for -DWITH_SSL=system configuration. Please report it there and link to bug 1201033.

review: Approve

=== added file 'Percona-Server/mysql-test/r/percona_bug1201033.result'
--- Percona-Server/mysql-test/r/percona_bug1201033.result	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/r/percona_bug1201033.result	2013-10-01 19:24:53 +0000
@@ -0,0 +1,3 @@
+SELECT HEX(AES_ENCRYPT('','6b2d440b57b3bae74e3cf71e415b3965'));
+HEX(AES_ENCRYPT('','6b2d440b57b3bae74e3cf71e415b3965'))
+0F8E1786085AE3719F8C00BC4A79CAFA
 
=== added file 'Percona-Server/mysql-test/t/percona_bug1201033.test'
--- Percona-Server/mysql-test/t/percona_bug1201033.test	1970-01-01 00:00:00 +0000
+++ Percona-Server/mysql-test/t/percona_bug1201033.test	2013-10-01 19:24:53 +0000
@@ -0,0 +1,5 @@
+#
+# Bug #1201033: Crash when using AES_ENCRYPT on empty string
+#
+
+SELECT HEX(AES_ENCRYPT('','6b2d440b57b3bae74e3cf71e415b3965'));
 
=== modified file 'Percona-Server/mysys_ssl/my_aes.cc'
--- Percona-Server/mysys_ssl/my_aes.cc	2013-03-27 16:23:35 +0000
+++ Percona-Server/mysys_ssl/my_aes.cc	2013-10-01 19:24:53 +0000
@@ -161,9 +161,13 @@
   if (! EVP_EncryptInit_ex(&ctx, EVP_aes_128_ecb(), NULL,
                         (const unsigned char *) rkey, NULL))
     goto aes_error;                             /* Error */
-  if (! EVP_EncryptUpdate(&ctx, (unsigned char *) dest, &u_len,
-                          (unsigned const char *) source, source_length))
-    goto aes_error;                             /* Error */
+  u_len= 0;
+  if (source_length > 0) /* workaround for old OpenSSL versions */
+  {
+    if (! EVP_EncryptUpdate(&ctx, (unsigned char *) dest, &u_len,
+                            (unsigned const char *) source, source_length))
+      goto aes_error;                             /* Error */
+  }
   if (! EVP_EncryptFinal(&ctx, (unsigned char *) dest + u_len, &f_len))
     goto aes_error;                             /* Error */