Merge lp:~laurynas-biveinis/percona-server/merge-5.6.17 into lp:percona-server/5.6

[Laurynas Biveinis]

Merge MySQL 5.6.17 and restore compatibility with older system OpenSSL versions.

3rd MP:
- Removed lock_rec_other_trx_holds_expl quadratic behaviour, changed lock_rec_has_expl and lock_rec_other_has_expl_req to accept trx ids instead of trxs, adjusted callers to match, and changed lock_rec_queue_validate and lock_rec_convert_impl_to_explt to use transaction descriptors.

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

2nd MP:

- Rewrote lock_rec_other_trx_holds_expl for transaction descriptors.
- Replace OpenSSL version-based IV hack with making ECB mode always ignore IV.

http://jenkins.percona.com/job/percona-server-5.6-param/588/
A separate -DWITH_SSL=bundled run is no longer required.

1st MP:

http://jenkins.percona.com/job/percona-server-5.6-param/580/
-DWITH_SSL=bundled run: http://jenkins.percona.com/job/percona-server-5.6-param/581/

If the SSL changes are OK, I will create a blueprint to add a new doc page re. system OpenSSL compatibility.

Restore -DWITH_SSL=system support for OpenSSL versions <= 0.9.8k.

MySQL 5.6.17 introduced support for block encryption modes and
initialization vectors for AES_ENCRYPT/AES_DECRYPT functions. This
change broke backwards compatibility for older OpenSSL system
versions, as the ciphers there disagree with recent OpenSSL versions
whether they need initialization vectors or not. As AES functions
directly check with OpenSSL for IV requirement and provide a
corresponding function signature, these differences result in SQL
incompatibilities.

Fixed by
- Not passing IV to OpenSSL if OpenSSL <= 0.9.8k, as 5.6.16- did.
- Exporting OPENSSL_VERSION_NUMBER define as Openssl_version server
  status variable.
- New MTR include file skip_if_old_openssl.inc, included in func_aes,
  func_aes_misc, func_aes_cfb1, func_aes_cfb8, func_aes_cfb128, and
  func_aes_ofb - the testcases that expect IVs in AES SQL functions.

  Merge MySQL 5.6.17, implementing
  https://blueprints.launchpad.net/percona-server/+spec/merge-5.6.17 and
  taking upstream fixes for
  https://bugs.launchpad.net/percona-server/5.6/+bug/1208921
  https://bugs.launchpad.net/percona-server/5.6/+bug/1282104
  https://bugs.launchpad.net/percona-server/5.6/+bug/1282132

  Non-trivial merge bits:
  - in lock_rec_other_trx_holds_expl, replaced trx_rw_is_active call
    with trx_rw_get_active_trx_by_id and moved trx_sys->mutex locking up
    from the if statement to satisfy trx_rw_get_activity_trx_by_id
    locking invariant.

  - Moved Percona-specific error messages to the end of errmsg-utf8.txt,
    re-recorded max_statement_time_func testcase.

  At the same time fixed bug 1299688 /
  http://bugs.mysql.com/bug.php?id=72163 (lp:mysql-server/5.6 rev 5774
  broke rpl_plugin_load) by re-recording the testcase.

  Update man pages from mysql-5.6.17.tar.gz.

[Alexey Kopytov (akopytov)]

Laurynas,

  Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
  could benefit from the trx descriptors optimization by replacing
  pointers to transactions with their IDs. I don’t insist, since it’s a
  debug-only code.

  But the OpenSSL changes are wrong. It looks like the only issue with
  OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
  that those old versions incorrectly report the required IV length with
  AES in ECB mode. IV is not required by the ECB cipher, so
  EVP_CIPHER_iv_length() should return 0, whereas old versions
  return 16.

  Which confuses my_aes_needs_iv(), in particular, and makes the server
  believe AES_*() functions require the 3rd argument with
  block_encryption_mode=aes-128-ecb (i.e. an IV).

  Which is also an upstream issue, i.e. a workaround for old OpenSSL
  libs is required. And the workaround is simple: whenever
  EVP_CIPHER_iv_length() is used to get the required IV length, also
  check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
  value returned by EVP_CIPHER_iv_length() and assume the
  required IV length to be 0.

  The approach implemented in this MP is rather dangerous: we make the
  server pretend that it accepts IV when required, when in fact it is
  ignored for old OpenSSL versions. Security folks may get upset :)

  Speaking of the new Openssl_version variable, its only purpose in this
  MP was to patch up the test suite to hide the fact that IV is ignored
  for old OpenSSL versions. Which means there’s no need for it
  anymore. Besides, it is misleading: it shows the OpenSSL version that
  the server was built against. Which, in case of dynamic linking may
  differ from the OpenSSL library actually being used. Which can make
  quite a difference in the light of recent events.

review: Needs Fixing

[Laurynas Biveinis (laurynas-biveinis)]

> Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
> could benefit from the trx descriptors optimization by replacing
> pointers to transactions with their IDs. I don’t insist, since it’s a
> debug-only code.

Debug-only code was the reason why I did not do this the first time
around, but why not. Does the following look reasonable?

 lock_mutex_enter();
 mutex_enter(&trx_sys->mutex);

 trx_id_t* impl_trx_desc = trx_find_descriptor(trx_sys->descriptors,
            trx_sys->descr_n_used,
            trx_id);
 if (impl_trx_desc) {
  trx_id_t impl_trx_id = *impl_trx_desc;
  ulint heap_no = page_rec_get_heap_no(rec);
  ulint rw_trx_count = trx_sys->descr_n_used;
  trx_id_t* rw_trx_snapshot = static_cast<trx_id_t *>
   (ut_malloc(sizeof(trx_id_t) * rw_trx_count));
  memcpy(rw_trx_snapshot, trx_sys->descriptors,
         sizeof(trx_id_t) * rw_trx_count);

  mutex_exit(&trx_sys->mutex);

  for (ulint i = 0; i < rw_trx_count; i++) {

   mutex_enter(&trx_sys->mutex);
   trx_t* t = trx_rw_get_active_trx_by_id(
    rw_trx_snapshot[i], NULL);
   mutex_exit(&trx_sys->mutex);

   lock_t* expl_lock = lock_rec_has_expl(precise_mode,
             block, heap_no,
             t);
   if (expl_lock && expl_lock->trx->id != impl_trx_id) {
    /* An explicit lock is held by trx other than
    the trx holding the implicit lock. */
    holds = expl_lock->trx;
    break;
   }
  }

  ut_free(rw_trx_snapshot);

 } else {
  mutex_exit(&trx_sys->mutex);
 }

 lock_mutex_exit();

> But the OpenSSL changes are wrong. It looks like the only issue with
> OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
> that those old versions incorrectly report the required IV length with
> AES in ECB mode. IV is not required by the ECB cipher, so
> EVP_CIPHER_iv_length() should return 0, whereas old versions
> return 16.

Yes.

> Which confuses my_aes_needs_iv(), in particular, and makes the server
> believe AES_*() functions require the 3rd argument with
> block_encryption_mode=aes-128-ecb (i.e. an IV).

Yes.

> Which is also an upstream issue, i.e. a workaround for old OpenSSL
> libs is required. And the workaround is simple: whenever
> EVP_CIPHER_iv_length() is used to get the required IV length, also
> check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
> value returned by EVP_CIPHER_iv_length() and assume the
> required IV length to be 0.

OK, that's a better workaround than mine.

> The approach implemented in this MP is rather dangerous: we make the
> server pretend that it accepts IV when required, when in fact it is
> ignored for old OpenSSL versions. Security folks may get upset :)

My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
implementation would be as secure or insecure as, say, current 5.5.

> Speaking of the new Openssl_version variable, its only purpose in this
> MP was to patch up the test suite to hide the fact that IV is ignored
> for old OpenSSL versions. Which means there’s no need for it
> anymore.

Right, removing.

> Besides, it is misleading: it shows the OpenSSL version t...

[Alexey Kopytov (akopytov)]

Hi Laurynas,

On Tue, Apr 22 2014 17:42:58 +0400, Laurynas Biveinis wrote:

>> Changes to lock_rec_other_trx_holds_expl() look okay-ish, though they
>> could benefit from the trx descriptors optimization by replacing
>> pointers to transactions with their IDs. I don’t insist, since it’s a
>> debug-only code.
>
> Debug-only code was the reason why I did not do this the first time
> around, but why not. Does the following look reasonable?
>

Hm, not quite. It still looks up pointers to transactions, and for that
it has iterate rw_trx_list by calling trx_rw_get_active_trx_by_id(). And
it also has to do so for each trx from rw_trx_snapshot, which makes it
even less efficient than the upstream implementation. It looks like
lock_rec_has_expl() does not really need a pointer to a transaction
either. It only uses it to match against lock->trx. So by changing it to
accept trx ID as the last argument and matching against lock->trx->id
instead, we can avoid the trx_rw_get_active_trx_by_id() call in
lock_rec_other_has_expl(), and potentially optimize some non-debug code
as well!

But again, I don’t insist. Just pointing out that the current implementation
is even less efficient than the upstream one.

>> But the OpenSSL changes are wrong. It looks like the only issue with
>> OpenSSL < 0.9.8l that breaks AES_ENCRYPT/AES_DECRYPT compatibility is
>> that those old versions incorrectly report the required IV length with
>> AES in ECB mode. IV is not required by the ECB cipher, so
>> EVP_CIPHER_iv_length() should return 0, whereas old versions
>> return 16.
>
> Yes.
>
>> Which confuses my_aes_needs_iv(), in particular, and makes the server
>> believe AES_*() functions require the 3rd argument with
>> block_encryption_mode=aes-128-ecb (i.e. an IV).
>
> Yes.
>
>> Which is also an upstream issue, i.e. a workaround for old OpenSSL
>> libs is required. And the workaround is simple: whenever
>> EVP_CIPHER_iv_length() is used to get the required IV length, also
>> check EVP_CIPHER_mode(). If it’s EVP_CIPH_ECB_MODE, disregard the
>> value returned by EVP_CIPHER_iv_length() and assume the
>> required IV length to be 0.
>
> OK, that's a better workaround than mine.
>

Will you report it upstream? AFAIK it is not documented anywhere that
OpenSSL < 0.9.8l is not supported, so it’s a genuine upstream issue.

>> The approach implemented in this MP is rather dangerous: we make the
>> server pretend that it accepts IV when required, when in fact it is
>> ignored for old OpenSSL versions. Security folks may get upset :)
>
> My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
> FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
> implementation would be as secure or insecure as, say, current 5.5.
>

I meant that by accepting IV for ciphers that require it, but ignoring
it the server would:

1. Generate cryptographically weak results with non-default
block_encryption_mode values, while users would assume them to be
cryptographically strong.

2. Generate results that would not be decryptable on servers with recent
OpenSSL versions that would actually take IV into account.

[Alexey Kopytov (akopytov)]

Not sure how you would like to address comments related to lock_rec_other_trx_holds_expl(). I see 3 options on the order of descending efficiency: 1) implement my suggestions 2) revert to the previous implementation 3) leave as is. I'm fine with all of them, so setting to Approved.

review: Approve

[Laurynas Biveinis (laurynas-biveinis)]

*** TODO Reply to the 2nd review round of MySQL 5.6.17 merge :@internet:
> Hm, not quite. It still looks up pointers to transactions, and for that
> it has iterate rw_trx_list by calling trx_rw_get_active_trx_by_id(). And
> it also has to do so for each trx from rw_trx_snapshot, which makes it
> even less efficient than the upstream implementation.

Oh, I completely missed that trx_rw_get_active_trx_by_id is O(n), yes,
that's not very reasonable implementation.

> It looks like
> lock_rec_has_expl() does not really need a pointer to a transaction
> either. It only uses it to match against lock->trx. So by changing it to
> accept trx ID as the last argument and matching against lock->trx->id
> instead, we can avoid the trx_rw_get_active_trx_by_id() call in
> lock_rec_other_has_expl(), and potentially optimize some non-debug code
> as well!

Done. Other changed code is lock_rec_queue_validate and
lock_rec_convert_impl_to_expl, the latter being non-debug code.

> But again, I don’t insist. Just pointing out that the current implementation
> is even less efficient than the upstream one.
>
> [...]
> Will you report it upstream? AFAIK it is not documented anywhere that
> OpenSSL < 0.9.8l is not supported, so it’s a genuine upstream issue.

I would, but we already had older OpenSSL version bug reported, which
was closed as "Unsupported":
http://bugs.mysql.com/bug.php?id=70489. That leaves us with an option
to report a bug that -DWITH_SSL=system should reject old versions at
configure time, but that is likely to be duplicate of
Bug 14167227 - CMAKE SHOULD REJECT -DWITH_SSL=SYSTEM IF OPENSSL IS
OLDER THAN 1.0.0
referenced in that bug report.

>
> >> The approach implemented in this MP is rather dangerous: we make the
> >> server pretend that it accepts IV when required, when in fact it is
> >> ignored for old OpenSSL versions. Security folks may get upset :)
> >
> > My idea was to make MySQL call OpenSSL in exactly same way (Foo vs
> > FooEx aside) it was in 5.6.16-, including 5.5 GA etc. So that
> > implementation would be as secure or insecure as, say, current 5.5.
> >
>
> I meant that by accepting IV for ciphers that require it, but ignoring
> it the server would:
>
> 1. Generate cryptographically weak results with non-default
> block_encryption_mode values, while users would assume them to be
> cryptographically strong.
>
> 2. Generate results that would not be decryptable on servers with recent
> OpenSSL versions that would actually take IV into account.

Right, I see.

[Alexey Kopytov (akopytov)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-03 17:51:33 +0000
+++ CMakeLists.txt	2014-04-24 08:44:11 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -398,14 +398,15 @@
   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
 ENDIF()
 
-OPTION(TMPDIR
-"PATH to MySQL TMP dir. If unspecified, defaults to P_tmpdir in <stdio.h>" OFF)
-IF(TMPDIR)
+SET(TMPDIR "P_tmpdir"
+  CACHE PATH
+  "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
+IF(TMPDIR STREQUAL "P_tmpdir")
+  # Do not quote it, to refer to the P_tmpdir macro.
+  SET(DEFAULT_TMPDIR "P_tmpdir")
+ELSE()
   # Quote it, to make it a const char string.
   SET(DEFAULT_TMPDIR "\"${TMPDIR}\"")
-ELSE()
-  # Do not quote it, to refer to the P_tmpdir macro in <stdio.h>.
-  SET(DEFAULT_TMPDIR "P_tmpdir")
 ENDIF()
 
 # Run platform tests
 
=== modified file 'VERSION'
--- VERSION	2014-03-24 15:57:34 +0000
+++ VERSION	2014-04-24 08:44:11 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=6
-MYSQL_VERSION_PATCH=16
-MYSQL_VERSION_EXTRA=-64.2
+MYSQL_VERSION_PATCH=17
+MYSQL_VERSION_EXTRA=-65.0
 
=== modified file 'client/mysql.cc'
--- client/mysql.cc	2013-12-05 17:23:10 +0000
+++ client/mysql.cc	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1311,9 +1311,9 @@
 
   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
-  sprintf((char*) glob_buffer.ptr(),
-	  "Your MySQL connection id is %lu\nServer version: %s\n",
-	  mysql_thread_id(&mysql), server_version_string(&mysql));
+  snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
+	   "Your MySQL connection id is %lu\nServer version: %s\n",
+	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
   put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
 
=== modified file 'client/mysql_config_editor.cc'
--- client/mysql_config_editor.cc	2013-01-23 11:16:25 +0000
+++ client/mysql_config_editor.cc	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -776,7 +776,7 @@
   {
     verbose_msg("File exists.\n");
 
-    file_size= stat_info.st_size;
+    file_size= (size_t) stat_info.st_size;
 
 #ifdef _WIN32
     if (1)
@@ -943,7 +943,7 @@
 static void remove_options(DYNAMIC_STRING *file_buf, const char *path_name)
 {
   /* If nope of the options are specified remove the entire path. */
-  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user 
+  if (!opt_remove_host && !opt_remove_pass && !opt_remove_user
       && !opt_remove_socket && !opt_remove_port)
   {
     remove_login_path(file_buf, path_name);
@@ -1295,7 +1295,7 @@
 
   @param plain     [in]   Plain text to be encrypted.
   @param plain_len [in]   Length of the plain text.
-  @param cipher    [in]   Encrypted cipher text.
+  @param cipher    [out]  Encrypted cipher text.
 
   @return                 -1 if error encountered,
                           length encrypted, otherwise.
@@ -1306,9 +1306,12 @@
   DBUG_ENTER("encrypt_buffer");
   int aes_len;
 
-  aes_len= my_aes_get_size(plain_len);
+  aes_len= my_aes_get_size(plain_len, my_aes_128_ecb);
 
-  if (my_aes_encrypt(plain, plain_len, cipher, my_key, LOGIN_KEY_LEN) == aes_len)
+  if (my_aes_encrypt((const unsigned char *) plain, plain_len,
+                     (unsigned char *) cipher,
+                     (const unsigned char *) my_key, LOGIN_KEY_LEN,
+                     my_aes_128_ecb, NULL) == aes_len)
     DBUG_RETURN(aes_len);
 
   verbose_msg("Error! Couldn't encrypt the buffer.\n");
@@ -1321,7 +1324,7 @@
 
   @param cipher     [in]  Cipher text to be decrypted.
   @param cipher_len [in]  Length of the cipher text.
-  @param plain      [in]  Decrypted plain text.
+  @param plain      [out] Decrypted plain text.
 
   @return                 -1 if error encountered,
                           length decrypted, otherwise.
@@ -1332,8 +1335,11 @@
   DBUG_ENTER("decrypt_buffer");
   int aes_length;
 
-  if ((aes_length= my_aes_decrypt(cipher, cipher_len, (char *) plain,
-                                  my_key, LOGIN_KEY_LEN)) > 0)
+  if ((aes_length= my_aes_decrypt((const unsigned char *) cipher, cipher_len,
+                                  (unsigned char *) plain,
+                                  (const unsigned char *) my_key,
+                                  LOGIN_KEY_LEN,
+                                  my_aes_128_ecb, NULL)) > 0)
     DBUG_RETURN(aes_length);
 
   verbose_msg("Error! Couldn't decrypt the buffer.\n");
 
=== modified file 'client/mysql_upgrade.c'
--- client/mysql_upgrade.c	2013-06-20 15:16:00 +0000
+++ client/mysql_upgrade.c	2014-04-24 08:44:11 +0000
@@ -476,6 +476,7 @@
   */
   if (run_tool(tool_executable_name,
                &ds_tmp, /* Get output from command, discard*/
+               "--no-defaults",
                "--help",
                "2>&1",
                IF_WIN("> NUL", "> /dev/null"),
 
=== modified file 'client/mysqladmin.cc'
--- client/mysqladmin.cc	2013-06-20 15:16:00 +0000
+++ client/mysqladmin.cc	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@
 static int interval=0;
 static my_bool option_force=0,interrupted=0,new_line=0,
                opt_compress=0, opt_relative=0, opt_verbose=0, opt_vertical=0,
-               tty_password= 0, opt_nobeep;
+               tty_password= 0, opt_nobeep, opt_secure_auth= TRUE;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static uint tcp_port = 0, option_wait = 0, option_silent=0, nr_iterations;
 static uint opt_count_iterations= 0, my_end_arg;
@@ -181,6 +181,9 @@
    "Currently only works with extended-status.",
    &opt_relative, &opt_relative, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -349,6 +352,8 @@
 
   if (opt_bind_addr)
     mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
   if (opt_compress)
     mysql_options(&mysql,MYSQL_OPT_COMPRESS,NullS);
   if (opt_connect_timeout)
 
=== modified file 'client/mysqlbinlog.cc'
--- client/mysqlbinlog.cc	2014-02-15 00:23:41 +0000
+++ client/mysqlbinlog.cc	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -144,6 +144,7 @@
 static uint my_end_arg;
 static const char* sock= 0;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 
 #ifdef HAVE_SMEM
 static char *shared_memory_base_name= 0;
@@ -1549,6 +1550,9 @@
    "prefix for the file names.",
    &output_file, &output_file, 0, GET_STR, REQUIRED_ARG,
    0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"server-id", OPT_SERVER_ID,
    "Extract only binlog entries created by the server having the given id.",
    &server_id, &server_id, 0, GET_ULONG,
@@ -2011,6 +2015,8 @@
     mysql_options(mysql, MYSQL_OPT_PROTOCOL, (char*) &opt_protocol);
   if (opt_bind_addr)
     mysql_options(mysql, MYSQL_OPT_BIND, opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(mysql, MYSQL_SHARED_MEMORY_BASE_NAME,
 
=== modified file 'client/mysqlcheck.c'
--- client/mysqlcheck.c	2014-02-17 11:12:40 +0000
+++ client/mysqlcheck.c	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@
                opt_silent = 0, opt_auto_repair = 0, ignore_errors = 0,
                tty_password= 0, opt_frm= 0, debug_info_flag= 0, debug_check_flag= 0,
                opt_fix_table_names= 0, opt_fix_db_names= 0, opt_upgrade= 0,
-               opt_write_binlog= 1;
+               opt_write_binlog= 1, opt_secure_auth=TRUE;
 static uint verbose = 0, opt_mysql_port=0;
 static int my_end_arg;
 static char * opt_mysql_unix_port = 0;
@@ -144,6 +144,9 @@
    "when commands should not be sent to replication slaves.",
    &opt_write_binlog, &opt_write_binlog, 0, GET_BOOL, NO_ARG,
    1, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
   {"optimize", 'o', "Optimize table.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0,
    0, 0},
   {"password", 'p',
@@ -891,6 +894,8 @@
     mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql_connection, MYSQL_OPT_BIND, opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql_connection, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
 
=== modified file 'client/mysqldump.c'
--- client/mysqldump.c	2014-03-03 17:51:33 +0000
+++ client/mysqldump.c	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -116,7 +116,8 @@
                 opt_slave_apply= 0, opt_ignore_show_create_table_error=0,
                 opt_include_master_host_port= 0,
                 opt_events= 0, opt_comments_used= 0,
-                opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0;
+                opt_alltspcs=0, opt_notspcs= 0, opt_drop_trigger= 0,
+                opt_secure_auth= 1;
 static my_bool insert_pat_inited= 0, debug_info_flag= 0, debug_check_flag= 0;
 static ulong opt_max_allowed_packet, opt_net_buffer_length;
 static MYSQL mysql_connection,*mysql=0;
@@ -533,6 +534,9 @@
   {"socket", 'S', "The socket file to use for connection.",
    &opt_mysql_unix_port, &opt_mysql_unix_port, 0, 
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #include <sslopt-longopts.h>
   {"tab",'T',
    "Create tab-separated textfile for each table to given path. (Create .sql "
@@ -1561,6 +1565,8 @@
     mysql_options(&mysql_connection,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql_connection,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql_connection,MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql_connection,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
 
=== modified file 'client/mysqlimport.c'
--- client/mysqlimport.c	2012-10-16 06:21:51 +0000
+++ client/mysqlimport.c	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@
 
 static my_bool	verbose=0,lock_tables=0,ignore_errors=0,opt_delete=0,
 		replace=0,silent=0,ignore=0,opt_compress=0,
-                opt_low_priority= 0, tty_password= 0;
+                opt_low_priority= 0, tty_password= 0, opt_secure_auth= 1;
 static my_bool debug_info_flag= 0, debug_check_flag= 0;
 static uint opt_use_threads=0, opt_local_file=0, my_end_arg= 0;
 static char	*opt_password=0, *current_user=0,
@@ -161,6 +161,9 @@
    0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
   {"replace", 'r', "If duplicate unique key was found, replace old row.",
    &replace, &replace, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.",
+    &opt_secure_auth, &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name, &shared_memory_base_name,
@@ -440,6 +443,8 @@
     mysql_options(mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
 
=== modified file 'client/mysqlshow.c'
--- client/mysqlshow.c	2012-10-16 06:21:51 +0000
+++ client/mysqlshow.c	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,6 +38,7 @@
 static uint opt_verbose=0;
 static char *default_charset= (char*) MYSQL_AUTODETECT_CHARSET_NAME;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 
 #ifdef HAVE_SMEM 
 static char *shared_memory_base_name=0;
@@ -132,6 +133,8 @@
     mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
   if (opt_bind_addr)
     mysql_options(&mysql,MYSQL_OPT_BIND,opt_bind_addr);
+  if (!opt_secure_auth)
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
@@ -244,6 +247,9 @@
   {"protocol", OPT_MYSQL_PROTOCOL, 
    "The protocol to use for connection (tcp, socket, pipe, memory).",
    0, 0, 0, GET_STR,  REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
    "Base name of shared memory.", &shared_memory_base_name,
 
=== modified file 'client/mysqlslap.c'
--- client/mysqlslap.c	2012-10-16 06:21:51 +0000
+++ client/mysqlslap.c	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -126,6 +126,7 @@
             *post_system= NULL,
             *opt_mysql_unix_port= NULL;
 static char *opt_plugin_dir= 0, *opt_default_auth= 0;
+static my_bool opt_secure_auth= TRUE;
 static uint opt_enable_cleartext_plugin= 0;
 static my_bool using_opt_enable_cleartext_plugin= 0;
 
@@ -346,6 +347,8 @@
 #endif
   if (opt_protocol)
     mysql_options(&mysql,MYSQL_OPT_PROTOCOL,(char*)&opt_protocol);
+  if (!opt_secure_auth && slap_connect(&mysql))
+    mysql_options(&mysql, MYSQL_SECURE_AUTH,(char*)&opt_secure_auth);
 #ifdef HAVE_SMEM
   if (shared_memory_base_name)
     mysql_options(&mysql,MYSQL_SHARED_MEMORY_BASE_NAME,shared_memory_base_name);
@@ -684,6 +687,9 @@
   {"query", 'q', "Query to run or file containing query to run.",
     &user_supplied_query, &user_supplied_query,
     0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"secure-auth", OPT_SECURE_AUTH, "Refuse client connecting to server if it"
+    " uses old (pre-4.1.1) protocol.", &opt_secure_auth,
+    &opt_secure_auth, 0, GET_BOOL, NO_ARG, 1, 0, 0, 0, 0, 0},
 #ifdef HAVE_SMEM
   {"shared-memory-base-name", OPT_SHARED_MEMORY_BASE_NAME,
     "Base name of shared memory.", &shared_memory_base_name,
 
=== modified file 'cmake/libutils.cmake'
--- cmake/libutils.cmake	2014-02-17 11:12:40 +0000
+++ cmake/libutils.cmake	2014-04-24 08:44:11 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/README'
--- extra/yassl/README	2013-02-12 07:47:19 +0000
+++ extra/yassl/README	2014-04-24 08:44:11 +0000
@@ -12,7 +12,36 @@
 
 *** end Note ***
 
-yaSSL Release notes, version 2.2.2 (7/5/2012)
+yaSSL Release notes, version 2.3.0 (12/5/2013)
+
+  This release of yaSSL updates asm for newer GCC versions.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.3b (4/23/2013)
+
+    This release of yaSSL updates the test certificates as they were expired
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2d (2/5/2013)
+
+    This release of yaSSL contains countermeasuers for the Lucky 13 TLS 1.1
+    CBC timing padding attack identified by Nadhem AlFardan and Kenneth Paterson
+    see: http://www.isg.rhul.ac.uk/tls/
+
+    It also adds SHA2 certificate verification and better checks for malicious
+    input.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2 (7/5/2012)
 
     This release of yaSSL contains bug fixes and more security checks around
     malicious certificates.
 
=== modified file 'extra/yassl/certs/ca-cert.pem'
--- extra/yassl/certs/ca-cert.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/ca-cert.pem	2014-04-24 08:44:11 +0000
@@ -1,56 +1,87 @@
+-----BEGIN CERTIFICATE-----
+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
+-----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            8a:37:22:65:73:f5:aa:e8
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+            e9:d0:a7:5f:79:25:f4:3c
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:47:10 2010 GMT
-            Not After : Mar 26 18:47:10 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:18:15 2011 GMT
+            Not After : Jul 20 18:18:15 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:97:30:b9:1a:92:ef:25:4f:ca:4c:11:31:95:1a:
-                    e1:c0:10:19:0a:20:b9:37:80:1a:57:38:02:4e:1b:
-                    c5:0f:28:4f:da:e3:c9:16:aa:50:bd:4a:fb:b7:71:
-                    c7:35:cc:63:81:c1:dd:9d:33:f9:38:16:88:32:a0:
-                    aa:56:23:03:a3
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
             X509v3 Authority Key Identifier: 
-                keyid:3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
-                DirName:/C=US/ST=Montana/L=Bozeman/O=sawtooth/OU=consulting/CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
-                serial:8A:37:22:65:73:F5:AA:E8
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:E9:D0:A7:5F:79:25:F4:3C
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        32:65:a2:b1:dc:6d:e0:8d:8b:c8:58:29:8e:b8:18:4b:62:88:
-        13:67:f8:6c:75:46:75:8f:8a:19:a6:a3:d5:3c:fc:57:4e:7a:
-        68:a9:fc:93:dc:ae:29:7d:bb:4e:ec:ea:55:fa:a4:e3:00:61:
-        f4:b0:34:6d:d1:d5:a4:64:24:f8
------BEGIN CERTIFICATE-----
-MIIDQDCCAuqgAwIBAgIJAIo3ImVz9aroMA0GCSqGSIb3DQEBBAUAMIGeMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIc2F3dG9vdGgxEzARBgNVBAsTCmNvbnN1bHRpbmcxJDAiBgNVBAMTG3d3
-dy5zYXd0b290aC1jb25zdWx0aW5nLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5
-YXNzbC5jb20wHhcNMTAwNjMwMTg0NzEwWhcNMTMwMzI2MTg0NzEwWjCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJcwuRqS7yVPykwRMZUa
-4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaqUL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYj
-A6MCAwEAAaOCAQcwggEDMB0GA1UdDgQWBBQ7Zv2gQMb04nDPIRoMT2f+t0tCCTCB
-0wYDVR0jBIHLMIHIgBQ7Zv2gQMb04nDPIRoMT2f+t0tCCaGBpKSBoTCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tggkAijciZXP1qugwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQF
-AANBADJlorHcbeCNi8hYKY64GEtiiBNn+Gx1RnWPihmmo9U8/FdOemip/JPcril9
-u07s6lX6pOMAYfSwNG3R1aRkJPg=
------END CERTIFICATE-----
+    Signature Algorithm: sha1WithRSAEncryption
+        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
+        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
+        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
+        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
+        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
+        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
+        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
+        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
+        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
+        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
+        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
+        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
+        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
+        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
+        5a:1f:7f:ca
 
=== modified file 'extra/yassl/certs/ca-key.pem'
--- extra/yassl/certs/ca-key.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/ca-key.pem	2014-04-24 08:44:11 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBAJcwuRqS7yVPykwRMZUa4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaq
-UL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYjA6MCAwEAAQJAEQ9TY7c+uuQU/J5YDO4a
-mRR37tegbq3Kyxqrz+p8QuhqLDtVh13GaF7rVU70vyNHm+cgihUyzho/PViAkPBo
-qQIhAMU8/RDhDLgL5BxID4sxKIVBtg+imFSbyKVyg7oQLUcXAiEAxDu94O45Cf4a
-np9R0thumY/QqWpCkycWAB7fFEuaf1UCIEH+bg4/vqm2ENUFp23DPPOZUPlaRe3J
-UhFJh5mx3/RxAiBq++8vfHFYg1Lb/BxOCXVy/zdRxf753ytdcXdJx1Y56QIgVgpN
-FNfYJofQfWaP96sjlc0usrT28uceHx0QmHqolVc=
+MIIEpAIBAAKCAQEAvwzKLRSyHoRCW804H0ryTXUQ8bY1n9/KfQOY06zeA2buKvHY
+sH1uB1QLEJghTYDLEiDnzE/eRX3Jcncy6sqQu2lSEAMvqPOVxfGLYlYb72dvpBBB
+la0Km+OlwLDScHZQMFuo6AgsfO2nonqNOCkcrMft8nyVsJWCfUlcOM13Je+9gHVT
+lDw9ymNbnxW10x0TLxnRPNt2Osy4fcnlwtfaQG/YIdxzG0ItU5z+Gvx9q3o2P5je
+hHwFZ85qFDiHqfGMtWjLaH9xICv1oGP1Vi+jJtK3b7FaF9c4mQj+k1hv/sMTSQgW
+C6dNZwBSMWcjTpjtUUUduQTZC+zYKLNLve02eQIDAQABAoIBAD1uTmAahH+dhXzh
+Swd84NaZKt6d+TY0DncOPgjqT+UGJtT2OPffDQ8cLgai9CponGNy4zXmBJGRtcGx
+pFSs18b7QaDWdW+9C06/sVLoX0kmmFZHx97p6jxgAb8o3DG/SV+TSYd6gVuWS03K
+XDhPt+Gy08ch2jwShwfkG9xD7OjsVGHn9u2mCy7134J/xh9hGZykgznfIYWJb3ev
+hhUyCKJaCyZh+3AMypw4fbwi7uujqBYA+YqAHgCEqEpB+IQDZy8jWy+baybDBzSU
+owM7ctWfcuCtzDSrvcfV9SYwhQ8wIzlS/zzLmSFNiKWr7mK5x+C7R4fBac9z8zC+
+zjkEnOUCgYEA4XZFgFm200nfCu8S1g/wt8sqN7+n+LVN9TE1reSjlKHb8ZattQVk
+hYP8G1spqr74Jj92fq0c8MvXJrQbBY5Whn4IYiHBhtZHeT63XaTGOtexdCD2UJdB
+BFPtPybWb5H6aCbsKtya8efc+3PweUMbIaNZBGNSB8nX5tEbXV6W+lMCgYEA2O1O
+ZGFrkQxhAbUPu0RnUx7cB8Qkfp5shCORDOQSBBZNeJjMlj0gTg9Fmrb4s5MNsqIb
+KfImecjF0nh+XnPy13Bhu0DOYQX+aR6CKeYUuKHnltAjPwWTAPLhTX7tt5Zs9/Dk
+0c8BmE/cdFSqbV5aQTH+/5q2oAXdqRBU+GvQqoMCgYAh0wSKROtQt3xmv4cr5ihO
+6oPi6TXh8hFH/6H1/J8t5TqB/AEDb1OtVCe2Uu7lVtETq+GzD3WQCoS0ocCMDNae
+RrorPrUx7WO7pNUNj3LN0R4mNeu+G3L9mzm0h7cT9eqDRZOYuo/kSsy0TKh/CLpB
+SahJKD1ePcHONwDL+SzdUQKBgQChV58+udavg22DP4/70NyozgMJI7GhG2PKxElW
+NSvRLmVglQVVmRE1/dXfRMeliHJfsoJRqHFFkzbPXB9hUQwFgOivxXu6XiLjPHXD
+hAVVbdY6LYSJkzPLONqqMQXNzmwt3VXTVwvwpTVqsK4xukOWygDHS+MZEkPTQvpv
+6oDA0QKBgQC524kgNCdwYjTqXyViEvOdgb9I7poOwY0Q/2WanS0aipRayMClpYRh
+ntQkue+pncl3C8dwZj26yFTf0jPh9X/5J2G+V0Xdt0UXJPUj5DgOkSfu4yDYFMiU
+R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==
 -----END RSA PRIVATE KEY-----
 
=== modified file 'extra/yassl/certs/client-cert.pem'
--- extra/yassl/certs/client-cert.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/client-cert.pem	2014-04-24 08:44:11 +0000
@@ -2,54 +2,86 @@
     Data:
         Version: 3 (0x2)
         Serial Number:
-            c5:d7:6c:11:36:f0:35:e1
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=[e-mail]
+            87:4a:75:be:91:66:d8:3d
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:39:39 2010 GMT
-            Not After : Mar 26 18:39:40 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:21:55 2011 GMT
+            Not After : Jul 20 18:21:55 2014 GMT
+        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=Programming, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:bd:51:4a:14:fd:6a:19:84:0c:33:38:fc:27:32:
-                    9c:97:0b:fc:a4:18:60:69:4e:d9:d8:78:50:0b:e9:
-                    20:5d:d6:1d:70:1c:0c:24:9f:23:82:cc:3a:01:d5:
-                    97:17:b2:73:6c:86:cf:b5:f1:e5:ce:68:0c:d9:a2:
-                    12:39:7c:f2:53
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
+                    2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
+                    32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
+                    68:a2:8b:67:bb:a1:75:c8:36:2c:4a:d2:1b:f7:8b:
+                    ba:cf:0d:f9:ef:ec:f1:81:1e:7b:9b:03:47:9a:bf:
+                    65:cc:7f:65:24:69:a6:e8:14:89:5b:e4:34:f7:c5:
+                    b0:14:93:f5:67:7b:3a:7a:78:e1:01:56:56:91:a6:
+                    13:42:8d:d2:3c:40:9c:4c:ef:d1:86:df:37:51:1b:
+                    0c:a1:3b:f5:f1:a3:4a:35:e4:e1:ce:96:df:1b:7e:
+                    bf:4e:97:d0:10:e8:a8:08:30:81:af:20:0b:43:14:
+                    c5:74:67:b4:32:82:6f:8d:86:c2:88:40:99:36:83:
+                    ba:1e:40:72:22:17:d7:52:65:24:73:b0:ce:ef:19:
+                    cd:ae:ff:78:6c:7b:c0:12:03:d4:4e:72:0d:50:6d:
+                    3b:a3:3b:a3:99:5e:9d:c8:d9:0c:85:b3:d9:8a:d9:
+                    54:26:db:6d:fa:ac:bb:ff:25:4c:c4:d1:79:f4:71:
+                    d3:86:40:18:13:b0:63:b5:72:4e:30:c4:97:84:86:
+                    2d:56:2f:d7:15:f7:7f:c0:ae:f5:fc:5b:e5:fb:a1:
+                    ba:d3
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
+                33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
             X509v3 Authority Key Identifier: 
-                keyid:5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=programming/CN=www.yassl.com/emailAddress=[e-mail]
-                serial:C5:D7:6C:11:36:F0:35:E1
+                keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
+                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=Programming/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:87:4A:75:BE:91:66:D8:3D
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        b4:a5:f1:71:26:4d:b9:ff:54:f3:09:1f:ac:e1:19:59:e5:ec:
-        57:e3:f1:0b:b2:8f:f3:29:eb:6b:c6:fa:27:33:3e:91:d0:77:
-        43:c9:ce:1e:0f:71:07:a9:f7:26:e0:7e:ff:30:7d:52:0a:e1:
-        80:48:46:bb:99:e9:d9:77:ce:75
+    Signature Algorithm: sha1WithRSAEncryption
+        1c:7c:42:81:29:9e:21:cf:d0:d8:c1:54:6f:cc:ae:14:09:38:
+        ff:68:98:9a:95:53:76:18:7b:e6:30:76:ec:28:0d:75:a7:de:
+        e0:cd:8e:d5:55:23:6a:47:2b:4e:8d:fc:7d:06:a3:d8:0f:ad:
+        5e:d6:04:c9:00:33:fb:77:27:d3:b5:03:b3:7b:21:74:31:0b:
+        4a:af:2d:1a:b3:93:8e:cc:f3:5f:3d:90:3f:cc:e3:55:19:91:
+        7b:78:24:2e:4a:09:bb:18:4e:61:2d:9c:c6:0a:a0:34:91:88:
+        70:6b:3b:48:47:bc:79:94:a2:a0:4d:32:47:54:c2:a3:dc:2e:
+        d2:51:4c:29:39:11:ff:e2:15:5e:58:97:36:f6:e9:06:06:86:
+        0e:8d:9d:95:03:72:b2:8b:19:7c:e9:14:6e:a1:88:73:68:58:
+        6d:71:5e:c2:d5:d3:13:d2:5f:de:ea:03:be:e2:00:40:e5:ce:
+        fd:e6:92:31:57:c3:eb:bb:66:ac:cb:2f:1a:fa:e0:62:a2:47:
+        f4:93:43:2a:4b:6c:5e:0a:2f:f9:e7:e6:4a:63:86:b0:ac:2a:
+        a1:eb:b4:5b:67:cd:32:e4:b6:11:4b:9a:72:66:0d:a2:4a:76:
+        8f:fe:22:bc:83:fd:db:b7:d5:a9:ee:05:c9:b1:71:7e:1b:2b:
+        e1:e3:af:c0
 -----BEGIN CERTIFICATE-----
-MIIDDjCCArigAwIBAgIJAMXXbBE28DXhMA0GCSqGSIb3DQEBBAUAMIGOMQswCQYD
+MIIEmDCCA4CgAwIBAgIJAIdKdb6RZtg9MA0GCSqGSIb3DQEBBQUAMIGOMQswCQYD
 VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
-A1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMDA2
-MzAxODM5MzlaFw0xMzAzMjYxODM5NDBaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
+A1UEChMFeWFTU0wxFDASBgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
+eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMTEw
+MjQxODIxNTVaFw0xNDA3MjAxODIxNTVaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
 CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
-BgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQC9UUoU/WoZhAwzOPwnMpyXC/ykGGBpTtnYeFAL6SBd1h1wHAwknyOCzDoB1ZcX
-snNshs+18eXOaAzZohI5fPJTAgMBAAGjgfYwgfMwHQYDVR0OBBYEFFz3KSFpegl4
-nnvNU0IC7M4pDRHfMIHDBgNVHSMEgbswgbiAFFz3KSFpegl4nnvNU0IC7M4pDRHf
-oYGUpIGRMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQH
-EwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5n
-MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlh
-c3NsLmNvbYIJAMXXbBE28DXhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-QQC0pfFxJk25/1TzCR+s4RlZ5exX4/ELso/zKetrxvonMz6R0HdDyc4eD3EHqfcm
-4H7/MH1SCuGASEa7menZd851
+BgNVBAsTC1Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9amNrIHMo7Quml7xsNE
+ntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/Zcx/ZSRppugUiVvk
+NPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE79fGjSjXk4c6W3xt+
+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX11JlJHOwzu8Zza7/
+eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8lTMTRefRx04ZAGBOw
+Y7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB9jCB8zAdBgNVHQ4EFgQU
+M9hFZtdohxh+VA1wJ5HHJteFZcAwgcMGA1UdIwSBuzCBuIAUM9hFZtdohxh+VA1w
+J5HHJteFZcChgZSkgZEwgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24x
+ETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQKEwV5YVNTTDEUMBIGA1UECxMLUHJv
+Z3JhbW1pbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEW
+DmluZm9AeWFzc2wuY29tggkAh0p1vpFm2D0wDAYDVR0TBAUwAwEB/zANBgkqhkiG
+9w0BAQUFAAOCAQEAHHxCgSmeIc/Q2MFUb8yuFAk4/2iYmpVTdhh75jB27CgNdafe
+4M2O1VUjakcrTo38fQaj2A+tXtYEyQAz+3cn07UDs3shdDELSq8tGrOTjszzXz2Q
+P8zjVRmRe3gkLkoJuxhOYS2cxgqgNJGIcGs7SEe8eZSioE0yR1TCo9wu0lFMKTkR
+/+IVXliXNvbpBgaGDo2dlQNysosZfOkUbqGIc2hYbXFewtXTE9Jf3uoDvuIAQOXO
+/eaSMVfD67tmrMsvGvrgYqJH9JNDKktsXgov+efmSmOGsKwqoeu0W2fNMuS2EUua
+cmYNokp2j/4ivIP927fVqe4FybFxfhsr4eOvwA==
 -----END CERTIFICATE-----
 
=== modified file 'extra/yassl/certs/client-key.pem'
--- extra/yassl/certs/client-key.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/client-key.pem	2014-04-24 08:44:11 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAL1RShT9ahmEDDM4/CcynJcL/KQYYGlO2dh4UAvpIF3WHXAcDCSf
-I4LMOgHVlxeyc2yGz7Xx5c5oDNmiEjl88lMCAwEAAQJAVGHWLlLhpqvXsEEXCvWh
-HCYono+K8YVGzhiaPSTU212fCoQryIxsXQKGBjhFdZm96DZWp+Vd/t/u+B4ZeaqY
-+QIhAOBEfbFtdZqk5OmbbRsRVPI7+YYmubgY1TVIPqmxHQ4NAiEA2BrTQkjOb3ul
-A/SZO04fJUZsm7Ng92FWHDJsRancSd8CIQCmGbQqZBK1TamJZ6dAY+7RViAx/p6Q
-vjuzMeXPUrFdRQIhAMkfBhg9bCqjFyt8PBPOm/vz8+ZgZlE0/JAXeV7IPCVfAiEA
-gZwCFm1ghGxmaoB424YC4DHeDeN/g9xwJHT7EuM9Mvc=
+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
 -----END RSA PRIVATE KEY-----
 
=== modified file 'extra/yassl/certs/client-keyEnc.pem'
--- extra/yassl/certs/client-keyEnc.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/client-keyEnc.pem	2014-04-24 08:44:11 +0000
@@ -2,11 +2,29 @@
 Proc-Type: 4,ENCRYPTED
 DEK-Info: DES-CBC,B9D8FB94E38635AB
 
-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
+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
 -----END RSA PRIVATE KEY-----
 
=== modified file 'extra/yassl/certs/dsa-cert.pem'
--- extra/yassl/certs/dsa-cert.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/dsa-cert.pem	2014-04-24 08:44:11 +0000
@@ -1,70 +1,22 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            ce:df:23:31:64:b4:13:da
-        Signature Algorithm: dsaWithSHA1
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=[e-mail]
-        Validity
-            Not Before: Jun 30 18:56:38 2010 GMT
-            Not After : Mar 26 18:56:39 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=[e-mail]
-        Subject Public Key Info:
-            Public Key Algorithm: dsaEncryption
-            DSA Public Key:
-                pub: 
-                    04:84:a0:26:31:72:0c:e8:4f:5d:53:17:62:b1:80:
-                    ca:c0:16:5f:c3:1e:ea:c5:d9:98:38:f9:be:56:53:
-                    47:68:ce:08:22:57:1c:bb:0d:77:91:cf:5b:36:ed:
-                    f3:24:82:90:8a:cd:90:7c:db:77:f9:17:2d:73:73:
-                    ef:bb:b9:82
-                P:   
-                    00:99:29:69:80:c9:3c:98:68:45:a9:82:fe:67:eb:
-                    95:88:c5:b4:0c:d6:26:45:95:19:2c:a0:20:5b:7e:
-                    df:69:e9:dc:c3:0f:f3:61:0a:25:9b:f2:21:01:6a:
-                    cd:aa:8c:37:e7:ca:66:db:56:f4:0f:7d:7a:d1:18:
-                    b9:42:fd:1b:11
-                Q:   
-                    00:ad:25:29:ab:0a:9f:09:1c:c1:ad:03:20:76:7f:
-                    a6:b7:dd:4d:03:09
-                G:   
-                    12:88:99:da:e7:d0:0b:93:9b:e6:ee:3c:21:7f:9c:
-                    b3:b4:8d:a5:8c:e2:37:80:3f:17:d1:81:4f:bd:f0:
-                    71:b6:32:08:54:dd:bf:01:e2:b3:77:06:64:75:8a:
-                    04:d6:79:39:b1:02:03:03:c6:06:74:e5:90:05:0a:
-                    10:46:19:31
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-            X509v3 Authority Key Identifier: 
-                keyid:BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=testing/CN=www.yassl.com/emailAddress=[e-mail]
-                serial:CE:DF:23:31:64:B4:13:DA
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: dsaWithSHA1
-        30:2d:02:14:00:a3:21:20:34:6a:2c:f9:fb:76:d7:20:c9:c0:
-        35:1b:64:9a:c2:83:02:15:00:a4:59:ac:6d:da:85:48:ff:f5:
-        0d:49:72:c8:cd:91:fc:ec:2f:5c:63
 -----BEGIN CERTIFICATE-----
-MIIDfjCCAz2gAwIBAgIJAM7fIzFktBPaMAkGByqGSM44BAMwgYoxCzAJBgNVBAYT
-AlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQK
-EwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNv
-bTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTAwNjMwMTg1NjM4
-WhcNMTMwMzI2MTg1NjM5WjCBijELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdv
-bjERMA8GA1UEBxMIUG9ydGxhbmQxDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwd0
-ZXN0aW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHlhc3NsLmNvbTCB8DCBqAYHKoZIzjgEATCBnAJBAJkpaYDJPJhoRamC/mfr
-lYjFtAzWJkWVGSygIFt+32np3MMP82EKJZvyIQFqzaqMN+fKZttW9A99etEYuUL9
-GxECFQCtJSmrCp8JHMGtAyB2f6a33U0DCQJAEoiZ2ufQC5Ob5u48IX+cs7SNpYzi
-N4A/F9GBT73wcbYyCFTdvwHis3cGZHWKBNZ5ObECAwPGBnTlkAUKEEYZMQNDAAJA
-BISgJjFyDOhPXVMXYrGAysAWX8Me6sXZmDj5vlZTR2jOCCJXHLsNd5HPWzbt8ySC
-kIrNkHzbd/kXLXNz77u5gqOB8jCB7zAdBgNVHQ4EFgQUvvmMXdYctO6B3TZWCiHk
-YURz6eIwgb8GA1UdIwSBtzCBtIAUvvmMXdYctO6B3TZWCiHkYURz6eKhgZCkgY0w
-gYoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRs
-YW5kMQ4wDAYDVQQKEwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMN
-d3d3Lnlhc3NsLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb22CCQDO
-3yMxZLQT2jAMBgNVHRMEBTADAQH/MAkGByqGSM44BAMDMAAwLQIUAKMhIDRqLPn7
-dtcgycA1G2SawoMCFQCkWaxt2oVI//UNSXLIzZH87C9cYw==
+MIIDqzCCA2ugAwIBAgIJAMGqrgDU6DyhMAkGByqGSM44BAMwgY4xCzAJBgNVBAYT
+AlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQK
+DAd3b2xmU1NMMRAwDgYDVQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wu
+Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTEzMDQyMjIw
+MDk0NFoXDTE2MDExNzIwMDk0NFowgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZP
+cmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQKDAd3b2xmU1NMMRAwDgYD
+VQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wuY29tMR8wHQYJKoZIhvcN
+AQkBFhBpbmZvQHdvbGZzc2wuY29tMIIBuDCCASwGByqGSM44BAEwggEfAoGBAL1R
+7koy4IrH6sbh6nDEUUPPKgfhxxLCWCVexF2+qzANEr+hC9M002haJXFOfeS9DyoO
+WFbL0qMZOuqv+22CaHnoUWl7q3PjJOAI3JH0P54ZyUPuU1909RzgTdIDp5+ikbr7
+KYjnltL73FQVMbjTZQKthIpPn3MjYcF+4jp2W2zFAhUAkcntYND6MGf+eYzIJDN2
+L7SonHUCgYEAklpxErfqznIZjVvqqHFaq+mgAL5J8QrKVmdhYZh/Y8z4jCjoCA8o
+TDoFKxf7s2ZzgaPKvglaEKiYqLqic9qY78DYJswzQMLFvjsF4sFZ+pYCBdWPQI4N
+PgxCiznK6Ce+JH9ikSBvMvG+tevjr2UpawDIHX3+AWYaZBZwKADAaboDgYUAAoGB
+AJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caaDDa0XJ7ak6A7
+TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WXS0kk3m/DHaC0
+3ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVo1AwTjAdBgNVHQ4EFgQU
+IJjk416o4v8qpH9LBtXlR9v8gccwHwYDVR0jBBgwFoAUIJjk416o4v8qpH9LBtXl
+R9v8gccwDAYDVR0TBAUwAwEB/zAJBgcqhkjOOAQDAy8AMCwCFCjGKIdOSV12LcTu
+k08owGM6YkO1AhQe+K173VuaO/OsDNsxZlKpyH8+1g==
 -----END CERTIFICATE-----
 
=== modified file 'extra/yassl/certs/server-cert.pem'
--- extra/yassl/certs/server-cert.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/server-cert.pem	2014-04-24 08:44:11 +0000
@@ -1,39 +1,157 @@
 Certificate:
     Data:
         Version: 1 (0x0)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=[e-mail]
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
         Validity
-            Not Before: Jun 30 18:52:17 2010 GMT
-            Not After : Mar 26 18:52:17 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=support, CN=www.yassl.com/emailAddress=[e-mail]
+            Not Before: Oct 24 18:27:13 2011 GMT
+            Not After : Jul 20 18:27:13 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=Support, CN=www.yassl.com/emailAddress=[e-mail]
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:c6:7b:c0:68:81:2f:de:82:3f:f9:ac:c3:86:4a:
-                    66:b7:ec:d4:f1:f6:64:21:ff:f5:a2:34:42:d0:38:
-                    9f:c6:dd:3b:6e:26:65:6a:54:96:dd:d2:7b:eb:36:
-                    a2:ae:7e:2a:9e:7e:56:a5:b6:87:9f:15:c7:18:66:
-                    7e:16:77:e2:a7
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
+                    01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
+                    f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
+                    f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
+                    64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
+                    86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
+                    4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
+                    34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
+                    8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
+                    40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
+                    dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
+                    e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
+                    64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
+                    c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
+                    ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
+                    b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
+                    a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
+                    ad:d7
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        58:a9:98:e7:16:52:4c:40:e7:e1:47:92:19:1b:3a:8f:97:6c:
-        7b:b7:b0:cb:20:6d:ad:b5:d3:47:58:d8:e4:f2:3e:32:e9:ef:
-        87:77:e5:54:36:f4:8d:50:8d:07:b4:77:45:ea:9d:a4:33:36:
-        9b:0b:e0:74:58:11:c5:01:7b:4d
+    Signature Algorithm: sha1WithRSAEncryption
+        71:4e:d3:62:df:cc:4c:f7:cd:b7:6e:52:0b:6c:6e:e0:bd:c2:
+        2d:07:d7:c0:b0:6e:43:1e:35:bc:30:01:50:f0:ff:99:23:6c:
+        18:1a:41:b6:11:d6:d4:19:61:fd:e4:77:97:1c:39:e1:57:ab:
+        c5:15:63:77:11:36:5e:74:e2:24:0b:1f:41:78:ad:b7:81:e7:
+        b4:40:66:80:f0:4b:91:a0:6d:a8:6e:3d:53:d9:8b:ce:2a:e1:
+        0b:45:65:87:a1:96:ae:ee:3e:88:d5:12:1f:78:17:ae:2c:c5:
+        73:44:d8:dc:f4:af:d8:cc:ae:4c:e1:0c:be:55:a4:99:f7:6e:
+        96:c0:c8:45:87:bf:dc:51:57:ff:9e:73:37:6a:18:9c:c3:f9:
+        22:7a:f4:b0:52:bd:fc:21:30:f8:c5:ff:1e:87:7d:ad:a2:5a:
+        35:f5:22:a8:b4:0a:76:38:e6:76:b0:98:af:1b:ec:8a:0a:43:
+        74:d2:85:34:37:84:07:e1:f6:23:b2:29:de:a6:b6:b7:4c:57:
+        7e:96:06:cb:a9:16:25:29:3a:03:2d:55:7d:a6:8c:a4:f7:9e:
+        81:c9:95:b6:7c:c1:4a:ce:94:66:0c:ca:88:eb:d2:09:f5:5b:
+        19:58:82:df:27:fd:67:95:78:b7:02:06:d5:a7:61:bd:ef:3a:
+        fc:b2:61:cd
 -----BEGIN CERTIFICATE-----
-MIICFDCCAb4CAQEwDQYJKoZIhvcNAQEEBQAwgZ4xCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhzYXd0b290
-aDETMBEGA1UECxMKY29uc3VsdGluZzEkMCIGA1UEAxMbd3d3LnNhd3Rvb3RoLWNv
-bnN1bHRpbmcuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0x
-MDA2MzAxODUyMTdaFw0xMzAzMjYxODUyMTdaMIGKMQswCQYDVQQGEwJVUzEQMA4G
-A1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjEOMAwGA1UEChMFeWFTU0wx
-EDAOBgNVBAsTB3N1cHBvcnQxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkq
-hkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-AMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpUlt3Se+s2oq5+
-Kp5+VqW2h58VxxhmfhZ34qcCAwEAATANBgkqhkiG9w0BAQQFAANBAFipmOcWUkxA
-5+FHkhkbOo+XbHu3sMsgba2100dY2OTyPjLp74d35VQ29I1QjQe0d0XqnaQzNpsL
-4HRYEcUBe00=
+MIIDkDCCAngCAQIwDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTExMDI0MTgyNzEzWhcN
+MTQwNzIwMTgyNzEzWjCBijELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmEx
+EDAOBgNVBAcTB0JvemVtYW4xDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwdTdXBw
+b3J0MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZv
+QHlhc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMCVCOFX
+QfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hnf/5cnFF194rKB+c1L4/h
+vXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/XGQ0lT+FjY1GLC2Q/rUO4
+pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bMQLRpo0YzaYduxLsXpvPo
+3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq0KGWSrzh1Bpbx6DAwWN4
+D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ6dgIvDMgs1gip6rrxOHm
+YYPF0pbf2dBPrdcCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAcU7TYt/MTPfNt25S
+C2xu4L3CLQfXwLBuQx41vDABUPD/mSNsGBpBthHW1Blh/eR3lxw54VerxRVjdxE2
+XnTiJAsfQXitt4HntEBmgPBLkaBtqG49U9mLzirhC0Vlh6GWru4+iNUSH3gXrizF
+c0TY3PSv2MyuTOEMvlWkmfdulsDIRYe/3FFX/55zN2oYnMP5Inr0sFK9/CEw+MX/
+Hod9raJaNfUiqLQKdjjmdrCYrxvsigpDdNKFNDeEB+H2I7Ip3qa2t0xXfpYGy6kW
+JSk6Ay1VfaaMpPeegcmVtnzBSs6UZgzKiOvSCfVbGViC3yf9Z5V4twIG1adhve86
+/LJhzQ==
 -----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            e9:d0:a7:5f:79:25:f4:3c
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
+        Validity
+            Not Before: Oct 24 18:18:15 2011 GMT
+            Not After : Jul 20 18:18:15 2014 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.yassl.com/emailAddress=[e-mail]
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier:
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+            X509v3 Authority Key Identifier:
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.yassl.com/emailAddress=[e-mail]
+                serial:E9:D0:A7:5F:79:25:F4:3C
+
+            X509v3 Basic Constraints:
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        5f:86:14:f4:51:8b:bc:a5:4e:30:da:5e:ac:9a:f8:6c:d9:26:
+        4b:93:f9:e3:1c:89:6f:9e:ee:b3:9d:77:3e:89:20:76:a3:e6:
+        e8:86:15:21:db:e2:33:b2:34:d5:d0:9f:f3:c1:a4:87:92:5c:
+        f9:d1:ff:30:2f:8e:03:bc:b3:3c:0c:32:a3:90:5f:1a:90:1e:
+        af:9d:f3:9e:d7:07:02:a9:7d:27:66:63:2f:af:18:d7:ac:18:
+        98:8c:83:8f:38:f3:0b:ac:36:10:75:fb:ca:76:13:50:5b:02:
+        8f:73:bf:e3:a0:ee:83:52:25:54:ce:26:ce:9c:bd:2f:79:ab:
+        1b:60:b8:92:f1:03:c0:fc:3b:08:d9:c0:ad:d5:72:08:25:80:
+        61:2d:dc:9f:a7:83:62:07:47:e0:07:4c:4b:07:30:04:a9:87:
+        1c:55:7f:07:12:d0:cb:42:5d:cb:cf:66:01:1a:17:ee:f9:0f:
+        60:b7:db:6f:68:e5:4e:41:62:6e:d3:6f:60:4f:4b:27:de:cf:
+        18:07:f1:13:5d:cb:3f:a9:25:44:da:52:5c:c8:04:e1:56:12:
+        f5:2a:90:4e:d1:e2:af:01:b5:23:a1:ec:31:da:7b:63:69:c4:
+        b8:f3:e7:ce:a1:3d:c0:db:6d:f3:b2:d9:46:c8:9f:c3:b8:70:
+        5a:1f:7f:ca
+-----BEGIN CERTIFICATE-----
+MIIEnjCCA4agAwIBAgIJAOnQp195JfQ8MA0GCSqGSIb3DQEBBQUAMIGQMQswCQYD
+VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
+A1UEChMIU2F3dG9vdGgxEzARBgNVBAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3
+dy55YXNzbC5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMB4XDTEx
+MTAyNDE4MTgxNVoXDTE0MDcyMDE4MTgxNVowgZAxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhTYXd0b290
+aDETMBEGA1UECxMKQ29uc3VsdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNvbTEd
+MBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC/DMotFLIehEJbzTgfSvJNdRDxtjWf38p9A5jTrN4DZu4q
+8diwfW4HVAsQmCFNgMsSIOfMT95FfclydzLqypC7aVIQAy+o85XF8YtiVhvvZ2+k
+EEGVrQqb46XAsNJwdlAwW6joCCx87aeieo04KRysx+3yfJWwlYJ9SVw4zXcl772A
+dVOUPD3KY1ufFbXTHRMvGdE823Y6zLh9yeXC19pAb9gh3HMbQi1TnP4a/H2rejY/
+mN6EfAVnzmoUOIep8Yy1aMtof3EgK/WgY/VWL6Mm0rdvsVoX1ziZCP6TWG/+wxNJ
+CBYLp01nAFIxZyNOmO1RRR25BNkL7Ngos0u97TZ5AgMBAAGjgfgwgfUwHQYDVR0O
+BBYEFCeOZxF0wyYdP+0zY7Ok2B0w5ejVMIHFBgNVHSMEgb0wgbqAFCeOZxF0wyYd
+P+0zY7Ok2B0w5ejVoYGWpIGTMIGQMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHTW9u
+dGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8GA1UEChMIU2F3dG9vdGgxEzARBgNV
+BAsTCkNvbnN1bHRpbmcxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkqhkiG
+9w0BCQEWDmluZm9AeWFzc2wuY29tggkA6dCnX3kl9DwwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAX4YU9FGLvKVOMNperJr4bNkmS5P54xyJb57us513
+PokgdqPm6IYVIdviM7I01dCf88Gkh5Jc+dH/MC+OA7yzPAwyo5BfGpAer53zntcH
+Aql9J2ZjL68Y16wYmIyDjzjzC6w2EHX7ynYTUFsCj3O/46Dug1IlVM4mzpy9L3mr
+G2C4kvEDwPw7CNnArdVyCCWAYS3cn6eDYgdH4AdMSwcwBKmHHFV/BxLQy0Jdy89m
+ARoX7vkPYLfbb2jlTkFibtNvYE9LJ97PGAfxE13LP6klRNpSXMgE4VYS9SqQTtHi
+rwG1I6HsMdp7Y2nEuPPnzqE9wNtt87LZRsifw7hwWh9/yg==
 
=== modified file 'extra/yassl/certs/server-key.pem'
--- extra/yassl/certs/server-key.pem	2012-08-22 01:40:20 +0000
+++ extra/yassl/certs/server-key.pem	2014-04-24 08:44:11 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----
 
=== modified file 'extra/yassl/certs/server-keyEnc.pem'
--- extra/yassl/certs/server-keyEnc.pem	2012-07-24 13:24:00 +0000
+++ extra/yassl/certs/server-keyEnc.pem	2014-04-24 08:44:11 +0000
@@ -2,11 +2,29 @@
 Proc-Type: 4,ENCRYPTED
 DEK-Info: DES-CBC,08132C1FFF5BC8CC
 
-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
+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
 -----END RSA PRIVATE KEY-----
 
=== modified file 'extra/yassl/include/cert_wrapper.hpp'
--- extra/yassl/include/cert_wrapper.hpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/include/cert_wrapper.hpp	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -89,6 +89,7 @@
     bool verifyNone_;                   // no error if verify fails
     bool failNoCert_;
     bool sendVerify_;
+    bool sendBlankCert_;
     VerifyCallback verifyCallback_;     // user verify callback
 public:
     CertManager();
@@ -116,16 +117,18 @@
     bool verifyNone() const;
     bool failNoCert() const;
     bool sendVerify() const;
+    bool sendBlankCert() const;
 
     void setVerifyPeer();
     void setVerifyNone();
     void setFailNoCert();
     void setSendVerify();
+    void setSendBlankCert();
     void setPeerX509(X509*);
     void setVerifyCallback(VerifyCallback);
 private:
     CertManager(const CertManager&);            // hide copy
-    CertManager& operator=(const CertManager&); // and assign
+    CertManager& operator=(const CertManager&); // and assigin
 };
 
 
 
=== modified file 'extra/yassl/include/openssl/crypto.h'
--- extra/yassl/include/openssl/crypto.h	2010-12-28 23:47:05 +0000
+++ extra/yassl/include/openssl/crypto.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/des.h'
--- extra/yassl/include/openssl/des.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/des.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/des_old.h'
--- extra/yassl/include/openssl/des_old.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/des_old.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/engine.h'
--- extra/yassl/include/openssl/engine.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/engine.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/err.h'
--- extra/yassl/include/openssl/err.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/err.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/evp.h'
--- extra/yassl/include/openssl/evp.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/evp.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/generate_prefix_files.pl'
--- extra/yassl/include/openssl/generate_prefix_files.pl	2013-03-20 16:54:31 +0000
+++ extra/yassl/include/openssl/generate_prefix_files.pl	2014-04-24 08:44:11 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright (C) 2006 MySQL AB
+# Use is subject to license terms
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/hmac.h'
--- extra/yassl/include/openssl/hmac.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/hmac.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/lhash.h'
--- extra/yassl/include/openssl/lhash.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/lhash.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/md4.h'
--- extra/yassl/include/openssl/md4.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/md4.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/md5.h'
--- extra/yassl/include/openssl/md5.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/md5.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/objects.h'
--- extra/yassl/include/openssl/objects.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/objects.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/opensslv.h'
--- extra/yassl/include/openssl/opensslv.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/opensslv.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/pem.h'
--- extra/yassl/include/openssl/pem.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/pem.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/pkcs12.h'
--- extra/yassl/include/openssl/pkcs12.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/pkcs12.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/prefix_crypto.h'
--- extra/yassl/include/openssl/prefix_crypto.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/prefix_crypto.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/rand.h'
--- extra/yassl/include/openssl/rand.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/rand.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/rsa.h'
--- extra/yassl/include/openssl/rsa.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/rsa.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/sha.h'
--- extra/yassl/include/openssl/sha.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/sha.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2007 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/ssl.h'
--- extra/yassl/include/openssl/ssl.h	2013-05-12 06:24:46 +0000
+++ extra/yassl/include/openssl/ssl.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.2.2"
+#define YASSL_VERSION "2.3.0"
 
 
 #if defined(__cplusplus)
 
=== modified file 'extra/yassl/include/openssl/x509.h'
--- extra/yassl/include/openssl/x509.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/x509.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/include/openssl/x509v3.h'
--- extra/yassl/include/openssl/x509v3.h	2010-12-28 18:57:23 +0000
+++ extra/yassl/include/openssl/x509v3.h	2014-04-24 08:44:11 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2006 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'extra/yassl/src/cert_wrapper.cpp'
--- extra/yassl/src/cert_wrapper.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/src/cert_wrapper.cpp	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -91,7 +91,7 @@
 //CertManager
 CertManager::CertManager()
     : peerX509_(0), selfX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
-      sendVerify_(false), verifyCallback_(0)
+      sendVerify_(false), sendBlankCert_(false), verifyCallback_(0)
 {}
 
 
@@ -143,6 +143,11 @@
     verifyNone_ = true;
 }
 
+bool CertManager::sendBlankCert() const
+{
+  return sendBlankCert_;
+}
+
 
 void CertManager::setFailNoCert()
 {
@@ -155,6 +160,11 @@
     sendVerify_ = true;
 }
 
+void CertManager::setSendBlankCert()
+{
+  sendBlankCert_ = true;
+}
+
 
 void CertManager::setVerifyCallback(VerifyCallback vc)
 {
 
=== modified file 'extra/yassl/src/crypto_wrapper.cpp'
--- extra/yassl/src/crypto_wrapper.cpp	2013-06-20 15:16:00 +0000
+++ extra/yassl/src/crypto_wrapper.cpp	2014-04-24 08:44:11 +0000
@@ -950,9 +950,9 @@
                     info->set = true;
                 }
             }
-            // get blank line
-            if (fgets(line, sizeof(line), file))
             begin = ftell(file);
+            if (fgets(line,sizeof(line), file)) // get blank line
+              begin = ftell(file);
         }
           
     }
 
=== modified file 'extra/yassl/src/handshake.cpp'
--- extra/yassl/src/handshake.cpp	2014-02-17 11:12:40 +0000
+++ extra/yassl/src/handshake.cpp	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1155,6 +1155,8 @@
 {
     if (ssl.GetError()) return;
 
+    if(ssl.getCrypto().get_certManager().sendBlankCert()) return;
+
     CertificateVerify  verify;
     verify.Build(ssl);
     RecordLayerHeader  rlHeader;
 
=== modified file 'extra/yassl/src/yassl_imp.cpp'
--- extra/yassl/src/yassl_imp.cpp	2014-02-17 11:12:40 +0000
+++ extra/yassl/src/yassl_imp.cpp	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1199,22 +1199,38 @@
 
 Certificate::Certificate(const x509* cert) : cert_(cert) 
 {
-    set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    if (cert)
+      set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    else
+      set_length(CERT_HEADER); // total blank cert size, just list header
 }
 
 
 const opaque* Certificate::get_buffer() const
 {
-    return cert_->get_buffer(); 
+    if (cert_)
+      return cert_->get_buffer();
+
+    return NULL;
 }
 
 
 // output operator for Certificate
 output_buffer& operator<<(output_buffer& output, const Certificate& cert)
 {
-    uint sz = cert.get_length() - 2 * CERT_HEADER;
+    uint sz = cert.get_length();
     opaque tmp[CERT_HEADER];
 
+    if ((int)sz > CERT_HEADER)
+      sz -= 2 * CERT_HEADER;  // actual cert, not including headers
+    else {
+      sz = 0;                 // blank cert case
+      c32to24(sz, tmp);
+      output.write(tmp, CERT_HEADER);
+
+      return output;
+    }
+
     c32to24(sz + CERT_HEADER, tmp);
     output.write(tmp, CERT_HEADER);
     c32to24(sz, tmp);
@@ -1264,9 +1280,11 @@
             ssl.SetError(YasslError(bad_input));
             return;
         }
-        x509* myCert;
-        cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
-        input.read(myCert->use_buffer(), myCert->get_length());
+        if (cert_sz) {
+          x509* myCert;
+          cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
+          input.read(myCert->use_buffer(), myCert->get_length());
+        }
 
         list_sz -= cert_sz + CERT_HEADER;
     }
@@ -1969,9 +1987,9 @@
 {
     CertManager& cm = ssl.useCrypto().use_certManager();
 
-    // make sure user provided cert and key before sending and using
-    if (cm.get_cert() && cm.get_privateKey())
-        cm.setSendVerify();
+    cm.setSendVerify();
+    if (cm.get_cert() == NULL || cm.get_privateKey() == NULL)
+      cm.setSendBlankCert();  // send blank cert, OpenSSL requires now
 }
 
 
 
=== modified file 'extra/yassl/taocrypt/include/integer.hpp'
--- extra/yassl/taocrypt/include/integer.hpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/include/integer.hpp	2014-04-24 08:44:11 +0000
@@ -46,6 +46,14 @@
 
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
+    #if defined(__GNUC__) && (__GNUC__ >= 4)
+        // GCC 4 or greater optimizes too much inline on recursive for bigint,
+        // -O3 just as fast without asm here anyway
+        #undef TAOCRYPT_X86ASM_AVAILABLE
+    #endif
+#endif
+
+#ifdef TAOCRYPT_X86ASM_AVAILABLE
 
 #ifdef _M_IX86
     #if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || \
 
=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
--- extra/yassl/taocrypt/include/misc.hpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/include/misc.hpp	2014-04-24 08:44:11 +0000
@@ -124,15 +124,22 @@
 
 
 // no gas on these systems ?, disable for now
-#if defined(__sun__) || defined (__APPLE__)
+#if defined(__sun__)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
 // icc problem with -03 and integer, disable for now
 #if defined(__INTEL_COMPILER)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
+// indpedent of build system, unless ia32 asm is enabled disable it
+#if !defined(TAOCRYPT_ENABLE_X86ASM)
+    #undef  TAOCRYPT_DISABLE_X86ASM
+    #define TAOCRYPT_DISABLE_X86ASM
+#endif
 
 // Turn on ia32 ASM for Big Integer
 // CodeWarrior defines _MSC_VER
 
=== modified file 'extra/yassl/taocrypt/src/aes.cpp'
--- extra/yassl/taocrypt/src/aes.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/aes.cpp	2014-04-24 08:44:11 +0000
@@ -52,7 +52,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -65,7 +65,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+    else {
             while (blocks--) {
                 AsmDecrypt(in, out, (void*)Td0);
                 
@@ -78,6 +79,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+       }
    }
 }
 
@@ -452,27 +454,31 @@
 
 #if defined(DO_AES_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    sub   esp, 4                        )   \
-            AS2(    movd  mm7, ebp                      )   \
-            AS2(    mov   [ebp - 4], esi                )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-            AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm7, ebp;" \
+            "movd mm4, eax;" \
+            "mov  ebp, edx;"  \
+            "sub  esp, 4;"
 
         #define EPILOG()  \
-            AS2(    mov  esi, [ebp - 4]             )   \
-            AS2(    mov  esp, ebp                   )   \
-            AS2(    movd ebx, mm4                   )   \
-            AS2(    movd edi, mm3                   )   \
-            AS1(    emms                            )   \
-            asm(".att_syntax");
+            "add esp, 4;" \
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
+                : "%edi", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -504,6 +510,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void AES::AsmEncrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -537,7 +545,11 @@
     AS2(    xor   ecx, DWORD PTR [edi +  8]          )   // s2
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
-    AS1(loop1:                                                          )
+#ifdef _MSC_VER
+    AS1( loop1: )  // loop1
+#else
+    AS1(1:  )      // loop1
+#endif
             /* Put0 (mm0) =  
                 Te0[get0,rs 24] ^
                 Te1[get1,rs 16] ^
@@ -652,7 +664,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop1                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop1)  // loop1
+#else
+    AS1(    jnz   1b )    // loop1
+#endif
 
             // last round
             /*
@@ -799,9 +815,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                       )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov  esi, DWORD PTR [ebp + 12]      )   //  outBlock
     #endif
 
     AS1(    bswap ecx                                                   )
@@ -818,7 +834,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline)) 
 #endif
 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -853,7 +871,11 @@
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
 
-    AS1(loop2:                                                          )
+#ifdef _MSC_VER
+    AS1( loop2: )  // loop2
+#else
+    AS1(2:  )      // loop2
+#endif
        /*   Put0 (mm0) =
             Td0[GETBYTE(get0, rs24)] ^
             Td1[GETBYTE(get3, rs16)] ^
@@ -964,7 +986,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop2                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop2)  // loop2
+#else
+    AS1(    jnz   2b )    // loop2
+#endif
 
             // last round
             /*
@@ -1114,9 +1140,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                        )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov esi,  DWORD PTR [ebp + 12]       )   //  outBlock
     #endif
     AS2(    mov DWORD PTR [esi],      eax                               )
     AS2(    mov DWORD PTR [esi +  4], ebx                               )
 
=== modified file 'extra/yassl/taocrypt/src/arc4.cpp'
--- extra/yassl/taocrypt/src/arc4.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/arc4.cpp	2014-04-24 08:44:11 +0000
@@ -111,28 +111,27 @@
 void ARC4::AsmProcess(byte* out, const byte* in, word32 length)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 16]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "mov ebp, eax;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (out), "S" (in), "a" (length) \
+            : "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -178,7 +177,11 @@
     AS2(    movzx  eax, BYTE PTR [ebp + ecx]    )
 
 
-AS1( begin:                             )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // y = (y+a) & 0xff;
     AS2(    add    edx, eax                     )
@@ -215,7 +218,11 @@
     AS1(    inc    edi                          )
 
     AS1(    dec    DWORD PTR [esp]              )
-    AS1(    jnz    begin                        )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     // write back to x_ and y_
@@ -225,6 +232,8 @@
 
 AS1( nothing:                           )
 
+    // inline adjust
+    AS2(    add   esp, 4               )   // fix room on stack
 
     EPILOG()
 }
 
=== modified file 'extra/yassl/taocrypt/src/blowfish.cpp'
--- extra/yassl/taocrypt/src/blowfish.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/blowfish.cpp	2014-04-24 08:44:11 +0000
@@ -54,7 +54,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in + 4);
@@ -66,7 +66,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmProcess(in, out);
                 
@@ -78,6 +79,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -222,23 +224,26 @@
 
 #if defined(DO_BLOWFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;"
+        #define EPILOG()  \
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "a" (outBlock) \
+                : "%edi", "%edx", "memory", "cc" \
+        );
 
-        #define EPILOG()  \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -286,7 +291,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void Blowfish::AsmProcess(const byte* inBlock, byte* outBlock) const
 {
@@ -335,7 +342,7 @@
     #endif
 
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
 
=== modified file 'extra/yassl/taocrypt/src/des.cpp'
--- extra/yassl/taocrypt/src/des.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/des.cpp	2014-04-24 08:44:11 +0000
@@ -473,7 +473,7 @@
 
    uses ecx
 */
-#define AsmIPERM() {\
+#define AsmIPERM() \
     AS2(    rol   ebx, 4                        )   \
     AS2(    mov   ecx, eax                      )   \
     AS2(    xor   ecx, ebx                      )   \
@@ -504,7 +504,7 @@
     AS2(    and   ecx, 0xaaaaaaaa               )   \
     AS2(    xor   eax, ecx                      )   \
     AS2(    rol   eax, 1                        )   \
-    AS2(    xor   ebx, ecx                      ) }
+    AS2(    xor   ebx, ecx                      )
 
 
 /* Uses FPERM algorithm from above
@@ -514,7 +514,7 @@
 
    uses ecx
 */
-#define AsmFPERM()    {\
+#define AsmFPERM()    \
     AS2(    ror  ebx, 1                     )    \
     AS2(    mov  ecx, eax                   )    \
     AS2(    xor  ecx, ebx                   )    \
@@ -545,7 +545,7 @@
     AS2(    and  ecx, 0xf0f0f0f0            )    \
     AS2(    xor  eax, ecx                   )    \
     AS2(    xor  ebx, ecx                   )    \
-    AS2(    ror  eax, 4                     ) }
+    AS2(    ror  eax, 4                     )
 
 
 
@@ -641,32 +641,34 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline)) 
 #endif
 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
-
-    asm(".intel_syntax noprefix");
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   edx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
-
-    // ebp restored at end
-    #define EPILOG()    \
-        AS2(    movd  edi, mm3                      )   \
-        AS2(    movd  ebx, mm4                      )   \
-        AS2(    movd  esi, mm5                      )   \
-        AS1(    emms                                )   \
-        asm(".att_syntax");
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "movd mm6, ebp;" \
+        "movd mm7, ecx;" \
+        "mov  ebp, eax;"
+    #define EPILOG()  \
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            :  \
+            : "d" (this), "S" (in), "a" (box), "c" (out) \
+            : "%edi", "memory", "cc" \
+    );
 
 #else
     #define AS1(x)      __asm x
@@ -756,7 +758,7 @@
     AS1(    bswap eax                           )
 
 #ifdef __GNUC__
-    AS2(    mov   esi, DWORD PTR [ebp +  16]    )   // outBlock
+    AS2(    movd  esi, mm7   )   // outBlock
 #else
     AS2(    mov   esi, DWORD PTR [ebp +  12]    )   // outBlock
 #endif
 
=== modified file 'extra/yassl/taocrypt/src/integer.cpp'
--- extra/yassl/taocrypt/src/integer.cpp	2013-06-20 15:16:00 +0000
+++ extra/yassl/taocrypt/src/integer.cpp	2014-04-24 08:44:11 +0000
@@ -50,7 +50,9 @@
         #include <emmintrin.h>
     #endif
 #elif defined(_MSC_VER) && defined(_M_IX86)
-    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
+/*    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
+     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
+*/
     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
 #elif defined(__GNUC__) && defined(__i386__)
 /*   #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
@@ -68,7 +70,7 @@
 CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                            size_type n, const void *)
 {
-    if (n > max_size())
+    if (n > this->max_size())
         return 0;
     if (n == 0)
         return 0;
 
=== modified file 'extra/yassl/taocrypt/src/md5.cpp'
--- extra/yassl/taocrypt/src/md5.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/md5.cpp	2014-04-24 08:44:11 +0000
@@ -223,32 +223,32 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void MD5::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -294,7 +294,11 @@
     AS2(    mov   ecx, [esi +  8]       )   // c
     AS2(    mov   edx, [esi + 12]       )   // d
   
-AS1(loopStart:)
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // set up
     AS2(    mov   esi, ecx      )
@@ -389,7 +393,11 @@
     AS2(    movd  ebp, mm2              )   // times
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     EPILOG()
 
=== modified file 'extra/yassl/taocrypt/src/rabbit.cpp'
--- extra/yassl/taocrypt/src/rabbit.cpp	2013-02-26 05:45:28 +0000
+++ extra/yassl/taocrypt/src/rabbit.cpp	2014-04-24 08:44:11 +0000
@@ -198,7 +198,6 @@
 {
     /* Temporary variables */
     word32 i;
-    byte buffer[16];
 
     /* Encrypt/decrypt all full blocks */
     while (msglen >= 16) {
@@ -227,17 +226,23 @@
 
     /* Encrypt/decrypt remaining data */
     if (msglen) {
+
+      word32 tmp[4];
+      byte*  buffer = (byte*)tmp;
+
+      memset(tmp, 0, sizeof(tmp));   /* help static analysis */
+
         /* Iterate the system */
         NextState(Work);
 
         /* Generate 16 bytes of pseudo-random data */
-        *(word32*)(buffer+ 0) = LITTLE32(workCtx_.x[0] ^
+        tmp[0] = LITTLE32(workCtx_.x[0] ^
                   (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
-        *(word32*)(buffer+ 4) = LITTLE32(workCtx_.x[2] ^ 
+        tmp[1] = LITTLE32(workCtx_.x[2] ^
                   (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
-        *(word32*)(buffer+ 8) = LITTLE32(workCtx_.x[4] ^ 
+        tmp[2] = LITTLE32(workCtx_.x[4] ^
                   (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
-        *(word32*)(buffer+12) = LITTLE32(workCtx_.x[6] ^ 
+        tmp[3] = LITTLE32(workCtx_.x[6] ^
                   (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
 
         /* Encrypt/decrypt the data */
 
=== modified file 'extra/yassl/taocrypt/src/ripemd.cpp'
--- extra/yassl/taocrypt/src/ripemd.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/ripemd.cpp	2014-04-24 08:44:11 +0000
@@ -511,27 +511,26 @@
 void RIPEMD160::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   edx, DWORD PTR [ebp + 16]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "d" (times) \
+            : "%esi", "%eax", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -569,7 +568,11 @@
     AS2(    sub   esp, 24               )   // make room for tmp a1 - e1
     AS2(    movd  mm1, esi              )   // store digest_
     
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     AS2(    movd  mm2, edx              )   // store times_
 
@@ -821,8 +824,14 @@
     AS2(    movd  edx, mm2              )   // times
     AS2(    movd  edi, mm0              )   // data, already advanced
     AS1(    dec   edx                   )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust
+    AS2(    add   esp, 24               )   // fix room on stack
 
     EPILOG()
 }
 
=== modified file 'extra/yassl/taocrypt/src/sha.cpp'
--- extra/yassl/taocrypt/src/sha.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/sha.cpp	2014-04-24 08:44:11 +0000
@@ -760,32 +760,33 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void SHA::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
 
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+               "emms;" \
+               ".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -826,7 +827,11 @@
 
     AS2(    sub   esp, 68               )   // make room on stack
 
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back
+#endif
 
     // byte reverse 16 words of input, 4 at a time, put on stack for W[]
 
@@ -1011,8 +1016,14 @@
     
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust
+    AS2(    add   esp, 68               )   // fix room on stack
 
     EPILOG()
 }
 
=== modified file 'extra/yassl/taocrypt/src/twofish.cpp'
--- extra/yassl/taocrypt/src/twofish.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/src/twofish.cpp	2014-04-24 08:44:11 +0000
@@ -55,7 +55,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -68,7 +68,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmDecrypt(in, out);
                
@@ -82,6 +83,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -272,25 +274,28 @@
 
 #if defined(DO_TWOFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    movd  mm6, ebp                      )   \
-            AS2(    mov   edi, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;" \
+            "movd mm6, ebp;"
 
         #define EPILOG()  \
-            AS2(    movd esp, mm6                  )   \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
+            "pop ebp;" \
+            "pop ebx;" \
+                   "emms;" \
+                   ".att_syntax;" \
+                : \
+                : "D" (this), "S" (inBlock), "a" (outBlock) \
+                : "%ecx", "%edx", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -424,6 +429,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmEncrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -472,7 +479,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+       AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
@@ -493,7 +500,9 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmDecrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -542,7 +551,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd   edi, mm3                 ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
 
=== modified file 'extra/yassl/taocrypt/test/test.cpp'
--- extra/yassl/taocrypt/test/test.cpp	2013-05-12 06:24:46 +0000
+++ extra/yassl/taocrypt/test/test.cpp	2014-04-24 08:44:11 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1165,12 +1165,12 @@
     RSAES_Encryptor enc(priv);
     byte message[] = "Everyone gets Friday off.";
     const word32 len = (word32)strlen((char*)message);
-    byte cipher[64];
+    byte cipher[512];
     enc.Encrypt(message, len, cipher, rng);
 
     RSAES_Decryptor dec(priv);
-    byte plain[64];
-    dec.Decrypt(cipher, sizeof(plain), plain, rng);
+    byte plain[512];
+    dec.Decrypt(cipher, priv.FixedCiphertextLength(), plain, rng);
 
     if (memcmp(plain, message, len))
         return -70;
@@ -1242,11 +1242,11 @@
 int dsa_test()
 {
     Source source;
-    FileSource("../certs/dsa512.der", source);
+    FileSource("../certs/dsa1024.der", source);
     if (source.size() == 0) {
-        FileSource("../../certs/dsa512.der", source);  // for testsuite
+        FileSource("../../certs/dsa1024.der", source);  // for testsuite
         if (source.size() == 0) {
-            FileSource("../../../certs/dsa512.der", source); // win32 Debug dir
+            FileSource("../../../certs/dsa1024.der", source); // win32 Debug dir
             if (source.size() == 0)
                 err_sys("where's your certs dir?", -89);
         }
 
=== modified file 'include/atomic/nolock.h'
--- include/atomic/nolock.h	2014-01-06 05:23:19 +0000
+++ include/atomic/nolock.h	2014-04-24 08:44:11 +0000
@@ -1,7 +1,7 @@
 #ifndef ATOMIC_NOLOCK_INCLUDED
 #define ATOMIC_NOLOCK_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
+/* Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. reserved.
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -27,7 +27,7 @@
   neither Visual C++ or gcc we still choose the Solaris
   implementation on Solaris (mainly for SunStudio compilers).
 */
-#  if defined(_MSV_VER)
+#  if defined(_MSC_VER)
 #    include "generic-msvc.h"
 #  elif __GNUC__
 #    if defined(HAVE_SOLARIS_ATOMIC)
 
=== modified file 'include/my_aes.h'
--- include/my_aes.h	2013-06-20 15:16:00 +0000
+++ include/my_aes.h	2014-04-24 08:44:11 +0000
@@ -1,7 +1,7 @@
 #ifndef MY_AES_INCLUDED
 #define MY_AES_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
 
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -22,46 +22,108 @@
 
 C_MODE_START
 
-#define AES_KEY_LENGTH 128		/* Must be 128 192 or 256 */
-
-/*
-  my_aes_encrypt	- Crypt buffer with AES encryption algorithm.
-  source		- Pointer to data for encryption
-  source_length		- size of encryption data
-  dest			- buffer to place encrypted data (must be large enough)
-  key			- Key to be used for encryption
-  kel_length		- Length of the key. Will handle keys of any length
-
-  returns  - size of encrypted data, or negative in case of error.
-*/
-
-int my_aes_encrypt(const char *source, int source_length, char *dest,
-		   const char *key, int key_length);
-
-/*
-  my_aes_decrypt	- DeCrypt buffer with AES encryption algorithm.
-  source		- Pointer to data for decryption
-  source_length		- size of encrypted data
-  dest			- buffer to place decrypted data (must be large enough)
-  key			- Key to be used for decryption
-  kel_length		- Length of the key. Will handle keys of any length
-
-  returns  - size of original data, or negative in case of error.
-*/
-
-
-int my_aes_decrypt(const char *source, int source_length, char *dest,
-		   const char *key, int key_length);
-
-/*
-  my_aes_get_size - get size of buffer which will be large enough for encrypted
-		    data
-  source_length   -  length of data to be encrypted
-
-  returns  - size of buffer required to store encrypted data
-*/
-
-int my_aes_get_size(int source_length);
+/** AES IV size is 16 bytes for all supported ciphers except ECB */
+#define MY_AES_IV_SIZE 16
+
+
+/** Supported AES cipher/block mode combos */
+enum my_aes_opmode
+{
+   my_aes_128_ecb,
+   my_aes_192_ecb,
+   my_aes_256_ecb,
+   my_aes_128_cbc,
+   my_aes_192_cbc,
+   my_aes_256_cbc,
+#ifndef HAVE_YASSL
+   my_aes_128_cfb1,
+   my_aes_192_cfb1,
+   my_aes_256_cfb1,
+   my_aes_128_cfb8,
+   my_aes_192_cfb8,
+   my_aes_256_cfb8,
+   my_aes_128_cfb128,
+   my_aes_192_cfb128,
+   my_aes_256_cfb128,
+   my_aes_128_ofb,
+   my_aes_192_ofb,
+   my_aes_256_ofb,
+#endif
+};
+
+#define MY_AES_BEGIN my_aes_128_ecb
+#ifdef HAVE_YASSL
+#define MY_AES_END my_aes_256_cbc
+#else
+#define MY_AES_END my_aes_256_ofb
+#endif
+
+/* If bad data discovered during decoding */
+#define MY_AES_BAD_DATA  -1
+
+/** String representations of the supported AES modes. Keep in sync with my_aes_opmode */
+extern const char *my_aes_opmode_names[];
+
+/**
+  Encrypt a buffer using AES
+
+  @param source         [in]  Pointer to data for encryption
+  @param source_length  [in]  Size of encryption data
+  @param dest           [out] Buffer to place encrypted data (must be large enough)
+  @param key            [in]  Key to be used for encryption
+  @param key_length     [in]  Length of the key. Will handle keys of any length
+  @param mode           [in]  encryption mode
+  @param iv             [in]  16 bytes initialization vector if needed. Otherwise NULL
+  @return              size of encrypted data, or negative in case of error
+*/
+
+int my_aes_encrypt(const unsigned char *source, uint32 source_length,
+                   unsigned char *dest,
+		   const unsigned char *key, uint32 key_length,
+                   enum my_aes_opmode mode, const unsigned char *iv);
+
+/**
+  Decrypt an AES encrypted buffer
+
+  @param source         Pointer to data for decryption
+  @param source_length  size of encrypted data
+  @param dest           buffer to place decrypted data (must be large enough)
+  @param key            Key to be used for decryption
+  @param key_length     Length of the key. Will handle keys of any length
+  @param mode           encryption mode
+  @param iv             16 bytes initialization vector if needed. Otherwise NULL
+  @return size of original data.
+*/
+
+
+int my_aes_decrypt(const unsigned char *source, uint32 source_length,
+                   unsigned char *dest,
+ 		   const unsigned char *key, uint32 key_length,
+                   enum my_aes_opmode mode, const unsigned char *iv);
+
+/**
+  Calculate the size of a buffer large enough for encrypted data
+
+  @param source_length  length of data to be encrypted
+  @param mode           encryption mode
+  @return               size of buffer required to store encrypted data
+*/
+
+int my_aes_get_size(uint32 source_length, enum my_aes_opmode mode);
+
+/**
+  Return true if the AES cipher and block mode requires an IV
+
+  SYNOPSIS
+  my_aes_needs_iv()
+  @param mode           encryption mode
+
+  @retval TRUE   IV needed
+  @retval FALSE  IV not needed
+*/
+
+my_bool my_aes_needs_iv(my_aes_opmode opmode);
+
 
 C_MODE_END
 
 
=== modified file 'include/my_base.h'
--- include/my_base.h	2014-03-26 10:11:16 +0000
+++ include/my_base.h	2014-04-24 08:44:11 +0000
@@ -204,7 +204,9 @@
     Prepare table for export
     (e.g. quiesce the table and write table metadata).
   */
-  HA_EXTRA_EXPORT
+  HA_EXTRA_EXPORT,
+  /** Do secondary sort by handler::ref (rowid) after key sort. */
+  HA_EXTRA_SECONDARY_SORT_ROWID
 };
 
 /* Compatible option, to be deleted in 6.0 */
@@ -485,7 +487,8 @@
 #define HA_ERR_FTS_EXCEED_RESULT_CACHE_LIMIT  188 /* FTS query exceeds result cache limit */
 #define HA_ERR_TEMP_FILE_WRITE_FAILURE	189	/* Temporary file write failure */
 #define HA_ERR_INNODB_FORCED_RECOVERY 190	/* Innodb is in force recovery mode */
-#define HA_ERR_LAST 190    /* Copy of last error nr */
+#define HA_ERR_FTS_TOO_MANY_WORDS_IN_PHRASE	191 /* Too many words in a phrase */
+#define HA_ERR_LAST               191    /* Copy of last error nr */
 
 /* Number of different errors */
 #define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)
 
=== modified file 'include/my_rnd.h'
--- include/my_rnd.h	2012-02-15 18:54:54 +0000
+++ include/my_rnd.h	2014-04-24 08:44:11 +0000
@@ -30,6 +30,7 @@
 #endif
 
 double my_rnd_ssl(struct rand_struct *rand_st);
+int my_rand_buffer(unsigned char *buffer, size_t buffer_size);
 
 #ifdef __cplusplus
 }
 
=== modified file 'include/mysql_version.h.in'
--- include/mysql_version.h.in	2013-02-26 05:35:17 +0000
+++ include/mysql_version.h.in	2014-04-24 08:44:11 +0000
@@ -1,6 +1,7 @@
-/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
-   Use is subject to license terms
-   This file is public domain and comes with NO WARRANTY of any kind */
+/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB
+   & Detron HB, 1996, 1999-2004, 2007 MySQL AB.
+   This file is public domain and comes with NO WARRANTY of any kind
+*/
 
 /* Version numbers for protocol & mysqld */
 
 
=== modified file 'include/queues.h'
--- include/queues.h	2013-03-19 12:38:59 +0000
+++ include/queues.h	2014-04-24 08:44:11 +0000
@@ -44,6 +44,7 @@
 #define queue_element(queue,index) ((queue)->root[index+1])
 #define queue_end(queue) ((queue)->root[(queue)->elements])
 #define queue_replaced(queue) _downheap(queue,1)
+#define queue_set_compare(queue, cmp) (queue)->compare= cmp
 #define queue_set_cmp_arg(queue, set_arg) (queue)->first_cmp_arg= set_arg
 #define queue_set_max_at_top(queue, set_arg) \
   (queue)->max_at_top= set_arg ? -1 : 1
 
=== modified file 'include/t_ctype.h'
--- include/t_ctype.h	2013-03-20 05:56:02 +0000
+++ include/t_ctype.h	2014-04-24 08:44:11 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2000 MySQL AB
+   Use is subject to license terms
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'libmysql/libmysql.c'
--- libmysql/libmysql.c	2014-02-17 11:12:40 +0000
+++ libmysql/libmysql.c	2014-04-24 08:44:11 +0000
@@ -4332,7 +4332,27 @@
       /* end of data */
       *prev_ptr= 0;
       mysql->warning_count= uint2korr(cp+1);
-      mysql->server_status= uint2korr(cp+3);
+      /*
+        OUT parameters result sets has SERVER_PS_OUT_PARAMS and
+        SERVER_MORE_RESULTS_EXISTS flags in first EOF_Packet only.
+        Last EOF_Packet of OUT parameters result sets have no
+        SERVER_MORE_RESULTS_EXISTS flag as described here:
+        http://dev.mysql.com/doc/internals/en/stored-procedures.html#out-parameter-set
+        Following code reads last EOF_Packet of result set and can clear
+        those flags in server_status if we don't preserve them.
+        Without SERVER_MORE_RESULTS_EXISTS flag mysql_stmt_next_result fails
+        to read OK_Packet after OUT parameters result set.
+        So we need to preserve SERVER_MORE_RESULTS_EXISTS flag for OUT
+        parameters result set.
+      */
+      if (mysql->server_status & SERVER_PS_OUT_PARAMS)
+      {
+        mysql->server_status= uint2korr(cp+3)
+          | SERVER_PS_OUT_PARAMS
+          | (mysql->server_status & SERVER_MORE_RESULTS_EXISTS);
+      }
+      else
+        mysql->server_status= uint2korr(cp+3);
       DBUG_PRINT("info",("status: %u  warning_count: %u",
                          mysql->server_status, mysql->warning_count));
       DBUG_RETURN(0);
 
=== modified file 'libmysqld/CMakeLists.txt'
--- libmysqld/CMakeLists.txt	2013-09-09 15:24:45 +0000
+++ libmysqld/CMakeLists.txt	2014-04-24 08:44:11 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -132,3 +132,37 @@
   MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}
   COMPONENT Embedded)
 ENDIF()
+
+OPTION(WITH_EMBEDDED_SHARED_LIBRARY
+  "Generate shared version of embedded library (in addition to the static one)"
+  OFF)
+IF(WITH_EMBEDDED_SHARED_LIBRARY)
+  MERGE_LIBRARIES(libmysqld SHARED
+    mysqlserver
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    OUTPUT_NAME "mysqld"
+    COMPONENT Embedded)
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES
+    VERSION "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0"
+    SOVERSION "${SHARED_LIB_MAJOR_VERSION}"
+    )
+
+  GET_TARGET_PROPERTY(libmysqld_link_flags libmysqld LINK_FLAGS)
+  IF(NOT libmysqld_link_flag)
+    SET(libmysqld_link_flags)
+  ENDIF()
+  SET(libmysqld_link_flags
+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${libmysqld_link_flags}")
+  SET_TARGET_PROPERTIES(libmysqld
+    PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+
+  IF(LINK_FLAG_NO_UNDEFINED)
+    SET(libmysqld_link_flags
+      "${libmysqld_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+    SET_TARGET_PROPERTIES(libmysqld
+      PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+  ENDIF()
+
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ENDIF()
 
=== modified file 'libmysqld/examples/test-run'
--- libmysqld/examples/test-run	2013-03-20 16:54:31 +0000
+++ libmysqld/examples/test-run	2014-04-24 08:44:11 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2001, 2006 MySQL AB
+# Use is subject to license terms
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'man/comp_err.1'
--- man/comp_err.1	2014-03-03 17:51:33 +0000
+++ man/comp_err.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -124,8 +124,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:O,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:O,/tmp/comp_err\&.trace\*(Aq\&.
+d:t:O,\fIfile_name\fR\&. The default is
+d:t:O,/tmp/comp_err\&.trace\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/innochecksum.1'
--- man/innochecksum.1	2014-03-03 17:51:33 +0000
+++ man/innochecksum.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/msql2mysql.1'
--- man/msql2mysql.1	2014-03-03 17:51:33 +0000
+++ man/msql2mysql.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmsql2mysql\fR\fB\fIC\-source\-file\fR\fR\fB\ \&.\&.\&.\fR\ 'u
 \fBmsql2mysql\fR\fB\fIC\-source\-file\fR\fR\fB \&.\&.\&.\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 Initially, the MySQL C API was developed to be very similar to that for the mSQL database system\&. Because of this, mSQL programs often can be converted relatively easily for use with MySQL by changing the names of the C API functions\&.
 .PP
 
=== modified file 'man/my_print_defaults.1'
--- man/my_print_defaults.1	2014-03-03 17:51:33 +0000
+++ man/my_print_defaults.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,8 +115,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/my_print_defaults\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/my_print_defaults\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -168,7 +168,14 @@
 .sp
 Read options from the named login path in the
 \&.mylogin\&.cnf
-login file\&. See
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
 \fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
 .RE
 .sp
 
=== modified file 'man/myisam_ftdump.1'
--- man/myisam_ftdump.1	2014-03-03 17:51:33 +0000
+++ man/myisam_ftdump.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/myisamchk.1'
--- man/myisamchk.1	2014-03-03 17:51:33 +0000
+++ man/myisamchk.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -308,8 +308,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/myisamchk\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/myisamchk\&.trace\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/myisamlog.1'
--- man/myisamlog.1	2014-03-03 17:51:33 +0000
+++ man/myisamlog.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/myisampack.1'
--- man/myisampack.1	2014-03-03 17:51:33 +0000
+++ man/myisampack.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -189,8 +189,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysql-stress-test.pl.1'
--- man/mysql-stress-test.pl.1	2014-03-03 17:51:33 +0000
+++ man/mysql-stress-test.pl.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/10/2014
+.\"      Date: 03/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "01/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "03/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql-test-run.pl.1'
--- man/mysql-test-run.pl.1	2014-03-03 17:51:33 +0000
+++ man/mysql-test-run.pl.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/10/2014
+.\"      Date: 03/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "01/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "03/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql.1'
--- man/mysql.1	2014-03-03 17:51:33 +0000
+++ man/mysql.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -394,8 +394,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysql\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysql\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -525,7 +525,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
 .RE
 .sp
 .RS 4
@@ -696,6 +696,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: login-path option
+.\" login-path option: mysql
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: named-commands option
 .\" named-commands option: mysql
 \fB\-\-named\-commands\fR,
@@ -1130,7 +1155,8 @@
 \fBNote\fR
 .ps -1
 .br
-Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&.
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
 .sp .5v
 .RE
 .RE
@@ -1156,7 +1182,7 @@
 For additional discussion regarding use of the
 sha256_password
 plugin, including how to get the RSA public key, see
-Section\ \&6.3.7.4, \(lqThe SHA-256 Authentication Plugin\(rq\&.
+Section\ \&6.3.8.4, \(lqThe SHA-256 Authentication Plugin\(rq\&.
 .sp
 This option is available only if MySQL was built using OpenSSL\&. It was added in MySQL 5\&.6\&.6 under the name
 \fB\-\-server\-public\-key\fR
@@ -1281,7 +1307,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysql.server.1'
--- man/mysql.server.1	2014-03-03 17:51:33 +0000
+++ man/mysql.server.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -57,7 +57,7 @@
 If you install MySQL from a source distribution or using a binary distribution format that does not install
 \fBmysql\&.server\fR
 automatically, you can install it manually\&. Instructions are provided in
-Section\ \&2.10.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
+Section\ \&2.9.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
 .PP
 \fBmysql\&.server\fR
 reads options from the
 
=== modified file 'man/mysql_client_test.1'
--- man/mysql_client_test.1	2014-03-03 17:51:33 +0000
+++ man/mysql_client_test.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/10/2014
+.\"      Date: 03/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "01/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "03/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_config.1'
--- man/mysql_config.1	2014-03-03 17:51:33 +0000
+++ man/mysql_config.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_config_editor.1'
--- man/mysql_config_editor.1	2014-02-17 11:12:40 +0000
+++ man/mysql_config_editor.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config_editor\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG_EDIT" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG_EDIT" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -724,8 +724,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysql_config_editor\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysql_convert_table_format.1'
--- man/mysql_convert_table_format.1	2014-03-03 17:51:33 +0000
+++ man/mysql_convert_table_format.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmysql_convert_table_format\ [\fR\fB\fIoptions\fR\fR\fB]\ \fR\fB\fIdb_name\fR\fR\ 'u
 \fBmysql_convert_table_format [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIdb_name\fR\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 \fBmysql_convert_table_format\fR
 converts the tables in a database to use a particular storage engine (MyISAM
@@ -44,7 +60,7 @@
 and
 DBD::mysql
 Perl modules be installed (see
-Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
+Section\ \&2.12, \(lqPerl Installation Notes\(rq)\&.
 .PP
 Invoke
 \fBmysql_convert_table_format\fR
 
=== modified file 'man/mysql_find_rows.1'
--- man/mysql_find_rows.1	2014-03-03 17:51:33 +0000
+++ man/mysql_find_rows.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmysql_find_rows\ [\fR\fB\fIoptions\fR\fR\fB]\ [\fR\fB\fIfile_name\fR\fR\fB\ \&.\&.\&.]\fR\ 'u
 \fBmysql_find_rows [\fR\fB\fIoptions\fR\fR\fB] [\fR\fB\fIfile_name\fR\fR\fB \&.\&.\&.]\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 \fBmysql_find_rows\fR
 reads files containing SQL statements and extracts statements that match a given regular expression or that contain
 
=== modified file 'man/mysql_fix_extensions.1'
--- man/mysql_fix_extensions.1	2014-03-03 17:51:33 +0000
+++ man/mysql_fix_extensions.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmysql_fix_extensions\ \fR\fB\fIdata_dir\fR\fR\ 'u
 \fBmysql_fix_extensions \fR\fB\fIdata_dir\fR\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 \fBmysql_fix_extensions\fR
 converts the extensions for
 
=== modified file 'man/mysql_install_db.1'
--- man/mysql_install_db.1	2014-03-03 17:51:33 +0000
+++ man/mysql_install_db.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -295,7 +295,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-Remove the anonymous\-user MySQL accounts\&.
+Not create anonymous\-user MySQL accounts\&.
 .RE
 .sp
 As a result of these actions, it is necessary after installation to start the server, connect as
 
=== modified file 'man/mysql_plugin.1'
--- man/mysql_plugin.1	2014-03-03 17:51:33 +0000
+++ man/mysql_plugin.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_plugin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_secure_installation.1'
--- man/mysql_secure_installation.1	2014-03-03 17:51:33 +0000
+++ man/mysql_secure_installation.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -90,7 +90,7 @@
 .PP
 \fBmysql_secure_installation\fR
 helps you implement security recommendations similar to those described at
-Section\ \&2.10.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
+Section\ \&2.9.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
 .PP
 Invoke
 \fBmysql_secure_installation\fR
 
=== modified file 'man/mysql_setpermission.1'
--- man/mysql_setpermission.1	2014-03-03 17:51:33 +0000
+++ man/mysql_setpermission.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmysql_setpermission\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
 \fBmysql_setpermission [\fR\fB\fIoptions\fR\fR\fB]\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 \fBmysql_setpermission\fR
 is a Perl script that was originally written and contributed by Luuk de Boer\&. It interactively sets permissions in the MySQL grant tables\&.
@@ -43,7 +59,7 @@
 and
 DBD::mysql
 Perl modules be installed (see
-Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
+Section\ \&2.12, \(lqPerl Installation Notes\(rq)\&.
 .PP
 Invoke
 \fBmysql_setpermission\fR
 
=== modified file 'man/mysql_tzinfo_to_sql.1'
--- man/mysql_tzinfo_to_sql.1	2014-03-03 17:51:33 +0000
+++ man/mysql_tzinfo_to_sql.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_upgrade.1'
--- man/mysql_upgrade.1	2014-03-03 17:51:33 +0000
+++ man/mysql_upgrade.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -48,7 +48,7 @@
 If
 \fBmysql_upgrade\fR
 finds that a table has a possible incompatibility, it performs a table check and, if problems are found, attempts a table repair\&. If the table cannot be repaired, see
-Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.10.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&.
 .if n \{\
 .sp
@@ -88,7 +88,7 @@
 .PP
 Some upgrade incompatibilities may require special handling before you upgrade your MySQL installation and run
 \fBmysql_upgrade\fR\&. See
-Section\ \&2.11.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
+Section\ \&2.10.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
 .sp .5v
 .RE
 .PP
@@ -293,6 +293,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: debug option
+.\" debug option: mysql_upgrade
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+\fB\-# \fR\fB\fIdebug_options\fR\fR
+.sp
+Write a debugging log\&. A typical
+\fIdebug_options\fR
+string is
+d:t:O,\fIfile_name\fR\&. The default is
+d:t:O,/tmp/mysql_upgrade\&.trace\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: debug-check option
 .\" debug-check option: mysql_upgrade
 \fB\-\-debug\-check\fR
 
=== modified file 'man/mysql_waitpid.1'
--- man/mysql_waitpid.1	2014-03-03 17:51:33 +0000
+++ man/mysql_waitpid.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysql_zap.1'
--- man/mysql_zap.1	2014-03-03 17:51:33 +0000
+++ man/mysql_zap.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlaccess.1'
--- man/mysqlaccess.1	2014-03-03 17:51:33 +0000
+++ man/mysqlaccess.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlaccess\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -34,6 +34,22 @@
 .HP \w'\fBmysqlaccess\ [\fR\fB\fIhost_name\fR\fR\fB\ [\fR\fB\fIuser_name\fR\fR\fB\ [\fR\fB\fIdb_name\fR\fR\fB]]]\ [\fR\fB\fIoptions\fR\fR\fB]\fR\ 'u
 \fBmysqlaccess [\fR\fB\fIhost_name\fR\fR\fB [\fR\fB\fIuser_name\fR\fR\fB [\fR\fB\fIdb_name\fR\fR\fB]]] [\fR\fB\fIoptions\fR\fR\fB]\fR
 .SH "DESCRIPTION"
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+This utility is deprecated in MySQL 5\&.6\&.17 and removed in MySQL 5\&.7
+.sp .5v
+.RE
 .PP
 \fBmysqlaccess\fR
 is a diagnostic tool that Yves Carlier has provided for the MySQL distribution\&. It checks the access privileges for a host name, user name, and database combination\&. Note that
 
=== modified file 'man/mysqladmin.1'
--- man/mysqladmin.1	2014-03-03 17:51:33 +0000
+++ man/mysqladmin.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqladmin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -681,8 +681,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqladmin\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqladmin\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -764,7 +764,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
 .RE
 .sp
 .RS 4
@@ -809,6 +809,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: login-path option
+.\" login-path option: mysqladmin
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: no-beep option
 .\" no-beep option: mysqladmin
 \fB\-\-no\-beep\fR,
@@ -942,6 +967,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: secure-auth option
+.\" secure-auth option: mysqladmin
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: silent option
 .\" silent option: mysqladmin
 \fB\-\-silent\fR,
@@ -1006,7 +1064,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqlbinlog.1'
--- man/mysqlbinlog.1	2014-03-03 17:51:33 +0000
+++ man/mysqlbinlog.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbinlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -517,8 +517,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqlbinlog\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqlbinlog\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -743,6 +743,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: login-path option
+.\" login-path option: mysqlbinlog
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: offset option
 .\" offset option: mysqlbinlog
 \fB\-\-offset=\fR\fB\fIN\fR\fR,
@@ -966,6 +991,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: secure-auth option
+.\" secure-auth option: mysqlbinlog
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: server-id option
 .\" server-id option: mysqlbinlog
 \fB\-\-server\-id=\fR\fB\fIid\fR\fR
@@ -1047,7 +1105,23 @@
 .\" skip-gtids option: mysqlbinlog
 \fB\-\-skip\-gtids[=(true|false)]\fR
 .sp
-Do not display any GTIDs\&. Not recommended in production\&. Added in MySQL 5\&.6\&.5\&.
+Do not display any GTIDs in the output\&. This is needed when writing to a dump file from one or more binary logs containing GTIDs, as shown in this example:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBmysqlbinlog \-\-skip\-gtids binlog\&.000001 >  /tmp/dump\&.sql\fR
+shell> \fBmysqlbinlog \-\-skip\-gtids binlog\&.000002 >> /tmp/dump\&.sql\fR
+shell> \fBmysql \-u root \-p \-e "source /tmp/dump\&.sql"\fR
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+The use of this option is otherwise not normally recommended in production\&.
+.sp
+This option was added in MySQL 5\&.6\&.5\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqlbug.1'
--- man/mysqlbug.1	2014-03-03 17:51:33 +0000
+++ man/mysqlbug.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbug\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlcheck.1'
--- man/mysqlcheck.1	2014-03-03 17:51:33 +0000
+++ man/mysqlcheck.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlcheck\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@
 If
 \fBmysqlcheck\fR
 is unable to repair a table, see
-Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.10.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&. This will be the case, for example, for
 InnoDB
 tables, which can be checked with
@@ -428,8 +428,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -602,6 +602,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: login-path option
+.\" login-path option: mysqlcheck
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: medium-check option
 .\" medium-check option: mysqlcheck
 \fB\-\-medium\-check\fR,
@@ -769,6 +794,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: secure-auth option
+.\" secure-auth option: mysqlcheck
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: silent option
 .\" silent option: mysqlcheck
 \fB\-\-silent\fR,
@@ -825,7 +883,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqld.8'
--- man/mysqld.8	2014-03-03 17:51:33 +0000
+++ man/mysqld.8	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqld_multi.1'
--- man/mysqld_multi.1	2014-03-03 17:51:33 +0000
+++ man/mysqld_multi.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
 [mysqld]
 group used for starting
 \fBmysqld\fR\&. (See, for example,
-Section\ \&2.10.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
+Section\ \&2.9.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
 Section\ \&5.3, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&.
 .PP
 To invoke
 
=== modified file 'man/mysqld_safe.1'
--- man/mysqld_safe.1	2014-03-03 17:51:33 +0000
+++ man/mysqld_safe.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqldump.1'
--- man/mysqldump.1	2014-03-03 17:51:33 +0000
+++ man/mysqldump.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -263,6 +263,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: login-path option
+.\" login-path option: mysqldump
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: password option
 .\" password option: mysqldump
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -360,6 +385,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: secure-auth option
+.\" secure-auth option: mysqldump
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: socket option
 .\" socket option: mysqldump
 \fB\-\-socket=\fR\fB\fIpath\fR\fR,
@@ -384,7 +442,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -684,8 +742,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default value is
-\*(Aqd:t:o,/tmp/mysqldump\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default value is
+d:t:o,/tmp/mysqldump\&.trace\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqldumpslow.1'
--- man/mysqldumpslow.1	2014-03-03 17:51:33 +0000
+++ man/mysqldumpslow.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldumpslow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlhotcopy.1'
--- man/mysqlhotcopy.1	2014-03-03 17:51:33 +0000
+++ man/mysqlhotcopy.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlhotcopy\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/mysqlimport.1'
--- man/mysqlimport.1	2014-03-03 17:51:33 +0000
+++ man/mysqlimport.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlimport\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -180,8 +180,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -423,6 +423,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: login-path option
+.\" login-path option: mysqlimport
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: low-priority option
 .\" low-priority option: mysqlimport
 \fB\-\-low\-priority\fR
@@ -564,6 +589,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: secure-auth option
+.\" secure-auth option: mysqlimport
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: silent option
 .\" silent option: mysqlimport
 \fB\-\-silent\fR,
@@ -604,7 +662,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqlshow.1'
--- man/mysqlshow.1	2014-03-03 17:51:33 +0000
+++ man/mysqlshow.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlshow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -227,8 +227,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -337,6 +337,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: login-path option
+.\" login-path option: mysqlshow
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: password option
 .\" password option: mysqlshow
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -436,6 +461,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: secure-auth option
+.\" secure-auth option: mysqlshow
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: show-table-type option
 .\" show-table-type option: mysqlshow
 \fB\-\-show\-table\-type\fR,
@@ -480,7 +538,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqlslap.1'
--- man/mysqlslap.1	2014-03-03 17:51:33 +0000
+++ man/mysqlslap.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlslap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -466,8 +466,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqlslap\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqlslap\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -567,7 +567,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.7.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
+Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.6\&.7\&.
 .RE
 .sp
 .RS 4
@@ -626,6 +626,31 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: login-path option
+.\" login-path option: mysqlslap
+\fB\-\-login\-path=\fR\fB\fIname\fR\fR
+.sp
+Read options from the named login path in the
+\&.mylogin\&.cnf
+login file\&. A
+\(lqlogin path\(rq
+is an option group that permits only a limited set of options:
+\fBhost\fR,
+\fBuser\fR, and
+\fBpassword\fR\&. Think of a login path as a set of values that indicate the server host and the credentials for authenticating with the server\&. To create the login file, use the
+\fBmysql_config_editor\fR
+utility\&. See
+\fBmysql_config_editor\fR(1)\&. This option was added in MySQL 5\&.6\&.6\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: no-drop option
 .\" no-drop option: mysqlslap
 \fB\-\-no\-drop\fR
@@ -926,6 +951,39 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: secure-auth option
+.\" secure-auth option: mysqlslap
+\fB\-\-secure\-auth\fR
+.sp
+Do not send passwords to the server in old (pre\-4\&.1) format\&. This prevents connections except for servers that use the newer password format\&. This option is enabled by default; use
+\fB\-\-skip\-secure\-auth\fR
+to disable it\&. This option was added in MySQL 5\&.6\&.17\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+Passwords that use the pre\-4\&.1 hashing method are less secure than passwords that use the native password hashing method and should be avoided\&. Pre\-4\&.1 passwords are deprecated and support for them will be removed in a future MySQL release\&. For account upgrade instructions, see
+Section\ \&6.3.8.3, \(lqMigrating Away from Pre-4.1 Password Hashing and the mysql_old_password Plugin\(rq\&.
+.sp .5v
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: silent option
 .\" silent option: mysqlslap
 \fB\-\-silent\fR,
@@ -966,7 +1024,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
 
=== modified file 'man/mysqltest.1'
--- man/mysqltest.1	2014-03-03 17:51:33 +0000
+++ man/mysqltest.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqltest\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/10/2014
+.\"      Date: 03/10/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "01/10/2014" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "03/10/2014" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb-common-options.1'
--- man/ndb-common-options.1	2014-02-17 11:12:40 +0000
+++ man/ndb-common-options.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: Options Common to MySQL Cluster Programs
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_blob_tool.1'
--- man/ndb_blob_tool.1	2014-03-03 17:51:33 +0000
+++ man/ndb_blob_tool.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_blob_tool\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_config.1'
--- man/ndb_config.1	2014-03-03 17:51:33 +0000
+++ man/ndb_config.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -904,6 +904,7 @@
 :T{
 \fBDefault\fR
 T}:T{
+[none]
 T}
 :T{
 \fBValid Values\fR
@@ -1229,7 +1230,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="5\&.6\&.14\-ndb\-7\&.3\&.4"
+<configvariables protocolversion="1" ndbversionstring="5\&.6\&.16\-ndb\-7\&.3\&.5"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">
 
=== modified file 'man/ndb_cpcd.1'
--- man/ndb_cpcd.1	2014-03-03 17:51:33 +0000
+++ man/ndb_cpcd.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_cpcd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_delete_all.1'
--- man/ndb_delete_all.1	2014-03-03 17:51:33 +0000
+++ man/ndb_delete_all.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_desc.1'
--- man/ndb_desc.1	2014-03-03 17:51:33 +0000
+++ man/ndb_desc.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_desc\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
 
=== modified file 'man/ndb_drop_index.1'
--- man/ndb_drop_index.1	2014-03-03 17:51:33 +0000
+++ man/ndb_drop_index.1	2014-04-24 08:44:11 +0000
@@ -2,12 +2,12 @@
 .\"     Title: \fBndb_drop_index\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 01/14/2014
+.\"      Date: 03/14/2014
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.6
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "01/14/2014" "MySQL 5\&.6" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "03/14/2014" "MySQL 5\&.6" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -123,7 +123,7 @@