List:Commits« Previous MessageNext Message »
From:Nirbhay Choubey Date:May 24 2012 9:33am
Subject:bzr push into mysql-trunk branch (nirbhay.choubey:3777 to 3778) WL#5603
View as plain text  
 3778 Nirbhay Choubey	2012-05-24
      WL#5603 :  Revise how we handle passwords on
                 the command line
      
      * Disabled assumeAligned in YaSSL.
      * Fixed login file location on windows.
      ----
      
      Added mysql_config_editor tool.
      Added mysys_ssl library.
      Removed MySQL's AES implementation, OpenSSL/YaSSL
      implementations would be used instead.
      
      ----
      Fix some linking problems on various platforms.
      All executables which link with mysys_ssl must be linked with C++
      SET_TARGET_PROPERTIES(<executable> PROPERTIES LINKER_LANGUAGE CXX)
             
      Add new header file mysys_ssl/my_default.h
      
      MAX_CIPHER_STORE_LEN must be a #define, since it is used
      for stack allocation of arrays (windows requirement).
       
      ----
      Moved all declarations pertaining to default.c
      from include/my_sys.h to mysys_ssl/my_default.h.
      
      ******
      WL#5603 :  Revise how we handle passwords on
                 the command line
      
      Minor modifications.
      
      ******
      WL#5603 : Revise how we handle passwords on
                the command line
      
      Excluded mysql_config_editor.test for embedded
      server.

    removed:
      include/rijndael.h
      mysys/rijndael.c
    added:
      client/mysql_config_editor.cc
      mysql-test/r/mysql_config_editor.result
      mysql-test/t/mysql_config_editor.test
      mysys_ssl/
      mysys_ssl/CMakeLists.txt
      mysys_ssl/my_aes.cc
      mysys_ssl/my_default.h
    renamed:
      mysys/default.c => mysys_ssl/default.c
      mysys/my_getopt.c => mysys_ssl/my_getopt.c
    modified:
      CMakeLists.txt
      client/CMakeLists.txt
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqlslap.c
      client/mysqltest.cc
      extra/CMakeLists.txt
      extra/my_print_defaults.c
      extra/yassl/taocrypt/include/misc.hpp
      include/my_aes.h
      include/my_sys.h
      libmysql/CMakeLists.txt
      libmysqld/CMakeLists.txt
      libmysqld/examples/CMakeLists.txt
      mysql-test/lib/v1/mysql-test-run.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      mysys/CMakeLists.txt
      sql-common/client.c
      sql/CMakeLists.txt
      sql/mysqld.cc
      sql/sql_plugin.cc
      storage/myisam/CMakeLists.txt
      storage/myisam/myisamchk.c
      storage/myisam/myisampack.c
      tests/CMakeLists.txt
      tests/mysql_client_test.c
      unittest/gunit/CMakeLists.txt
      mysys_ssl/default.c
      mysys_ssl/my_getopt.c
 3777 Sunny Bains	2012-05-24
      Fix warning introduced in the WL#5522 patch.

    modified:
      storage/innobase/fil/fil0fil.cc
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2012-05-21 12:38:40 +0000
+++ b/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -359,6 +359,7 @@ ADD_SUBDIRECTORY(strings)
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(regex)
 ADD_SUBDIRECTORY(mysys)
+ADD_SUBDIRECTORY(mysys_ssl)
 ADD_SUBDIRECTORY(libmysql)
 
 IF(WITH_UNIT_TESTS)

=== modified file 'client/CMakeLists.txt'
--- a/client/CMakeLists.txt	2012-03-06 14:29:42 +0000
+++ b/client/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -15,6 +15,7 @@
 
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_SOURCE_DIR}/libmysql
@@ -67,6 +68,9 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap
 SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
 TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
 
+MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc)
+TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient)
+
 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
 IF(WIN32)
   MYSQL_ADD_EXECUTABLE(echo echo.c)

=== modified file 'client/client_priv.h'
--- a/client/client_priv.h	2012-03-06 14:29:42 +0000
+++ b/client/client_priv.h	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2012, 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
@@ -95,7 +95,8 @@ enum options_client
   OPT_MYSQLBINLOG_SKIP_GTIDS,
   OPT_MYSQLBINLOG_INCLUDE_GTIDS,
   OPT_MYSQLBINLOG_EXCLUDE_GTIDS,
-  OPT_REMOTE_PROTO
+  OPT_REMOTE_PROTO,
+  OPT_CONFIG_ALL
 };
 
 /**

=== modified file 'client/mysql.cc'
--- a/client/mysql.cc	2012-04-16 09:14:37 +0000
+++ b/client/mysql.cc	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -31,6 +31,7 @@
  **/
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <m_ctype.h>
 #include <stdarg.h>
 #include <my_dir.h>

=== added file 'client/mysql_config_editor.cc'
--- a/client/mysql_config_editor.cc	1970-01-01 00:00:00 +0000
+++ b/client/mysql_config_editor.cc	2012-05-24 09:31:49 +0000
@@ -0,0 +1,816 @@
+/*
+   Copyright (c) 2012, 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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+*/
+
+/**
+  @file
+
+  @brief
+  MySQL Configuration Tool
+*/
+
+/* ORACLE_WELCOME_COPYRIGHT_NOTICE */
+#include "my_config.h"
+#include <welcome_copyright_notice.h>
+#include <signal.h>
+#include <my_dir.h>
+#include "my_aes.h"
+#include "client_priv.h"
+#include "my_default.h"
+
+#define MYSQL_CONFIG_EDITOR_VERSION "1.0"
+#define MY_LINE_MAX 4096
+
+static int fd;
+static size_t file_size;
+static char *opt_user= NULL, *opt_password= NULL, *opt_host=NULL,
+            *opt_login_path= NULL;
+
+static my_bool opt_verbose, opt_all, tty_password= 0;
+
+int execute_commands(int argc, char **argv);
+static void print_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
+static void remove_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
+static char* locate_login_path(DYNAMIC_STRING *file_buf, const char *path_name);
+static my_bool check_and_create_login_file(void);
+static void mask_password_and_print(char *buf);
+static void reset_login_file(void);
+
+static int encrypt_buffer(char *plain, int plain_len, char cipher[]);
+static int decrypt_buffer(const char *cipher, int cipher_len, char plain[]);
+static int encrypt_and_write_file(DYNAMIC_STRING *file_buf);
+static int read_and_decrypt_file(DYNAMIC_STRING *file_buf);
+
+static void verbose_msg(const char *fmt, ...);
+static void print_version(void);
+static void usage(void);
+extern "C" my_bool get_one_option(int optid, const struct my_option *opt,
+                                  char *argument);
+
+
+/*
+  The order of commands must be the same as command_names,
+  except MY_CONFIG_ERROR.
+*/
+enum commands {
+  MY_CONFIG_ERROR,
+  MY_CONFIG_SET,
+  MY_CONFIG_REMOVE,
+  MY_CONFIG_PRINT,
+  MY_CONFIG_RESET,
+  MY_CONFIG_HELP
+};
+
+static const char *command_names[]= {
+  "set",
+  "remove",
+  "print",
+  "reset",
+  "help",
+  NullS
+};
+
+static TYPELIB command_typelib=
+{ array_elements(command_names)-1, "commands", command_names, NULL};
+
+static struct my_option my_long_options[] =
+{
+  {"all", OPT_CONFIG_ALL, "Used with print command to print all login paths.",
+    &opt_all, &opt_all, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+#ifndef DBUG_OFF
+  {"debug", '#', "Output debug log. Often this is 'd:t:o,filename'.",
+   0, 0, 0, GET_STR, OPT_ARG, 0, 0, 0, 0, 0, 0},
+#endif
+  {"help", '?', "Display this help and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"host", 'h', "Host name to be entered into the login file.", &opt_host,
+    &opt_host, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"login-path", 'G', "Login file path.", &opt_login_path, &opt_login_path,
+    0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"password", 'p', "Password to be entered into the login file. It has to "
+   "be specified in the next line.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0,
+   0, 0, 0},
+  {"user", 'u', "User name to be entered into the login file.", &opt_user,
+    &opt_user, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
+  {"verbose", 'v', "Write more information.", &opt_verbose,
+   &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"version", 'V', "Output version information and exit.", 0, 0, 0, GET_NO_ARG,
+   NO_ARG, 0, 0, 0, 0, 0, 0},
+  { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
+};
+
+
+my_bool
+get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
+	       char *argument)
+{
+  switch(optid) {
+  case 'p' :
+    tty_password= 1;
+    break;
+  }
+  return 0;
+}
+
+
+int main(int argc, char *argv[])
+{
+  DBUG_ENTER("main");
+  int error;
+
+  MY_INIT(argv[0]);
+
+  if ((error= handle_options(&argc, &argv, my_long_options, get_one_option)))
+  {
+    exit(error);
+  }
+
+  if (argc == 0)
+  {
+    usage();
+    exit(1);
+  }
+
+  if (tty_password)
+    opt_password= get_tty_password(NullS);
+
+  /* if not, set it to 'client' (default) */
+  if (!opt_login_path)
+    opt_login_path= my_strdup("client", MYF(MY_WME));
+
+  error= execute_commands(argc, argv);
+  exit(error ? 1 : 0);
+  DBUG_RETURN(0);
+}
+
+
+int execute_commands(int argc, char **argv)
+{
+  DBUG_ENTER("execute_commands");
+  DYNAMIC_STRING file_buf, path_buf;
+  int error= 0;
+
+  init_dynamic_string(&path_buf, "", MY_LINE_MAX, MY_LINE_MAX);
+  init_dynamic_string(&file_buf, "", file_size, 3 * MY_LINE_MAX);
+
+  for (; argc > 0; argv++, argc--) {
+    if ((error= check_and_create_login_file()))
+      goto done;
+
+    switch(find_type(argv[0], &command_typelib, FIND_TYPE_BASIC)) {
+      case MY_CONFIG_SET :
+        verbose_msg("Executing set command..\n");
+        if (file_size)
+          read_and_decrypt_file(&file_buf);
+
+        dynstr_append(&path_buf, "[");          /* --login=path */
+        if (opt_login_path)
+          dynstr_append(&path_buf, opt_login_path);
+        else
+          dynstr_append(&path_buf, "client");
+        dynstr_append(&path_buf, "]");
+
+        if (opt_user)                           /* --user */
+        {
+          dynstr_append(&path_buf, "\nuser = ");
+          dynstr_append(&path_buf, opt_user);
+        }
+
+        if (opt_password)                       /* --password */
+        {
+          dynstr_append(&path_buf, "\npassword = ");
+          dynstr_append(&path_buf, opt_password);
+        }
+
+        if (opt_host)                           /* --host */
+        {
+          dynstr_append(&path_buf, "\nhost = ");
+          dynstr_append(&path_buf, opt_host);
+        }
+
+        dynstr_append(&path_buf, "\n");
+
+        /* Check and remove opt_login_path if it already exists. */
+        remove_login_path(&file_buf, opt_login_path);
+
+        /* Append the new login path to the file buffer. */
+        dynstr_append(&file_buf, path_buf.str);
+
+        encrypt_and_write_file(&file_buf);
+        break;
+
+      case MY_CONFIG_REMOVE :
+        verbose_msg("Executing remove command..\n");
+        if (file_size)
+          read_and_decrypt_file(&file_buf);
+        else
+          break;                                /* Nothing to remove, skip.. */
+
+        remove_login_path(&file_buf, opt_login_path);
+
+        encrypt_and_write_file(&file_buf);
+        break;
+
+      case MY_CONFIG_PRINT :
+        verbose_msg("Executing print command..\n");
+        if (file_size)
+          read_and_decrypt_file(&file_buf);
+        else
+          break;                                /* Nothing to print, skip..*/
+
+        print_login_path(&file_buf, opt_login_path);
+        break;
+
+      case MY_CONFIG_RESET :
+        verbose_msg("Resetting login file..\n");
+        reset_login_file();
+        break;
+
+      case MY_CONFIG_HELP :
+        verbose_msg("Printing usage info..\n");
+        usage();
+        break;
+
+      default :
+        printf("Error! Unknown command.\n");
+        exit(1);
+    }
+    dynstr_trunc(&file_buf, file_buf.length);
+    dynstr_trunc(&path_buf, path_buf.length);
+    my_close(fd, MYF(MY_WME));
+  }
+
+done:
+  dynstr_free(&file_buf);
+  dynstr_free(&path_buf);
+
+  DBUG_RETURN(error);
+}
+
+
+/**
+  Create the login file if it does not exist, check
+  and set its permissions and modes.
+
+  @param void
+
+  @return 1               error
+          0               success
+*/
+
+static my_bool check_and_create_login_file(void)
+{
+  DBUG_ENTER("check_and_create_login_file");
+
+  MY_STAT stat_info;
+
+// This is a hack to make it compile. File permissions are different on Windows.
+#ifdef _WIN32
+#define S_IRUSR  00400
+#define S_IWUSR  00200
+#define S_IRWXU  00700
+#define S_IRWXG  00070
+#define S_IRWXO  00007
+#endif
+
+  const int access_flag= (O_RDWR);
+  const ushort create_mode= (S_IRUSR | S_IWUSR );
+  const ushort create_mode_all= (S_IRWXU | S_IRWXG | S_IRWXO);
+
+  /* Get the login file name. */
+  if (! set_login_file_name())
+  {
+    verbose_msg("Error! Failed to set login file name..\n");
+    goto error;
+  }
+
+  /*
+    NOTE : MYSQL_TEST_LOGIN_FILE env must be a full path,
+    where the directory structure must exist. However the
+    login file will be created if it does not exist.
+  */
+#ifdef _WIN32
+  if (! (getenv("MYSQL_TEST_LOGIN_FILE")))
+  {
+    /* Check if 'MySQL' directory is in place. */
+    MY_STAT stat_info_dir;
+    char login_dir[FN_REFLEN];
+    size_t size;
+
+    dirname_part(login_dir, my_login_file, &size);
+    /* Remove the trailing '\' */
+    if (login_dir[-- size] == FN_LIBCHAR)
+      login_dir[size]= 0;
+
+    /* Now check if directory exists? */
+    if ( my_stat(login_dir, &stat_info_dir, MYF(0)))
+    {
+      verbose_msg("%s directory exists..\n", login_dir);
+    }
+    else
+    {
+      /* Create the login directory. */
+      verbose_msg("%s directory doesn't exist, creating it..\n", login_dir);
+      if (my_mkdir(login_dir, 0, MYF(0)))
+        goto error;
+    }
+  }
+#endif
+
+  /* Check for login file's existence and permissions (0600). */
+  if (my_stat(my_login_file, &stat_info, MYF(0)))
+  {
+    verbose_msg("File exists..\n");
+
+    file_size= stat_info.st_size;
+
+#ifdef _WIN32
+    if (1)
+#else
+    if (!(create_mode ^ (stat_info.st_mode & create_mode_all)))
+#endif
+    {
+      verbose_msg("File has the required permission..\nOpening the file..\n");
+      if ((fd= my_open(my_login_file, access_flag, MYF(MY_WME))) == -1)
+      {
+        verbose_msg("Error! Couldn't open the file..\n");
+        goto error;
+      }
+    }
+    else
+    {
+      verbose_msg("File does not have the required permission..\n");
+      goto error;
+    }
+  }
+  else
+  {
+    verbose_msg("File does not exist..\nCreating login file..\n");
+    if ((fd= my_create(my_login_file, create_mode, access_flag,
+                       MYF(MY_WME)) == -1))
+    {
+      verbose_msg("Error! Couldn't create the login file..\n");
+      goto error;
+    }
+    else
+    {
+      verbose_msg("Login file created..\n");
+      verbose_msg("Opening the file..\n");
+
+      if((fd= my_open(my_login_file, access_flag, MYF(MY_WME))) == -1)
+      {
+        verbose_msg("Error! couldn't open the file.\n");
+        goto error;
+      }
+    }
+  }
+  DBUG_RETURN(0);
+
+error:
+  DBUG_RETURN(1);
+}
+
+
+/**
+  Print options under the specified login path. If '--all'
+  option is used, print all the optins stored in the login
+  file.
+
+  @param file_buf  [in]   Buffer storing the unscrambled login
+                          file contents.
+  @param path_name [in]   Path name.
+
+  @return                 void
+
+*/
+
+static void print_login_path(DYNAMIC_STRING *file_buf, const char *path_name)
+{
+  DBUG_ENTER("print_login_path");
+
+  char *start= NULL, *end= NULL, temp= '\0';
+
+  if (opt_all)
+  {
+    start= file_buf->str;
+    end= file_buf->str + file_buf->length;
+  }
+  else
+  {
+    start= locate_login_path(file_buf, path_name);
+    if (! start)
+      /* login path not found, skip..*/
+      goto done;
+
+    end= strstr(start, "\n[");
+  }
+
+  if (end)
+  {
+    temp= *end;
+    *end= '\0';
+  }
+
+  mask_password_and_print(start);
+
+  if (temp != '\0')
+    *end= temp;
+
+done:
+  DBUG_VOID_RETURN;
+}
+
+
+/**
+  Print the specified buffer by masking the actual
+  password string.
+
+  @param buf [in]         Buffer to be printed.
+
+  @raturn                 void
+*/
+
+static void mask_password_and_print(char *buf)
+{
+  DBUG_ENTER("mask_password_and_print");
+  const char *password_str= "\npassword = ", *mask = "*****";
+  char *next= NULL;
+
+  while ((next= strstr(buf, password_str)) != NULL)
+  {
+    while ( *buf != 0 && buf != next)
+      putc( *(buf ++), stdout);
+    printf("%s", password_str);
+    printf("%s\n", mask);
+    if (*buf == '\n')                           /* Move past \n' */
+      buf ++;
+
+    /* Ignore the password. */
+    while( *buf && *(buf ++) != '\n')
+    {}
+
+    if ( !opt_all)
+      break;
+  }
+
+  /* Now print the rest of the buffer. */
+  while ( *buf) putc( *(buf ++), stdout);
+  // And a new line.. if required.
+  if (* (buf - 1) != '\n')
+    putc('\n', stdout);
+
+  DBUG_VOID_RETURN;
+}
+
+
+/**
+  Remove the specified login path from the login file.
+
+  @param file_buf  [in]   Buffer storing the unscrambled login
+                          file contents.
+  @param path_name [in]   Path name.
+
+  @return                 void
+
+*/
+
+static void remove_login_path(DYNAMIC_STRING *file_buf, const char *path_name)
+{
+  DBUG_ENTER("remove_login_path");
+
+  char *start=NULL, *end= NULL;
+  int tot_len, len, diff;
+
+  if((start= locate_login_path(file_buf, path_name)) == NULL)
+    /* login path was not found, skip.. */
+    goto done;
+
+  end= strstr(start, "\n[");
+
+  if (end)
+  {
+    end ++;                                     /* Move past '\n' */
+    len= ((diff= (start - end)) > 0) ? diff : - diff;
+    tot_len= file_buf->length - len ;
+  }
+  else
+  {
+    *start= '\0';
+    file_buf->length= ((diff= (file_buf->str - start)) > 0) ? diff : - diff;
+    goto done;
+  }
+
+  while(tot_len --)
+    *(start ++)= *(end ++);
+
+  *start= '\0';
+  file_buf->length -= len;
+
+done:
+  DBUG_VOID_RETURN;
+}
+
+/**
+  Remove all the contents from the login file.
+
+  @param                  void
+
+  @return                 void
+*/
+
+static void reset_login_file(void)
+{
+  DBUG_ENTER("reset_login_file");
+
+  if (my_chsize(fd, 0, 0, MYF(MY_WME)))
+    verbose_msg("Error while truncating the file..\n");
+
+  /* Seek to the beginning of the file. */
+  my_seek(fd, 0L, SEEK_SET, MYF(MY_WME));
+
+  DBUG_VOID_RETURN;
+}
+
+
+/**
+  Find the specified login path in the login file buffer
+  and return the starting address.
+
+  @param file_buf  [in]   Buffer storing the unscrambled login
+                          file contents.
+  @param path_name [in]   Path name.
+
+  @return                 If found, the starting address of the
+                          login path, NULL otherwise.
+*/
+
+static char* locate_login_path(DYNAMIC_STRING *file_buf, const char *path_name)
+{
+  DBUG_ENTER("locate_login_path");
+
+  char *addr= NULL;
+  DYNAMIC_STRING dy_path_name;
+
+  init_dynamic_string(&dy_path_name, "", 512, 512);
+
+  dynstr_append(&dy_path_name, "\n[");
+  dynstr_append(&dy_path_name, path_name);
+  dynstr_append(&dy_path_name, "]");
+
+  /* First check if it is the very first login path. */
+  if (file_buf->str == strstr(file_buf->str, dy_path_name.str + 1))
+    addr= file_buf->str;
+  /* If not, scan through the file. */
+  else
+  {
+    addr= strstr(file_buf->str, dy_path_name.str);
+    if (addr)
+      addr ++;                                  /* Move past '\n' */
+  }
+
+  dynstr_free(&dy_path_name);
+  DBUG_RETURN(addr);
+}
+
+
+/**
+  Encrypt the file buffer and write it to the login file.
+
+  @param file_buf  [in]   Buffer storing the unscrambled login
+                          file contents.
+
+  @return                 -1, if error encountered;
+                          bytes written to the file, otherwise.
+
+  @note The contents of the file buffer are encrypted
+        on a line-by-line basis with each line having
+        the following format :
+        [<first 4 bytes store cipher-length>|<Next cipher-length
+        bytes store actual cipher>]
+*/
+
+static int encrypt_and_write_file(DYNAMIC_STRING *file_buf)
+{
+  DBUG_ENTER("encrypt_and_write_file");
+
+  my_bool done= FALSE;
+  char cipher[MY_LINE_MAX], *tmp= NULL;
+  uint bytes_read=0, len= 0;
+  int enc_len= 0;                               // Can be negative.
+
+  reset_login_file();
+
+  tmp= &file_buf->str[bytes_read];
+
+  while(! done)
+  {
+    len= 0;
+
+    while(*tmp++ != '\n')
+      if (len < (file_buf->length - bytes_read))
+        len ++;
+      else
+      {
+        done= TRUE;
+        break;
+      }
+
+    if (done)
+      break;
+
+    if ((enc_len= encrypt_buffer(&file_buf->str[bytes_read],
+                                 ++ len, cipher + MAX_CIPHER_STORE_LEN)) < 0)
+    {
+      verbose_msg("Error! failed to encrypt the login file buffer..\n");
+      goto error;
+    }
+
+    bytes_read += len;
+
+    if (enc_len > MY_LINE_MAX)
+      goto error;
+
+    /* Store cipher length first. */
+    int4store(cipher, enc_len);
+
+    if ((my_write(fd, (const uchar *)cipher, enc_len + MAX_CIPHER_STORE_LEN,
+                  MYF(MY_WME))) != (enc_len + MAX_CIPHER_STORE_LEN))
+    {
+      verbose_msg("Error! couldn't write to the file..\n");
+      goto error;
+    }
+  }
+
+  verbose_msg("Successfully written encrypted data to the login file..\n");
+
+  DBUG_RETURN(bytes_read);
+
+error:
+  DBUG_RETURN(-1);
+}
+
+
+/**
+  Read the login file, unscramble its contents and store
+  them into the file buffer.
+
+  @param file_buf  [in]   Buffer for storing the unscrambled login
+                          file contents.
+
+  @return                 -1, if error encountered;
+                          total length of plain content added to
+                          the file buffer, otherwise.
+
+*/
+
+static int read_and_decrypt_file(DYNAMIC_STRING *file_buf)
+{
+  DBUG_ENTER("read_and_decrypt_file");
+
+  char cipher[MY_LINE_MAX], plain[MY_LINE_MAX];
+  uchar len_buf[MAX_CIPHER_STORE_LEN];
+  int cipher_len= 0, dec_len= 0, total_len= 0;
+
+  /* First read the length of the cipher. */
+  while (my_read(fd, len_buf, MAX_CIPHER_STORE_LEN,
+                 MYF(MY_WME)) == MAX_CIPHER_STORE_LEN)
+  {
+    cipher_len= sint4korr(len_buf);
+
+    if (cipher_len > MY_LINE_MAX)
+      DBUG_RETURN(-1);
+
+    /* Now read 'cipher_len' bytes from the file. */
+    if ((int) my_read(fd, (uchar *) cipher, cipher_len, MYF(MY_WME)) == cipher_len)
+    {
+      if ((dec_len= decrypt_buffer(cipher, cipher_len, plain)) < 0)
+      {
+        verbose_msg("Error! failed to decrypt the file..\n");
+        DBUG_RETURN(-1);
+      }
+
+      total_len += dec_len;
+      plain[dec_len]= 0;
+      dynstr_append(file_buf, plain);
+    }
+  }
+
+  verbose_msg("Successfully decrypted the login file..\n");
+  DBUG_RETURN(total_len);
+}
+
+
+/**
+  Encrypt the given plain text.
+
+  @param plain     [in]   Plain text to be encrypted.
+  @param plain_len [in]   Length of the plain text.
+  @param cipher    [in]   Encrypted cipher text.
+
+  @return                 -1 if error encountered,
+                          length encrypted, otherwise.
+*/
+
+static int encrypt_buffer(char *plain, int plain_len, char cipher[])
+{
+  DBUG_ENTER("encrypt_buffer");
+  int aes_len;
+
+  aes_len= my_aes_get_size(plain_len);
+
+  if (my_aes_encrypt(plain, plain_len, cipher, my_key, strlen(my_key)) == aes_len)
+  {
+    DBUG_RETURN(aes_len);
+  }
+  else
+  {
+    fprintf(stderr, "Error! failed to encrypt..\n");
+  }
+  DBUG_RETURN(-1);                              /* Error */
+}
+
+
+/**
+  Decrypt the given cipher text.
+
+  @param cipher     [in]  Cipher text to be decrypted.
+  @param cipher_len [in]  Length of the cipher text.
+  @param plain      [in]  Decrypted plain text.
+
+  @return                 -1 if error encountered,
+                          length decrypted, otherwise.
+*/
+
+static int decrypt_buffer(const char *cipher, int cipher_len, char plain[])
+{
+  DBUG_ENTER("decrypt_buffer");
+  int aes_length;
+
+  if ((aes_length= my_aes_decrypt(cipher, cipher_len, (char *) plain,
+                                  my_key, strlen(my_key))) > 0)
+  {
+    DBUG_RETURN(aes_length);
+  }
+  else
+  {
+    fprintf(stderr, "Error! failed to decrypt..\n");
+  }
+  DBUG_RETURN(-1);                              /* Error */
+}
+
+
+static void verbose_msg(const char *fmt, ...)
+{
+  DBUG_ENTER("verbose_msg");
+  va_list args;
+
+  if (!opt_verbose)
+    DBUG_VOID_RETURN;
+
+  va_start(args, fmt);
+  vfprintf(stderr, fmt, args);
+  va_end(args);
+  fflush(stderr);
+
+  DBUG_VOID_RETURN;
+}
+
+
+static void usage(void)
+{
+  print_version();
+  puts(ORACLE_WELCOME_COPYRIGHT_NOTICE("2012"));
+  puts("MySQL Configuration Tool.");
+  printf("Usage: %s [OPTIONS] command \n", my_progname);
+  my_print_help(my_long_options);
+  my_print_variables(my_long_options);
+  puts("\nWhere command can be any one of the following :\n\
+       set    [options]          Sets username/password/hostname for a\n\
+                                 given login path (section).\n\
+       remove [options]          Removes options from the specified path.\n\
+       print  [options]          Prints all the options for a specified\n\
+                                 login path.\n\
+       reset                     Clean-up the login file.\n\
+       help                      Print this usage/help information.\n");
+}
+
+
+static void print_version(void) {
+  printf ("%s Ver %s Distrib %s, for %s on %s\n", my_progname,
+          MYSQL_CONFIG_EDITOR_VERSION, MYSQL_SERVER_VERSION,
+          SYSTEM_TYPE, MACHINE_TYPE);
+}
+

=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2012-04-16 09:14:37 +0000
+++ b/client/mysql_upgrade.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2012, 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
@@ -16,6 +16,7 @@
 */
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <sslopt-vars.h>
 #include "../scripts/mysql_fix_privilege_tables_sql.c"
 

=== modified file 'client/mysqladmin.cc'
--- a/client/mysqladmin.cc	2012-04-16 09:14:37 +0000
+++ b/client/mysqladmin.cc	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -18,6 +18,7 @@
 /* maintaince of mysql databases */
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <signal.h>
 #include <my_pthread.h>				/* because of signal()	*/
 #include <sys/stat.h>

=== modified file 'client/mysqlbinlog.cc'
--- a/client/mysqlbinlog.cc	2012-05-03 09:41:32 +0000
+++ b/client/mysqlbinlog.cc	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -31,6 +31,7 @@
 #define MYSQL_CLIENT
 #undef MYSQL_SERVER
 #include "client_priv.h"
+#include "my_default.h"
 #include <my_time.h>
 /* That one is necessary for defines of OPTION_NO_FOREIGN_KEY_CHECKS etc */
 #include "sql_priv.h"

=== modified file 'client/mysqlcheck.c'
--- a/client/mysqlcheck.c	2012-04-16 09:14:37 +0000
+++ b/client/mysqlcheck.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2012, 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
@@ -18,6 +18,7 @@
 #define CHECK_VERSION "2.5.0"
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <m_ctype.h>
 #include <mysql_version.h>
 #include <mysqld_error.h>

=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2012-05-09 16:53:03 +0000
+++ b/client/mysqldump.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -49,6 +49,7 @@
 #include <stdarg.h>
 
 #include "client_priv.h"
+#include "my_default.h"
 #include "mysql.h"
 #include "mysql_version.h"
 #include "mysqld_error.h"

=== modified file 'client/mysqlimport.c'
--- a/client/mysqlimport.c	2012-04-16 09:14:37 +0000
+++ b/client/mysqlimport.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -23,6 +23,7 @@
 #define IMPORT_VERSION "3.7"
 
 #include "client_priv.h"
+#include "my_default.h"
 #include "mysql_version.h"
 #ifdef HAVE_LIBPTHREAD
 #include <my_pthread.h>

=== modified file 'client/mysqlshow.c'
--- a/client/mysqlshow.c	2012-04-16 09:14:37 +0000
+++ b/client/mysqlshow.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -20,6 +20,7 @@
 #define SHOW_VERSION "9.10"
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <my_sys.h>
 #include <m_string.h>
 #include <mysql.h>

=== modified file 'client/mysqlslap.c'
--- a/client/mysqlslap.c	2012-05-09 16:53:03 +0000
+++ b/client/mysqlslap.c	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, 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
@@ -81,6 +81,7 @@ TODO:
 #define DELETE_TYPE_REQUIRES_PREFIX 6
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <mysqld_error.h>
 #include <my_dir.h>
 #include <signal.h>

=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2012-04-16 09:14:37 +0000
+++ b/client/mysqltest.cc	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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
@@ -27,6 +27,7 @@
 #define MTEST_VERSION "3.3"
 
 #include "client_priv.h"
+#include "my_default.h"
 #include <mysql_version.h>
 #include <mysqld_error.h>
 #include <sql_common.h>

=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt	2011-12-09 21:08:37 +0000
+++ b/extra/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -15,6 +15,7 @@
 
 INCLUDE_DIRECTORIES(
 ${CMAKE_SOURCE_DIR}/include 
+${CMAKE_SOURCE_DIR}/mysys_ssl
 ${ZLIB_INCLUDE_DIR}
 # Following is for perror, in case NDB is compiled in.
 ${CMAKE_SOURCE_DIR}/storage/ndb/include
@@ -28,7 +29,8 @@ SET(MYSQL_INSTALL_COMPONENT Server)
 
 IF(NOT CMAKE_CROSSCOMPILING)
  ADD_EXECUTABLE(comp_err comp_err.c)
- TARGET_LINK_LIBRARIES(comp_err mysys)
+ TARGET_LINK_LIBRARIES(comp_err mysys mysys_ssl)
+ SET_TARGET_PROPERTIES(comp_err PROPERTIES LINKER_LANGUAGE CXX)
 ENDIF()
 
 ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h 
@@ -51,14 +53,17 @@ ADD_CUSTOM_TARGET(GenError
                   ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt)
 
 MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
+TARGET_LINK_LIBRARIES(my_print_defaults  mysys mysys_ssl)
+SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX)
 
 MYSQL_ADD_EXECUTABLE(perror perror.c)
 ADD_DEPENDENCIES(perror GenError)
-TARGET_LINK_LIBRARIES(perror mysys)
+TARGET_LINK_LIBRARIES(perror mysys mysys_ssl)
+SET_TARGET_PROPERTIES(perror PROPERTIES LINKER_LANGUAGE CXX)
 
 MYSQL_ADD_EXECUTABLE(resolveip resolveip.c)
-TARGET_LINK_LIBRARIES(resolveip mysys)
+TARGET_LINK_LIBRARIES(resolveip mysys mysys_ssl)
+SET_TARGET_PROPERTIES(resolveip PROPERTIES LINKER_LANGUAGE CXX)
 IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
   INCLUDE(CheckFunctionExists)
   INCLUDE(CheckLibraryExists)
@@ -81,14 +86,16 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
       ../storage/innobase/ut/ut0ut.cc
      )
   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES})
-  TARGET_LINK_LIBRARIES(innochecksum mysys)
+  TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl)
 ENDIF()
 
 IF(UNIX)
   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
-  TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
+  TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl)
+  SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX)
 
   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c)
-  TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
+  TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl)
+  SET_TARGET_PROPERTIES(mysql_waitpid PROPERTIES LINKER_LANGUAGE CXX)
 ENDIF()
 

=== modified file 'extra/my_print_defaults.c'
--- a/extra/my_print_defaults.c	2011-09-20 09:18:40 +0000
+++ b/extra/my_print_defaults.c	2012-05-24 09:31:49 +0000
@@ -1,6 +1,6 @@
 
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2012, 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
@@ -27,6 +27,7 @@
 #include <my_sys.h>
 #include <m_string.h>
 #include <my_getopt.h>
+#include "my_default.h"
 
 
 const char *config_file="my";			/* Default config file */
@@ -79,8 +80,9 @@ static struct my_option my_long_options[
    &my_defaults_extra_file,
    &my_defaults_extra_file, 0, GET_STR,
    REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-  {"no-defaults", 'n', "Return an empty string (useful for scripts).",
-   0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
+  {"no-defaults", 'n', "Ignore reading of default option file(s), "
+   "except for login file.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0,
+   0, 0, 0},
   {"help", '?', "Display this help message and exit.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"verbose", 'v', "Increase the output level",
@@ -116,7 +118,7 @@ get_one_option(int optid, const struct m
       opt_defaults_file_used= 1;
       break;
     case 'n':
-    exit(0);
+      break;
     case 'I':
     case '?':
     usage(0);
@@ -156,12 +158,13 @@ int main(int argc, char **argv)
   int count, error, args_used;
   char **load_default_groups, *tmp_arguments[6];
   char **argument, **arguments, **org_argv;
-  char *defaults, *extra_defaults, *group_suffix;
+  char *defaults, *extra_defaults, *group_suffix, *login_path;
+
   MY_INIT(argv[0]);
 
   org_argv= argv;
   args_used= get_defaults_options(argc, argv, &defaults, &extra_defaults,
-                                  &group_suffix);
+                                  &group_suffix, &login_path);
 
   /* Copy defaults-xxx arguments & program name */
   count=args_used+1;

=== modified file 'extra/yassl/taocrypt/include/misc.hpp'
--- a/extra/yassl/taocrypt/include/misc.hpp	2012-05-17 12:10:48 +0000
+++ b/extra/yassl/taocrypt/include/misc.hpp	2012-05-24 09:31:49 +0000
@@ -672,6 +672,7 @@ inline void UnalignedPutWord(ByteOrder o
 template <class T>
 inline T GetWord(bool assumeAligned, ByteOrder order, const byte *block)
 {
+    assumeAligned= false;
     if (assumeAligned)
         return ByteReverseIf(*reinterpret_cast<const T *>(block), order);
     else
@@ -689,6 +690,7 @@ template <class T>
 inline void PutWord(bool assumeAligned, ByteOrder order, byte* block, T value,
                     const byte *xorBlock = 0)
 {
+    assumeAligned= false;
     if (assumeAligned)
     {
         if (xorBlock)

=== modified file 'include/my_aes.h'
--- a/include/my_aes.h	2011-09-07 10:08:09 +0000
+++ b/include/my_aes.h	2012-05-24 09:31:49 +0000
@@ -1,8 +1,7 @@
 #ifndef MY_AES_INCLUDED
 #define MY_AES_INCLUDED
 
-/* Copyright (c) 2002, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2000, 2012, 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
@@ -21,8 +20,6 @@
 /* Header file for my_aes.c */
 /* Wrapper to give simple interface for MySQL to AES standard encryption */
 
-#include "rijndael.h"
-
 C_MODE_START
 
 #define AES_KEY_LENGTH 128		/* Must be 128 192 or 256 */

=== modified file 'include/my_sys.h'
--- a/include/my_sys.h	2012-05-03 08:40:15 +0000
+++ b/include/my_sys.h	2012-05-24 09:31:49 +0000
@@ -272,10 +272,6 @@ extern my_bool  my_disable_locking, my_d
                 my_disable_flush_key_blocks, my_disable_symlinks;
 extern char	wild_many,wild_one,wild_prefix;
 extern const char *charsets_dir;
-/* from default.c */
-extern const char *my_defaults_extra_file;
-extern const char *my_defaults_group_suffix;
-extern const char *my_defaults_file;
 
 extern my_bool timed_mutexes;
 
@@ -560,10 +556,6 @@ my_off_t my_b_safe_tell(IO_CACHE* info);
 
 typedef uint32 ha_checksum;
 
-/* Define the type of function to be passed to process_default_option_files */
-typedef int (*Process_option_func)(void *ctx, const char *group_name,
-                                   const char *option);
-
 #include <my_alloc.h>
 
 
@@ -839,22 +831,6 @@ static inline char *safe_strdup_root(MEM
 }
 extern char *strmake_root(MEM_ROOT *root,const char *str,size_t len);
 extern void *memdup_root(MEM_ROOT *root,const void *str, size_t len);
-extern int get_defaults_options(int argc, char **argv,
-                                char **defaults, char **extra_defaults,
-                                char **group_suffix);
-extern my_bool my_getopt_use_args_separator;
-extern my_bool my_getopt_is_args_separator(const char* arg);
-extern int my_load_defaults(const char *conf_file, const char **groups,
-                            int *argc, char ***argv, const char ***);
-extern int load_defaults(const char *conf_file, const char **groups,
-                         int *argc, char ***argv);
-extern int my_search_option_files(const char *conf_file, int *argc,
-                                  char ***argv, uint *args_used,
-                                  Process_option_func func, void *func_ctx,
-                                  const char **default_directories);
-extern void free_defaults(char **argv);
-extern void my_print_default_files(const char *conf_file);
-extern void print_defaults(const char *conf_file, const char **groups);
 extern my_bool my_compress(uchar *, size_t *, size_t *);
 extern my_bool my_uncompress(uchar *, size_t , size_t *);
 extern uchar *my_compress_alloc(const uchar *packet, size_t *len,

=== removed file 'include/rijndael.h'
--- a/include/rijndael.h	2011-09-07 10:08:09 +0000
+++ b/include/rijndael.h	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
-#ifndef RIJNDAEL_INCLUDED
-#define RIJNDAEL_INCLUDED
-
-/* Copyright (c) 2002, 2006 MySQL AB, 2009 Sun Microsystems, Inc.
-   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
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-
-/*
-  rijndael-alg-fst.h
-
-  @version 3.0 (December 2000)
-  Optimised ANSI C code for the Rijndael cipher (now AES)
-  @author Vincent Rijmen <vincent.rijmen@stripped>
-  @author Antoon Bosselaers <antoon.bosselaers@stripped>
-  @author Paulo Barreto <paulo.barreto@stripped>
-
-  This code is hereby placed in the public domain.
-  Modified by Peter Zaitsev to fit MySQL coding style.
- */
-
-#define AES_MAXKC	(256/32)
-#define AES_MAXKB	(256/8)
-#define AES_MAXNR	14
-
-int rijndaelKeySetupEnc(uint32 rk[/*4*(Nr + 1)*/], const uint8 cipherKey[],
-			int keyBits);
-int rijndaelKeySetupDec(uint32 rk[/*4*(Nr + 1)*/], const uint8 cipherKey[],
-			int keyBits);
-void rijndaelEncrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
-		     const uint8 pt[16], uint8 ct[16]);
-void rijndaelDecrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
-		     const uint8 ct[16], uint8 pt[16]);
-
-#endif /* RIJNDAEL_INCLUDED */

=== modified file 'libmysql/CMakeLists.txt'
--- a/libmysql/CMakeLists.txt	2012-03-06 14:29:42 +0000
+++ b/libmysql/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -19,6 +19,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/regex
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_SOURCE_DIR}/strings
+  ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${SSL_INCLUDE_DIRS}
   ${SSL_INTERNAL_INCLUDE_DIRS}
   ${ZLIB_INCLUDE_DIR})
@@ -165,7 +166,7 @@ ADD_CONVENIENCE_LIBRARY(clientlib ${CLIE
 DTRACE_INSTRUMENT(clientlib)
 ADD_DEPENDENCIES(clientlib GenError)
 
-SET(LIBS clientlib dbug strings vio mysys ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
+SET(LIBS clientlib dbug strings vio mysys mysys_ssl ${ZLIB_LIBRARY} ${SSL_LIBRARIES} ${LIBDL})
 
 #
 # On Windows platform client library includes the client-side 

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2012-04-02 14:31:07 +0000
+++ b/libmysqld/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -23,6 +23,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/sql
   ${CMAKE_BINARY_DIR}/sql 
   ${CMAKE_SOURCE_DIR}/regex
+  ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${SSL_INTERNAL_INCLUDE_DIRS}
@@ -103,7 +104,7 @@ ENDIF()
 
 
 SET(LIBS 
-  dbug strings regex mysys vio 
+  dbug strings regex mysys mysys_ssl vio 
   ${ZLIB_LIBRARY} ${SSL_LIBRARIES} 
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${MYSQLD_STATIC_PLUGIN_LIBS}

=== modified file 'libmysqld/examples/CMakeLists.txt'
--- a/libmysqld/examples/CMakeLists.txt	2012-03-06 14:29:42 +0000
+++ b/libmysqld/examples/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -16,6 +16,7 @@
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
                     ${CMAKE_SOURCE_DIR}/libmysqld/include
                     ${CMAKE_SOURCE_DIR}/regex 
+                    ${CMAKE_SOURCE_DIR}/mysys_ssl
                     ${READLINE_INCLUDE_DIR}                 
                     )
 

=== modified file 'mysql-test/lib/v1/mysql-test-run.pl'
--- a/mysql-test/lib/v1/mysql-test-run.pl	2011-09-07 10:08:09 +0000
+++ b/mysql-test/lib/v1/mysql-test-run.pl	2012-05-24 09:31:49 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2012, 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
@@ -166,6 +166,7 @@ our $exe_mysqldump;
 our $exe_mysqlslap;
 our $exe_mysqlimport;
 our $exe_mysqlshow;
+our $exe_mysql_config_editor;
 our $file_mysql_fix_privilege_tables;
 our $exe_mysqltest;
 our $exe_ndbd;
@@ -1660,6 +1661,8 @@ sub executable_setup () {
   $exe_mysqlbinlog=    mtr_exe_exists("$path_client_bindir/mysqlbinlog");
   $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
   $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
+  $exe_mysql_config_editor=
+                       mtr_exe_exists("$path_client_bindir/mysql_config_editor");
 
   if (!$opt_extern)
   {
@@ -2100,6 +2103,20 @@ sub environment_setup () {
   $ENV{'MYSQL_SHOW'}= $cmdline_mysqlshow;
 
   # ----------------------------------------------------
+  # Setup env so childs can execute mysql_config_editor
+  # ----------------------------------------------------
+  my $cmdline_mysql_config_editor=
+    mtr_native_path($exe_mysql_config_editor) . " ";
+
+  if ( $opt_debug )
+  {
+    $cmdline_mysql_config_editor .=
+      " --debug=d:t:A,$path_vardir_trace/log/mysql_config_editor.trace";
+  }
+  $ENV{'MYSQL_CONFIG_EDITOR'}= $cmdline_mysql_config_editor;
+
+
+  # ----------------------------------------------------
   # Setup env so childs can execute mysqlbinlog
   # ----------------------------------------------------
   my $cmdline_mysqlbinlog=

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-04-30 07:17:11 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-05-24 09:31:49 +0000
@@ -2119,6 +2119,14 @@ sub client_arguments ($;$) {
   return mtr_args2str($client_exe, @$args);
 }
 
+sub client_arguments_no_grp_suffix($) {
+  my $client_name= shift;
+  my $client_exe= mtr_exe_exists("$path_client_bindir/$client_name");
+  my $args;
+
+  return mtr_args2str($client_exe, @$args);
+}
+
 
 sub mysqlslap_arguments () {
   my $exe= mtr_exe_maybe_exists("$path_client_bindir/mysqlslap");
@@ -2380,10 +2388,14 @@ sub environment_setup {
   if (IS_WINDOWS)
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."\\std_data";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
+                              $opt_tmpdir . "\\.mylogin.cnf";
   }
   else
   {
     $ENV{'SECURE_LOAD_PATH'}= $glob_mysql_test_dir."/std_data";
+    $ENV{'MYSQL_TEST_LOGIN_FILE'}=
+                              $opt_tmpdir . "/.mylogin.cnf";
   }
     
 
@@ -2452,6 +2464,7 @@ sub environment_setup {
   $ENV{'MYSQL_SLAP'}=               mysqlslap_arguments();
   $ENV{'MYSQL_IMPORT'}=             client_arguments("mysqlimport");
   $ENV{'MYSQL_SHOW'}=               client_arguments("mysqlshow");
+  $ENV{'MYSQL_CONFIG_EDITOR'}=      client_arguments_no_grp_suffix("mysql_config_editor");
   $ENV{'MYSQL_BINLOG'}=             client_arguments("mysqlbinlog");
   $ENV{'MYSQL'}=                    client_arguments("mysql");
   $ENV{'MYSQL_SLAVE'}=              client_arguments("mysql", ".2");

=== added file 'mysql-test/r/mysql_config_editor.result'
--- a/mysql-test/r/mysql_config_editor.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/mysql_config_editor.result	2012-05-24 09:31:49 +0000
@@ -0,0 +1,194 @@
+#
+# Testing mysql_config_editor tool.
+#
+################################################
+# Tests for mysql_config_editor's insert command
+################################################
+#
+# Default login path (client)
+# done..
+# 'test-login-path1'
+# done..
+# 'test-login-path2'
+# done..
+
+################################################
+# Tests for mysql_config_editor's print command
+################################################
+#
+# Default path
+[client]
+user = test_user1
+host = localhost
+
+#
+# test-login-path1
+[test-login-path1]
+user = test_user2
+host = 127.0.0.1
+
+#
+# test-login-path2
+[test-login-path2]
+user = test_user3
+host = www.mysql.com
+
+#
+# all the paths
+[client]
+user = test_user1
+host = localhost
+[test-login-path1]
+user = test_user2
+host = 127.0.0.1
+[test-login-path2]
+user = test_user3
+host = www.mysql.com
+
+#
+# Overwrite existing paths, test-login-path2 & default
+#
+# all the paths again
+[test-login-path1]
+user = test_user2
+host = 127.0.0.1
+[test-login-path2]
+user = test_user4
+[client]
+user = test_user5
+
+################################################
+# Tests for mysql_config_editor's remove command
+################################################
+#
+# Default path
+# done..
+# test-login-path1
+# done..
+
+########################
+# Printing the leftovers
+########################
+#
+# using all
+[test-login-path2]
+user = test_user4
+
+################################################
+# Tests for mysql_config_editor's remove command
+################################################
+# done..
+# Print-all to check if everything got deleted.
+
+##############################################
+# Tests for mysql_config_editor's help command
+##############################################
+Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+
+Oracle is a registered trademark of Oracle Corporation and/or its
+affiliates. Other names may be trademarks of their respective
+owners.
+
+MySQL Configuration Tool.
+  --all               Used with print command to print all login paths.
+  -?, --help          Display this help and exit.
+  -h, --host=name     Host name to be entered into the login file.
+  -G, --login-path=name 
+                      Login file path.
+  -p, --password      Password to be entered into the login file. It has to be
+                      specified in the next line.
+  -u, --user=name     User name to be entered into the login file.
+  -v, --verbose       Write more information.
+  -V, --version       Output version information and exit.
+
+Variables (--variable-name=value)
+and boolean options {FALSE|TRUE}  Value (after reading options)
+--------------------------------- ----------------------------------------
+all                               FALSE
+host                              (No default value)
+login-path                        client
+user                              (No default value)
+verbose                           FALSE
+
+Where command can be any one of the following :
+       set    [options]          Sets username/password/hostname for a
+                                 given login path (section).
+       remove [options]          Removes options from the specified path.
+       print  [options]          Prints all the options for a specified
+                                 login path.
+       reset                     Clean-up the login file.
+       help                      Print this usage/help information.
+
+# done..
+
+######################
+# Testing client tools
+######################
+#
+# Inserting login paths default & test-login-path1
+File exists..
+File has the required permission..
+Opening the file..
+Executing set command..
+Successfully written encrypted data to the login file..
+File exists..
+File has the required permission..
+Opening the file..
+Executing set command..
+Successfully decrypted the login file..
+Successfully written encrypted data to the login file..
+# done..
+
+# Connecting using 'test_user1'
+#
+ERROR 1045 (28000): Access denied for user 'test_user1'@'localhost' (using password: NO)
+
+# Connecting using 'test_user2'
+#
+ERROR 1045 (28000): Access denied for user 'test_user2'@'localhost' (using password: NO)
+# Creating user 'test_user1'
+CREATE USER test_user1;
+# Creating user 'test_user2'
+CREATE USER test_user2;
+FLUSH PRIVILEGES;
+#
+# Now trying to connect again..
+# Connecting using 'test_user1'
+#
+mysqld is alive
+mysqld is alive
+
+# Connecting using 'test_user2'
+#
+mysqld is alive
+mysqld is alive
+#
+# Inserting a login path to test group suffix (client_suffix1)
+
+# Printing all the paths..
+[client]
+user = test_user1
+host = localhost
+[test-login-path1]
+user = test_user2
+host = 127.0.0.1
+[client_suffix1]
+user = test_user3
+
+# Now trying to connect using 'test_user3'
+# Note : In this case options from login
+#        paths 'client' (default) and 
+#        client_suffix1 will be read..
+ERROR 1045 (28000): Access denied for user 'test_user3'@'localhost' (using password: NO)
+
+# Dropping users 'test_user1' & 'test_user2'
+DROP USER test_user1, test_user2;
+
+###############################
+# Resetting the test login file
+###############################
+# done..
+###############################
+# Dropping the test login file
+###############################
+# done..

=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-05-23 11:20:06 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-05-24 09:31:49 +0000
@@ -1,8 +1,12 @@
 The following options may be given as the first argument:
 --print-defaults Print the program argument list and exit.
---no-defaults Don't read default options from any option file.
+--no-defaults Don't read default options from any option file,
+ except for login file.
 --defaults-file=# Only read default options from the given file #.
 --defaults-extra-file=# Read this file after the global files are read.
+--defaults-group-suffix=#
+ Also read groups with concat(group, suffix)
+--login-path=# Read this path from the login file.
 
  --abort-slave-event-count=# 
  Option used by mysql-test for debugging and testing of

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-05-23 11:20:06 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-05-24 09:31:49 +0000
@@ -1,8 +1,12 @@
 The following options may be given as the first argument:
 --print-defaults Print the program argument list and exit.
---no-defaults Don't read default options from any option file.
+--no-defaults Don't read default options from any option file,
+ except for login file.
 --defaults-file=# Only read default options from the given file #.
 --defaults-extra-file=# Read this file after the global files are read.
+--defaults-group-suffix=#
+ Also read groups with concat(group, suffix)
+--login-path=# Read this path from the login file.
 
  --abort-slave-event-count=# 
  Option used by mysql-test for debugging and testing of

=== added file 'mysql-test/t/mysql_config_editor.test'
--- a/mysql-test/t/mysql_config_editor.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/mysql_config_editor.test	2012-05-24 09:31:49 +0000
@@ -0,0 +1,159 @@
+-- source include/not_embedded.inc
+
+--echo #
+--echo # Testing mysql_config_editor tool.
+--echo #
+
+# Note : a) mtr sets the 'MYSQL_TEST_LOGIN_FILE' environment
+#           variable to "$opt_tmpdir/.mylogin.cnf".
+#        b) The --password option in not tested as its
+#           value cannot be specified at command line.
+
+--echo ################################################
+--echo # Tests for mysql_config_editor's insert command
+--echo ################################################
+--echo #
+--echo # Default login path (client)
+--exec $MYSQL_CONFIG_EDITOR set --user=test_user1 --host=localhost
+--echo # done..
+--echo # 'test-login-path1'
+--exec $MYSQL_CONFIG_EDITOR set --login-path=test-login-path1 --user=test_user2 --host=127.0.0.1 
+--echo # done..
+--echo # 'test-login-path2'
+--exec $MYSQL_CONFIG_EDITOR set --login-path=test-login-path2 --user=test_user3 --host=www.mysql.com
+--echo # done..
+
+--echo
+--echo ################################################
+--echo # Tests for mysql_config_editor's print command
+--echo ################################################
+--echo #
+--echo # Default path
+--exec $MYSQL_CONFIG_EDITOR print 2>&1
+--echo
+--echo #
+--echo # test-login-path1
+--exec $MYSQL_CONFIG_EDITOR print --login-path=test-login-path1 2>&1
+--echo
+--echo #
+--echo # test-login-path2
+--exec $MYSQL_CONFIG_EDITOR print --login-path=test-login-path2 2>&1
+--echo
+--echo #
+--echo # all the paths
+--exec $MYSQL_CONFIG_EDITOR print --all 2>&1
+--echo 
+--echo #
+--echo # Overwrite existing paths, test-login-path2 & default
+--exec $MYSQL_CONFIG_EDITOR set --user=test_user4 --login-path=test-login-path2
+--exec $MYSQL_CONFIG_EDITOR set --user=test_user5
+--echo #
+--echo # all the paths again
+--exec $MYSQL_CONFIG_EDITOR print --all 2>&1
+
+--echo 
+--echo ################################################
+--echo # Tests for mysql_config_editor's remove command
+--echo ################################################
+--echo #
+--echo # Default path
+--exec $MYSQL_CONFIG_EDITOR remove
+--echo # done..
+--echo # test-login-path1
+--exec $MYSQL_CONFIG_EDITOR remove --login-path=test-login-path1
+--echo # done..
+
+--echo
+--echo ########################
+--echo # Printing the leftovers
+--echo ########################
+--echo #
+--echo # using all
+--exec $MYSQL_CONFIG_EDITOR print --all
+
+--echo
+--echo ################################################
+--echo # Tests for mysql_config_editor's remove command
+--echo ################################################
+--exec $MYSQL_CONFIG_EDITOR reset
+--echo # done..
+--echo # Print-all to check if everything got deleted.
+--exec $MYSQL_CONFIG_EDITOR print --all
+
+--echo
+--echo ##############################################
+--echo # Tests for mysql_config_editor's help command
+--echo ##############################################
+--replace_regex /.*mysql_config_editor.*// /.*Output debug log.*//
+--exec $MYSQL_CONFIG_EDITOR help 2>&1
+--echo # done..
+
+--echo
+--echo ######################
+--echo # Testing client tools
+--echo ######################
+--echo #
+--echo # Inserting login paths default & test-login-path1
+--exec $MYSQL_CONFIG_EDITOR set --verbose --user=test_user1 --host=localhost 2>&1
+--exec $MYSQL_CONFIG_EDITOR set --login-path=test-login-path1 --verbose --user=test_user2 --host=127.0.0.1 2>&1
+--echo # done..
+--echo
+--echo # Connecting using 'test_user1'
+--echo #
+--error 1
+--exec $MYSQL 2>&1
+--echo
+--echo # Connecting using 'test_user2'
+--echo #
+--error 1
+--exec $MYSQL --login-path=test-login-path1 2>&1
+
+--echo # Creating user 'test_user1'
+CREATE USER test_user1;
+--echo # Creating user 'test_user2'
+CREATE USER test_user2;
+FLUSH PRIVILEGES;
+--echo #
+--echo # Now trying to connect again..
+--echo # Connecting using 'test_user1'
+--echo #
+--exec $MYSQLADMIN -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults -S $MASTER_MYSOCK -P $MASTER_MYPORT ping 2>&1
+--echo
+--echo # Connecting using 'test_user2'
+--echo #
+--exec $MYSQLADMIN --login-path=test-login-path1 --port=$MASTER_MYPORT ping 2>&1
+--exec $MYSQLADMIN --no-defaults --login-path=test-login-path1 --port=$MASTER_MYPORT ping 2>&1
+
+--echo #
+--echo # Inserting a login path to test group suffix (client_suffix1)
+--exec $MYSQL_CONFIG_EDITOR set --user=test_user3 --login-path=client_suffix1
+--echo
+--echo # Printing all the paths..
+--exec $MYSQL_CONFIG_EDITOR print --all 2>&1
+--echo
+--echo # Now trying to connect using 'test_user3'
+--echo # Note : In this case options from login
+--echo #        paths 'client' (default) and 
+--echo #        client_suffix1 will be read..
+--error 1 
+--exec $MYSQL --defaults-group-suffix=_suffix1 2>&1
+
+
+
+# Cleanup
+--echo
+--echo # Dropping users 'test_user1' & 'test_user2'
+DROP USER test_user1, test_user2;
+--echo
+--echo ###############################
+--echo # Resetting the test login file
+--echo ###############################
+--exec $MYSQL_CONFIG_EDITOR reset
+--echo # done..
+--echo ###############################
+--echo # Dropping the test login file
+--echo ###############################
+--remove_file $MYSQL_TEST_LOGIN_FILE
+--echo # done..
+

=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt	2012-05-21 12:38:40 +0000
+++ b/mysys/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -19,23 +19,23 @@ IF(SSL_DEFINES)
 ADD_DEFINITIONS(${SSL_DEFINES})
 ENDIF()
 
-SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c default.c
+SET(MYSYS_SOURCES  array.c charset-def.c charset.c checksum.c
 				errors.c hash.c list.c mf_cache.c mf_dirname.c mf_fn_ext.c
 				mf_format.c mf_getdate.c mf_iocache.c mf_iocache2.c mf_keycache.c 
 				mf_keycaches.c mf_loadpath.c mf_pack.c mf_path.c mf_qsort.c mf_qsort2.c
 				mf_radix.c mf_same.c mf_sort.c mf_soundex.c mf_arr_appstr.c mf_tempdir.c
 				mf_tempfile.c mf_unixpath.c mf_wcomp.c mulalloc.c my_access.c
-				my_aes.c my_alloc.c my_bit.c my_bitmap.c my_chsize.c
+				my_alloc.c my_bit.c my_bitmap.c my_chsize.c
 				my_compress.c my_copy.c  my_create.c my_delete.c
 				my_div.c my_error.c my_file.c my_fopen.c my_fstream.c 
-				my_gethwaddr.c my_getopt.c my_getsystime.c my_getwd.c my_compare.c my_init.c
+				my_gethwaddr.c my_getsystime.c my_getwd.c my_compare.c my_init.c
 				my_isnan.c
 				my_lib.c my_lock.c my_malloc.c my_mess.c
 				my_mkdir.c my_mmap.c my_once.c my_open.c my_pread.c my_pthread.c
 				my_quick.c my_read.c my_redel.c my_rename.c my_seek.c my_sleep.c
 				my_static.c my_symlink.c my_symlink2.c my_sync.c my_thr_init.c 
 				my_write.c ptr_cmp.c queues.c stacktrace.c
-				rijndael.c string.c thr_alarm.c thr_lock.c thr_mutex.c
+				string.c thr_alarm.c thr_lock.c thr_mutex.c
 				thr_rwlock.c tree.c typelib.c base64.c my_memmem.c my_getpagesize.c
 				lf_alloc-pin.c lf_dynarray.c lf_hash.c
 				my_atomic.c my_getncpus.c

=== removed file 'mysys/rijndael.c'
--- a/mysys/rijndael.c	2011-09-07 10:08:09 +0000
+++ b/mysys/rijndael.c	1970-01-01 00:00:00 +0000
@@ -1,1379 +0,0 @@
-/* Copyright (c) 2002, 2010, 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
- the Free Software Foundation; version 2 of the License.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-
-
-/*
-  Based on version 3.0 (December 2000)
-
-  Optimised ANSI C code for the Rijndael cipher (now AES)
-
-  author Vincent Rijmen <vincent.rijmen@stripped>
-  author Antoon Bosselaers <antoon.bosselaers@stripped>
-  author Paulo Barreto <paulo.barreto@stripped>
-*/
-
-#include <my_global.h>
-#include "rijndael.h"
-
-/*
-  Define the following to use fastest and much larger code (~10K extra code)
-  #define FULL_UNROLL
-*/
-
-static const uint32 Te0[256]=
-{
-  0xc66363a5U, 0xf87c7c84U, 0xee777799U, 0xf67b7b8dU,
-  0xfff2f20dU, 0xd66b6bbdU, 0xde6f6fb1U, 0x91c5c554U,
-  0x60303050U, 0x02010103U, 0xce6767a9U, 0x562b2b7dU,
-  0xe7fefe19U, 0xb5d7d762U, 0x4dababe6U, 0xec76769aU,
-  0x8fcaca45U, 0x1f82829dU, 0x89c9c940U, 0xfa7d7d87U,
-  0xeffafa15U, 0xb25959ebU, 0x8e4747c9U, 0xfbf0f00bU,
-  0x41adadecU, 0xb3d4d467U, 0x5fa2a2fdU, 0x45afafeaU,
-  0x239c9cbfU, 0x53a4a4f7U, 0xe4727296U, 0x9bc0c05bU,
-  0x75b7b7c2U, 0xe1fdfd1cU, 0x3d9393aeU, 0x4c26266aU,
-  0x6c36365aU, 0x7e3f3f41U, 0xf5f7f702U, 0x83cccc4fU,
-  0x6834345cU, 0x51a5a5f4U, 0xd1e5e534U, 0xf9f1f108U,
-  0xe2717193U, 0xabd8d873U, 0x62313153U, 0x2a15153fU,
-  0x0804040cU, 0x95c7c752U, 0x46232365U, 0x9dc3c35eU,
-  0x30181828U, 0x379696a1U, 0x0a05050fU, 0x2f9a9ab5U,
-  0x0e070709U, 0x24121236U, 0x1b80809bU, 0xdfe2e23dU,
-  0xcdebeb26U, 0x4e272769U, 0x7fb2b2cdU, 0xea75759fU,
-  0x1209091bU, 0x1d83839eU, 0x582c2c74U, 0x341a1a2eU,
-  0x361b1b2dU, 0xdc6e6eb2U, 0xb45a5aeeU, 0x5ba0a0fbU,
-  0xa45252f6U, 0x763b3b4dU, 0xb7d6d661U, 0x7db3b3ceU,
-  0x5229297bU, 0xdde3e33eU, 0x5e2f2f71U, 0x13848497U,
-  0xa65353f5U, 0xb9d1d168U, 0x00000000U, 0xc1eded2cU,
-  0x40202060U, 0xe3fcfc1fU, 0x79b1b1c8U, 0xb65b5bedU,
-  0xd46a6abeU, 0x8dcbcb46U, 0x67bebed9U, 0x7239394bU,
-  0x944a4adeU, 0x984c4cd4U, 0xb05858e8U, 0x85cfcf4aU,
-  0xbbd0d06bU, 0xc5efef2aU, 0x4faaaae5U, 0xedfbfb16U,
-  0x864343c5U, 0x9a4d4dd7U, 0x66333355U, 0x11858594U,
-  0x8a4545cfU, 0xe9f9f910U, 0x04020206U, 0xfe7f7f81U,
-  0xa05050f0U, 0x783c3c44U, 0x259f9fbaU, 0x4ba8a8e3U,
-  0xa25151f3U, 0x5da3a3feU, 0x804040c0U, 0x058f8f8aU,
-  0x3f9292adU, 0x219d9dbcU, 0x70383848U, 0xf1f5f504U,
-  0x63bcbcdfU, 0x77b6b6c1U, 0xafdada75U, 0x42212163U,
-  0x20101030U, 0xe5ffff1aU, 0xfdf3f30eU, 0xbfd2d26dU,
-  0x81cdcd4cU, 0x180c0c14U, 0x26131335U, 0xc3ecec2fU,
-  0xbe5f5fe1U, 0x359797a2U, 0x884444ccU, 0x2e171739U,
-  0x93c4c457U, 0x55a7a7f2U, 0xfc7e7e82U, 0x7a3d3d47U,
-  0xc86464acU, 0xba5d5de7U, 0x3219192bU, 0xe6737395U,
-  0xc06060a0U, 0x19818198U, 0x9e4f4fd1U, 0xa3dcdc7fU,
-  0x44222266U, 0x542a2a7eU, 0x3b9090abU, 0x0b888883U,
-  0x8c4646caU, 0xc7eeee29U, 0x6bb8b8d3U, 0x2814143cU,
-  0xa7dede79U, 0xbc5e5ee2U, 0x160b0b1dU, 0xaddbdb76U,
-  0xdbe0e03bU, 0x64323256U, 0x743a3a4eU, 0x140a0a1eU,
-  0x924949dbU, 0x0c06060aU, 0x4824246cU, 0xb85c5ce4U,
-  0x9fc2c25dU, 0xbdd3d36eU, 0x43acacefU, 0xc46262a6U,
-  0x399191a8U, 0x319595a4U, 0xd3e4e437U, 0xf279798bU,
-  0xd5e7e732U, 0x8bc8c843U, 0x6e373759U, 0xda6d6db7U,
-  0x018d8d8cU, 0xb1d5d564U, 0x9c4e4ed2U, 0x49a9a9e0U,
-  0xd86c6cb4U, 0xac5656faU, 0xf3f4f407U, 0xcfeaea25U,
-  0xca6565afU, 0xf47a7a8eU, 0x47aeaee9U, 0x10080818U,
-  0x6fbabad5U, 0xf0787888U, 0x4a25256fU, 0x5c2e2e72U,
-  0x381c1c24U, 0x57a6a6f1U, 0x73b4b4c7U, 0x97c6c651U,
-  0xcbe8e823U, 0xa1dddd7cU, 0xe874749cU, 0x3e1f1f21U,
-  0x964b4bddU, 0x61bdbddcU, 0x0d8b8b86U, 0x0f8a8a85U,
-  0xe0707090U, 0x7c3e3e42U, 0x71b5b5c4U, 0xcc6666aaU,
-  0x904848d8U, 0x06030305U, 0xf7f6f601U, 0x1c0e0e12U,
-  0xc26161a3U, 0x6a35355fU, 0xae5757f9U, 0x69b9b9d0U,
-  0x17868691U, 0x99c1c158U, 0x3a1d1d27U, 0x279e9eb9U,
-  0xd9e1e138U, 0xebf8f813U, 0x2b9898b3U, 0x22111133U,
-  0xd26969bbU, 0xa9d9d970U, 0x078e8e89U, 0x339494a7U,
-  0x2d9b9bb6U, 0x3c1e1e22U, 0x15878792U, 0xc9e9e920U,
-  0x87cece49U, 0xaa5555ffU, 0x50282878U, 0xa5dfdf7aU,
-  0x038c8c8fU, 0x59a1a1f8U, 0x09898980U, 0x1a0d0d17U,
-  0x65bfbfdaU, 0xd7e6e631U, 0x844242c6U, 0xd06868b8U,
-  0x824141c3U, 0x299999b0U, 0x5a2d2d77U, 0x1e0f0f11U,
-  0x7bb0b0cbU, 0xa85454fcU, 0x6dbbbbd6U, 0x2c16163aU,
-};
-
-static const uint32 Te1[256]=
-{
-  0xa5c66363U, 0x84f87c7cU, 0x99ee7777U, 0x8df67b7bU,
-  0x0dfff2f2U, 0xbdd66b6bU, 0xb1de6f6fU, 0x5491c5c5U,
-  0x50603030U, 0x03020101U, 0xa9ce6767U, 0x7d562b2bU,
-  0x19e7fefeU, 0x62b5d7d7U, 0xe64dababU, 0x9aec7676U,
-  0x458fcacaU, 0x9d1f8282U, 0x4089c9c9U, 0x87fa7d7dU,
-  0x15effafaU, 0xebb25959U, 0xc98e4747U, 0x0bfbf0f0U,
-  0xec41adadU, 0x67b3d4d4U, 0xfd5fa2a2U, 0xea45afafU,
-  0xbf239c9cU, 0xf753a4a4U, 0x96e47272U, 0x5b9bc0c0U,
-  0xc275b7b7U, 0x1ce1fdfdU, 0xae3d9393U, 0x6a4c2626U,
-  0x5a6c3636U, 0x417e3f3fU, 0x02f5f7f7U, 0x4f83ccccU,
-  0x5c683434U, 0xf451a5a5U, 0x34d1e5e5U, 0x08f9f1f1U,
-  0x93e27171U, 0x73abd8d8U, 0x53623131U, 0x3f2a1515U,
-  0x0c080404U, 0x5295c7c7U, 0x65462323U, 0x5e9dc3c3U,
-  0x28301818U, 0xa1379696U, 0x0f0a0505U, 0xb52f9a9aU,
-  0x090e0707U, 0x36241212U, 0x9b1b8080U, 0x3ddfe2e2U,
-  0x26cdebebU, 0x694e2727U, 0xcd7fb2b2U, 0x9fea7575U,
-  0x1b120909U, 0x9e1d8383U, 0x74582c2cU, 0x2e341a1aU,
-  0x2d361b1bU, 0xb2dc6e6eU, 0xeeb45a5aU, 0xfb5ba0a0U,
-  0xf6a45252U, 0x4d763b3bU, 0x61b7d6d6U, 0xce7db3b3U,
-  0x7b522929U, 0x3edde3e3U, 0x715e2f2fU, 0x97138484U,
-  0xf5a65353U, 0x68b9d1d1U, 0x00000000U, 0x2cc1ededU,
-  0x60402020U, 0x1fe3fcfcU, 0xc879b1b1U, 0xedb65b5bU,
-  0xbed46a6aU, 0x468dcbcbU, 0xd967bebeU, 0x4b723939U,
-  0xde944a4aU, 0xd4984c4cU, 0xe8b05858U, 0x4a85cfcfU,
-  0x6bbbd0d0U, 0x2ac5efefU, 0xe54faaaaU, 0x16edfbfbU,
-  0xc5864343U, 0xd79a4d4dU, 0x55663333U, 0x94118585U,
-  0xcf8a4545U, 0x10e9f9f9U, 0x06040202U, 0x81fe7f7fU,
-  0xf0a05050U, 0x44783c3cU, 0xba259f9fU, 0xe34ba8a8U,
-  0xf3a25151U, 0xfe5da3a3U, 0xc0804040U, 0x8a058f8fU,
-  0xad3f9292U, 0xbc219d9dU, 0x48703838U, 0x04f1f5f5U,
-  0xdf63bcbcU, 0xc177b6b6U, 0x75afdadaU, 0x63422121U,
-  0x30201010U, 0x1ae5ffffU, 0x0efdf3f3U, 0x6dbfd2d2U,
-  0x4c81cdcdU, 0x14180c0cU, 0x35261313U, 0x2fc3ececU,
-  0xe1be5f5fU, 0xa2359797U, 0xcc884444U, 0x392e1717U,
-  0x5793c4c4U, 0xf255a7a7U, 0x82fc7e7eU, 0x477a3d3dU,
-  0xacc86464U, 0xe7ba5d5dU, 0x2b321919U, 0x95e67373U,
-  0xa0c06060U, 0x98198181U, 0xd19e4f4fU, 0x7fa3dcdcU,
-  0x66442222U, 0x7e542a2aU, 0xab3b9090U, 0x830b8888U,
-  0xca8c4646U, 0x29c7eeeeU, 0xd36bb8b8U, 0x3c281414U,
-  0x79a7dedeU, 0xe2bc5e5eU, 0x1d160b0bU, 0x76addbdbU,
-  0x3bdbe0e0U, 0x56643232U, 0x4e743a3aU, 0x1e140a0aU,
-  0xdb924949U, 0x0a0c0606U, 0x6c482424U, 0xe4b85c5cU,
-  0x5d9fc2c2U, 0x6ebdd3d3U, 0xef43acacU, 0xa6c46262U,
-  0xa8399191U, 0xa4319595U, 0x37d3e4e4U, 0x8bf27979U,
-  0x32d5e7e7U, 0x438bc8c8U, 0x596e3737U, 0xb7da6d6dU,
-  0x8c018d8dU, 0x64b1d5d5U, 0xd29c4e4eU, 0xe049a9a9U,
-  0xb4d86c6cU, 0xfaac5656U, 0x07f3f4f4U, 0x25cfeaeaU,
-  0xafca6565U, 0x8ef47a7aU, 0xe947aeaeU, 0x18100808U,
-  0xd56fbabaU, 0x88f07878U, 0x6f4a2525U, 0x725c2e2eU,
-  0x24381c1cU, 0xf157a6a6U, 0xc773b4b4U, 0x5197c6c6U,
-  0x23cbe8e8U, 0x7ca1ddddU, 0x9ce87474U, 0x213e1f1fU,
-  0xdd964b4bU, 0xdc61bdbdU, 0x860d8b8bU, 0x850f8a8aU,
-  0x90e07070U, 0x427c3e3eU, 0xc471b5b5U, 0xaacc6666U,
-  0xd8904848U, 0x05060303U, 0x01f7f6f6U, 0x121c0e0eU,
-  0xa3c26161U, 0x5f6a3535U, 0xf9ae5757U, 0xd069b9b9U,
-  0x91178686U, 0x5899c1c1U, 0x273a1d1dU, 0xb9279e9eU,
-  0x38d9e1e1U, 0x13ebf8f8U, 0xb32b9898U, 0x33221111U,
-  0xbbd26969U, 0x70a9d9d9U, 0x89078e8eU, 0xa7339494U,
-  0xb62d9b9bU, 0x223c1e1eU, 0x92158787U, 0x20c9e9e9U,
-  0x4987ceceU, 0xffaa5555U, 0x78502828U, 0x7aa5dfdfU,
-  0x8f038c8cU, 0xf859a1a1U, 0x80098989U, 0x171a0d0dU,
-  0xda65bfbfU, 0x31d7e6e6U, 0xc6844242U, 0xb8d06868U,
-  0xc3824141U, 0xb0299999U, 0x775a2d2dU, 0x111e0f0fU,
-  0xcb7bb0b0U, 0xfca85454U, 0xd66dbbbbU, 0x3a2c1616U,
-};
-
-static const uint32 Te2[256]=
-{
-  0x63a5c663U, 0x7c84f87cU, 0x7799ee77U, 0x7b8df67bU,
-  0xf20dfff2U, 0x6bbdd66bU, 0x6fb1de6fU, 0xc55491c5U,
-  0x30506030U, 0x01030201U, 0x67a9ce67U, 0x2b7d562bU,
-  0xfe19e7feU, 0xd762b5d7U, 0xabe64dabU, 0x769aec76U,
-  0xca458fcaU, 0x829d1f82U, 0xc94089c9U, 0x7d87fa7dU,
-  0xfa15effaU, 0x59ebb259U, 0x47c98e47U, 0xf00bfbf0U,
-  0xadec41adU, 0xd467b3d4U, 0xa2fd5fa2U, 0xafea45afU,
-  0x9cbf239cU, 0xa4f753a4U, 0x7296e472U, 0xc05b9bc0U,
-  0xb7c275b7U, 0xfd1ce1fdU, 0x93ae3d93U, 0x266a4c26U,
-  0x365a6c36U, 0x3f417e3fU, 0xf702f5f7U, 0xcc4f83ccU,
-  0x345c6834U, 0xa5f451a5U, 0xe534d1e5U, 0xf108f9f1U,
-  0x7193e271U, 0xd873abd8U, 0x31536231U, 0x153f2a15U,
-  0x040c0804U, 0xc75295c7U, 0x23654623U, 0xc35e9dc3U,
-  0x18283018U, 0x96a13796U, 0x050f0a05U, 0x9ab52f9aU,
-  0x07090e07U, 0x12362412U, 0x809b1b80U, 0xe23ddfe2U,
-  0xeb26cdebU, 0x27694e27U, 0xb2cd7fb2U, 0x759fea75U,
-  0x091b1209U, 0x839e1d83U, 0x2c74582cU, 0x1a2e341aU,
-  0x1b2d361bU, 0x6eb2dc6eU, 0x5aeeb45aU, 0xa0fb5ba0U,
-  0x52f6a452U, 0x3b4d763bU, 0xd661b7d6U, 0xb3ce7db3U,
-  0x297b5229U, 0xe33edde3U, 0x2f715e2fU, 0x84971384U,
-  0x53f5a653U, 0xd168b9d1U, 0x00000000U, 0xed2cc1edU,
-  0x20604020U, 0xfc1fe3fcU, 0xb1c879b1U, 0x5bedb65bU,
-  0x6abed46aU, 0xcb468dcbU, 0xbed967beU, 0x394b7239U,
-  0x4ade944aU, 0x4cd4984cU, 0x58e8b058U, 0xcf4a85cfU,
-  0xd06bbbd0U, 0xef2ac5efU, 0xaae54faaU, 0xfb16edfbU,
-  0x43c58643U, 0x4dd79a4dU, 0x33556633U, 0x85941185U,
-  0x45cf8a45U, 0xf910e9f9U, 0x02060402U, 0x7f81fe7fU,
-  0x50f0a050U, 0x3c44783cU, 0x9fba259fU, 0xa8e34ba8U,
-  0x51f3a251U, 0xa3fe5da3U, 0x40c08040U, 0x8f8a058fU,
-  0x92ad3f92U, 0x9dbc219dU, 0x38487038U, 0xf504f1f5U,
-  0xbcdf63bcU, 0xb6c177b6U, 0xda75afdaU, 0x21634221U,
-  0x10302010U, 0xff1ae5ffU, 0xf30efdf3U, 0xd26dbfd2U,
-  0xcd4c81cdU, 0x0c14180cU, 0x13352613U, 0xec2fc3ecU,
-  0x5fe1be5fU, 0x97a23597U, 0x44cc8844U, 0x17392e17U,
-  0xc45793c4U, 0xa7f255a7U, 0x7e82fc7eU, 0x3d477a3dU,
-  0x64acc864U, 0x5de7ba5dU, 0x192b3219U, 0x7395e673U,
-  0x60a0c060U, 0x81981981U, 0x4fd19e4fU, 0xdc7fa3dcU,
-  0x22664422U, 0x2a7e542aU, 0x90ab3b90U, 0x88830b88U,
-  0x46ca8c46U, 0xee29c7eeU, 0xb8d36bb8U, 0x143c2814U,
-  0xde79a7deU, 0x5ee2bc5eU, 0x0b1d160bU, 0xdb76addbU,
-  0xe03bdbe0U, 0x32566432U, 0x3a4e743aU, 0x0a1e140aU,
-  0x49db9249U, 0x060a0c06U, 0x246c4824U, 0x5ce4b85cU,
-  0xc25d9fc2U, 0xd36ebdd3U, 0xacef43acU, 0x62a6c462U,
-  0x91a83991U, 0x95a43195U, 0xe437d3e4U, 0x798bf279U,
-  0xe732d5e7U, 0xc8438bc8U, 0x37596e37U, 0x6db7da6dU,
-  0x8d8c018dU, 0xd564b1d5U, 0x4ed29c4eU, 0xa9e049a9U,
-  0x6cb4d86cU, 0x56faac56U, 0xf407f3f4U, 0xea25cfeaU,
-  0x65afca65U, 0x7a8ef47aU, 0xaee947aeU, 0x08181008U,
-  0xbad56fbaU, 0x7888f078U, 0x256f4a25U, 0x2e725c2eU,
-  0x1c24381cU, 0xa6f157a6U, 0xb4c773b4U, 0xc65197c6U,
-  0xe823cbe8U, 0xdd7ca1ddU, 0x749ce874U, 0x1f213e1fU,
-  0x4bdd964bU, 0xbddc61bdU, 0x8b860d8bU, 0x8a850f8aU,
-  0x7090e070U, 0x3e427c3eU, 0xb5c471b5U, 0x66aacc66U,
-  0x48d89048U, 0x03050603U, 0xf601f7f6U, 0x0e121c0eU,
-  0x61a3c261U, 0x355f6a35U, 0x57f9ae57U, 0xb9d069b9U,
-  0x86911786U, 0xc15899c1U, 0x1d273a1dU, 0x9eb9279eU,
-  0xe138d9e1U, 0xf813ebf8U, 0x98b32b98U, 0x11332211U,
-  0x69bbd269U, 0xd970a9d9U, 0x8e89078eU, 0x94a73394U,
-  0x9bb62d9bU, 0x1e223c1eU, 0x87921587U, 0xe920c9e9U,
-  0xce4987ceU, 0x55ffaa55U, 0x28785028U, 0xdf7aa5dfU,
-  0x8c8f038cU, 0xa1f859a1U, 0x89800989U, 0x0d171a0dU,
-  0xbfda65bfU, 0xe631d7e6U, 0x42c68442U, 0x68b8d068U,
-  0x41c38241U, 0x99b02999U, 0x2d775a2dU, 0x0f111e0fU,
-  0xb0cb7bb0U, 0x54fca854U, 0xbbd66dbbU, 0x163a2c16U,
-};
-
-static const uint32 Te3[256]=
-{
-  0x6363a5c6U, 0x7c7c84f8U, 0x777799eeU, 0x7b7b8df6U,
-  0xf2f20dffU, 0x6b6bbdd6U, 0x6f6fb1deU, 0xc5c55491U,
-  0x30305060U, 0x01010302U, 0x6767a9ceU, 0x2b2b7d56U,
-  0xfefe19e7U, 0xd7d762b5U, 0xababe64dU, 0x76769aecU,
-  0xcaca458fU, 0x82829d1fU, 0xc9c94089U, 0x7d7d87faU,
-  0xfafa15efU, 0x5959ebb2U, 0x4747c98eU, 0xf0f00bfbU,
-  0xadadec41U, 0xd4d467b3U, 0xa2a2fd5fU, 0xafafea45U,
-  0x9c9cbf23U, 0xa4a4f753U, 0x727296e4U, 0xc0c05b9bU,
-  0xb7b7c275U, 0xfdfd1ce1U, 0x9393ae3dU, 0x26266a4cU,
-  0x36365a6cU, 0x3f3f417eU, 0xf7f702f5U, 0xcccc4f83U,
-  0x34345c68U, 0xa5a5f451U, 0xe5e534d1U, 0xf1f108f9U,
-  0x717193e2U, 0xd8d873abU, 0x31315362U, 0x15153f2aU,
-  0x04040c08U, 0xc7c75295U, 0x23236546U, 0xc3c35e9dU,
-  0x18182830U, 0x9696a137U, 0x05050f0aU, 0x9a9ab52fU,
-  0x0707090eU, 0x12123624U, 0x80809b1bU, 0xe2e23ddfU,
-  0xebeb26cdU, 0x2727694eU, 0xb2b2cd7fU, 0x75759feaU,
-  0x09091b12U, 0x83839e1dU, 0x2c2c7458U, 0x1a1a2e34U,
-  0x1b1b2d36U, 0x6e6eb2dcU, 0x5a5aeeb4U, 0xa0a0fb5bU,
-  0x5252f6a4U, 0x3b3b4d76U, 0xd6d661b7U, 0xb3b3ce7dU,
-  0x29297b52U, 0xe3e33eddU, 0x2f2f715eU, 0x84849713U,
-  0x5353f5a6U, 0xd1d168b9U, 0x00000000U, 0xeded2cc1U,
-  0x20206040U, 0xfcfc1fe3U, 0xb1b1c879U, 0x5b5bedb6U,
-  0x6a6abed4U, 0xcbcb468dU, 0xbebed967U, 0x39394b72U,
-  0x4a4ade94U, 0x4c4cd498U, 0x5858e8b0U, 0xcfcf4a85U,
-  0xd0d06bbbU, 0xefef2ac5U, 0xaaaae54fU, 0xfbfb16edU,
-  0x4343c586U, 0x4d4dd79aU, 0x33335566U, 0x85859411U,
-  0x4545cf8aU, 0xf9f910e9U, 0x02020604U, 0x7f7f81feU,
-  0x5050f0a0U, 0x3c3c4478U, 0x9f9fba25U, 0xa8a8e34bU,
-  0x5151f3a2U, 0xa3a3fe5dU, 0x4040c080U, 0x8f8f8a05U,
-  0x9292ad3fU, 0x9d9dbc21U, 0x38384870U, 0xf5f504f1U,
-  0xbcbcdf63U, 0xb6b6c177U, 0xdada75afU, 0x21216342U,
-  0x10103020U, 0xffff1ae5U, 0xf3f30efdU, 0xd2d26dbfU,
-  0xcdcd4c81U, 0x0c0c1418U, 0x13133526U, 0xecec2fc3U,
-  0x5f5fe1beU, 0x9797a235U, 0x4444cc88U, 0x1717392eU,
-  0xc4c45793U, 0xa7a7f255U, 0x7e7e82fcU, 0x3d3d477aU,
-  0x6464acc8U, 0x5d5de7baU, 0x19192b32U, 0x737395e6U,
-  0x6060a0c0U, 0x81819819U, 0x4f4fd19eU, 0xdcdc7fa3U,
-  0x22226644U, 0x2a2a7e54U, 0x9090ab3bU, 0x8888830bU,
-  0x4646ca8cU, 0xeeee29c7U, 0xb8b8d36bU, 0x14143c28U,
-  0xdede79a7U, 0x5e5ee2bcU, 0x0b0b1d16U, 0xdbdb76adU,
-  0xe0e03bdbU, 0x32325664U, 0x3a3a4e74U, 0x0a0a1e14U,
-  0x4949db92U, 0x06060a0cU, 0x24246c48U, 0x5c5ce4b8U,
-  0xc2c25d9fU, 0xd3d36ebdU, 0xacacef43U, 0x6262a6c4U,
-  0x9191a839U, 0x9595a431U, 0xe4e437d3U, 0x79798bf2U,
-  0xe7e732d5U, 0xc8c8438bU, 0x3737596eU, 0x6d6db7daU,
-  0x8d8d8c01U, 0xd5d564b1U, 0x4e4ed29cU, 0xa9a9e049U,
-  0x6c6cb4d8U, 0x5656faacU, 0xf4f407f3U, 0xeaea25cfU,
-  0x6565afcaU, 0x7a7a8ef4U, 0xaeaee947U, 0x08081810U,
-  0xbabad56fU, 0x787888f0U, 0x25256f4aU, 0x2e2e725cU,
-  0x1c1c2438U, 0xa6a6f157U, 0xb4b4c773U, 0xc6c65197U,
-  0xe8e823cbU, 0xdddd7ca1U, 0x74749ce8U, 0x1f1f213eU,
-  0x4b4bdd96U, 0xbdbddc61U, 0x8b8b860dU, 0x8a8a850fU,
-  0x707090e0U, 0x3e3e427cU, 0xb5b5c471U, 0x6666aaccU,
-  0x4848d890U, 0x03030506U, 0xf6f601f7U, 0x0e0e121cU,
-  0x6161a3c2U, 0x35355f6aU, 0x5757f9aeU, 0xb9b9d069U,
-  0x86869117U, 0xc1c15899U, 0x1d1d273aU, 0x9e9eb927U,
-  0xe1e138d9U, 0xf8f813ebU, 0x9898b32bU, 0x11113322U,
-  0x6969bbd2U, 0xd9d970a9U, 0x8e8e8907U, 0x9494a733U,
-  0x9b9bb62dU, 0x1e1e223cU, 0x87879215U, 0xe9e920c9U,
-  0xcece4987U, 0x5555ffaaU, 0x28287850U, 0xdfdf7aa5U,
-  0x8c8c8f03U, 0xa1a1f859U, 0x89898009U, 0x0d0d171aU,
-  0xbfbfda65U, 0xe6e631d7U, 0x4242c684U, 0x6868b8d0U,
-  0x4141c382U, 0x9999b029U, 0x2d2d775aU, 0x0f0f111eU,
-  0xb0b0cb7bU, 0x5454fca8U, 0xbbbbd66dU, 0x16163a2cU,
-};
-
-static const uint32 Te4[256]=
-{
-  0x63636363U, 0x7c7c7c7cU, 0x77777777U, 0x7b7b7b7bU,
-  0xf2f2f2f2U, 0x6b6b6b6bU, 0x6f6f6f6fU, 0xc5c5c5c5U,
-  0x30303030U, 0x01010101U, 0x67676767U, 0x2b2b2b2bU,
-  0xfefefefeU, 0xd7d7d7d7U, 0xababababU, 0x76767676U,
-  0xcacacacaU, 0x82828282U, 0xc9c9c9c9U, 0x7d7d7d7dU,
-  0xfafafafaU, 0x59595959U, 0x47474747U, 0xf0f0f0f0U,
-  0xadadadadU, 0xd4d4d4d4U, 0xa2a2a2a2U, 0xafafafafU,
-  0x9c9c9c9cU, 0xa4a4a4a4U, 0x72727272U, 0xc0c0c0c0U,
-  0xb7b7b7b7U, 0xfdfdfdfdU, 0x93939393U, 0x26262626U,
-  0x36363636U, 0x3f3f3f3fU, 0xf7f7f7f7U, 0xccccccccU,
-  0x34343434U, 0xa5a5a5a5U, 0xe5e5e5e5U, 0xf1f1f1f1U,
-  0x71717171U, 0xd8d8d8d8U, 0x31313131U, 0x15151515U,
-  0x04040404U, 0xc7c7c7c7U, 0x23232323U, 0xc3c3c3c3U,
-  0x18181818U, 0x96969696U, 0x05050505U, 0x9a9a9a9aU,
-  0x07070707U, 0x12121212U, 0x80808080U, 0xe2e2e2e2U,
-  0xebebebebU, 0x27272727U, 0xb2b2b2b2U, 0x75757575U,
-  0x09090909U, 0x83838383U, 0x2c2c2c2cU, 0x1a1a1a1aU,
-  0x1b1b1b1bU, 0x6e6e6e6eU, 0x5a5a5a5aU, 0xa0a0a0a0U,
-  0x52525252U, 0x3b3b3b3bU, 0xd6d6d6d6U, 0xb3b3b3b3U,
-  0x29292929U, 0xe3e3e3e3U, 0x2f2f2f2fU, 0x84848484U,
-  0x53535353U, 0xd1d1d1d1U, 0x00000000U, 0xededededU,
-  0x20202020U, 0xfcfcfcfcU, 0xb1b1b1b1U, 0x5b5b5b5bU,
-  0x6a6a6a6aU, 0xcbcbcbcbU, 0xbebebebeU, 0x39393939U,
-  0x4a4a4a4aU, 0x4c4c4c4cU, 0x58585858U, 0xcfcfcfcfU,
-  0xd0d0d0d0U, 0xefefefefU, 0xaaaaaaaaU, 0xfbfbfbfbU,
-  0x43434343U, 0x4d4d4d4dU, 0x33333333U, 0x85858585U,
-  0x45454545U, 0xf9f9f9f9U, 0x02020202U, 0x7f7f7f7fU,
-  0x50505050U, 0x3c3c3c3cU, 0x9f9f9f9fU, 0xa8a8a8a8U,
-  0x51515151U, 0xa3a3a3a3U, 0x40404040U, 0x8f8f8f8fU,
-  0x92929292U, 0x9d9d9d9dU, 0x38383838U, 0xf5f5f5f5U,
-  0xbcbcbcbcU, 0xb6b6b6b6U, 0xdadadadaU, 0x21212121U,
-  0x10101010U, 0xffffffffU, 0xf3f3f3f3U, 0xd2d2d2d2U,
-  0xcdcdcdcdU, 0x0c0c0c0cU, 0x13131313U, 0xececececU,
-  0x5f5f5f5fU, 0x97979797U, 0x44444444U, 0x17171717U,
-  0xc4c4c4c4U, 0xa7a7a7a7U, 0x7e7e7e7eU, 0x3d3d3d3dU,
-  0x64646464U, 0x5d5d5d5dU, 0x19191919U, 0x73737373U,
-  0x60606060U, 0x81818181U, 0x4f4f4f4fU, 0xdcdcdcdcU,
-  0x22222222U, 0x2a2a2a2aU, 0x90909090U, 0x88888888U,
-  0x46464646U, 0xeeeeeeeeU, 0xb8b8b8b8U, 0x14141414U,
-  0xdedededeU, 0x5e5e5e5eU, 0x0b0b0b0bU, 0xdbdbdbdbU,
-  0xe0e0e0e0U, 0x32323232U, 0x3a3a3a3aU, 0x0a0a0a0aU,
-  0x49494949U, 0x06060606U, 0x24242424U, 0x5c5c5c5cU,
-  0xc2c2c2c2U, 0xd3d3d3d3U, 0xacacacacU, 0x62626262U,
-  0x91919191U, 0x95959595U, 0xe4e4e4e4U, 0x79797979U,
-  0xe7e7e7e7U, 0xc8c8c8c8U, 0x37373737U, 0x6d6d6d6dU,
-  0x8d8d8d8dU, 0xd5d5d5d5U, 0x4e4e4e4eU, 0xa9a9a9a9U,
-  0x6c6c6c6cU, 0x56565656U, 0xf4f4f4f4U, 0xeaeaeaeaU,
-  0x65656565U, 0x7a7a7a7aU, 0xaeaeaeaeU, 0x08080808U,
-  0xbabababaU, 0x78787878U, 0x25252525U, 0x2e2e2e2eU,
-  0x1c1c1c1cU, 0xa6a6a6a6U, 0xb4b4b4b4U, 0xc6c6c6c6U,
-  0xe8e8e8e8U, 0xddddddddU, 0x74747474U, 0x1f1f1f1fU,
-  0x4b4b4b4bU, 0xbdbdbdbdU, 0x8b8b8b8bU, 0x8a8a8a8aU,
-  0x70707070U, 0x3e3e3e3eU, 0xb5b5b5b5U, 0x66666666U,
-  0x48484848U, 0x03030303U, 0xf6f6f6f6U, 0x0e0e0e0eU,
-  0x61616161U, 0x35353535U, 0x57575757U, 0xb9b9b9b9U,
-  0x86868686U, 0xc1c1c1c1U, 0x1d1d1d1dU, 0x9e9e9e9eU,
-  0xe1e1e1e1U, 0xf8f8f8f8U, 0x98989898U, 0x11111111U,
-  0x69696969U, 0xd9d9d9d9U, 0x8e8e8e8eU, 0x94949494U,
-  0x9b9b9b9bU, 0x1e1e1e1eU, 0x87878787U, 0xe9e9e9e9U,
-  0xcecececeU, 0x55555555U, 0x28282828U, 0xdfdfdfdfU,
-  0x8c8c8c8cU, 0xa1a1a1a1U, 0x89898989U, 0x0d0d0d0dU,
-  0xbfbfbfbfU, 0xe6e6e6e6U, 0x42424242U, 0x68686868U,
-  0x41414141U, 0x99999999U, 0x2d2d2d2dU, 0x0f0f0f0fU,
-  0xb0b0b0b0U, 0x54545454U, 0xbbbbbbbbU, 0x16161616U,
-};
-
-static const uint32 Td0[256]=
-{
-  0x51f4a750U, 0x7e416553U, 0x1a17a4c3U, 0x3a275e96U,
-  0x3bab6bcbU, 0x1f9d45f1U, 0xacfa58abU, 0x4be30393U,
-  0x2030fa55U, 0xad766df6U, 0x88cc7691U, 0xf5024c25U,
-  0x4fe5d7fcU, 0xc52acbd7U, 0x26354480U, 0xb562a38fU,
-  0xdeb15a49U, 0x25ba1b67U, 0x45ea0e98U, 0x5dfec0e1U,
-  0xc32f7502U, 0x814cf012U, 0x8d4697a3U, 0x6bd3f9c6U,
-  0x038f5fe7U, 0x15929c95U, 0xbf6d7aebU, 0x955259daU,
-  0xd4be832dU, 0x587421d3U, 0x49e06929U, 0x8ec9c844U,
-  0x75c2896aU, 0xf48e7978U, 0x99583e6bU, 0x27b971ddU,
-  0xbee14fb6U, 0xf088ad17U, 0xc920ac66U, 0x7dce3ab4U,
-  0x63df4a18U, 0xe51a3182U, 0x97513360U, 0x62537f45U,
-  0xb16477e0U, 0xbb6bae84U, 0xfe81a01cU, 0xf9082b94U,
-  0x70486858U, 0x8f45fd19U, 0x94de6c87U, 0x527bf8b7U,
-  0xab73d323U, 0x724b02e2U, 0xe31f8f57U, 0x6655ab2aU,
-  0xb2eb2807U, 0x2fb5c203U, 0x86c57b9aU, 0xd33708a5U,
-  0x302887f2U, 0x23bfa5b2U, 0x02036abaU, 0xed16825cU,
-  0x8acf1c2bU, 0xa779b492U, 0xf307f2f0U, 0x4e69e2a1U,
-  0x65daf4cdU, 0x0605bed5U, 0xd134621fU, 0xc4a6fe8aU,
-  0x342e539dU, 0xa2f355a0U, 0x058ae132U, 0xa4f6eb75U,
-  0x0b83ec39U, 0x4060efaaU, 0x5e719f06U, 0xbd6e1051U,
-  0x3e218af9U, 0x96dd063dU, 0xdd3e05aeU, 0x4de6bd46U,
-  0x91548db5U, 0x71c45d05U, 0x0406d46fU, 0x605015ffU,
-  0x1998fb24U, 0xd6bde997U, 0x894043ccU, 0x67d99e77U,
-  0xb0e842bdU, 0x07898b88U, 0xe7195b38U, 0x79c8eedbU,
-  0xa17c0a47U, 0x7c420fe9U, 0xf8841ec9U, 0x00000000U,
-  0x09808683U, 0x322bed48U, 0x1e1170acU, 0x6c5a724eU,
-  0xfd0efffbU, 0x0f853856U, 0x3daed51eU, 0x362d3927U,
-  0x0a0fd964U, 0x685ca621U, 0x9b5b54d1U, 0x24362e3aU,
-  0x0c0a67b1U, 0x9357e70fU, 0xb4ee96d2U, 0x1b9b919eU,
-  0x80c0c54fU, 0x61dc20a2U, 0x5a774b69U, 0x1c121a16U,
-  0xe293ba0aU, 0xc0a02ae5U, 0x3c22e043U, 0x121b171dU,
-  0x0e090d0bU, 0xf28bc7adU, 0x2db6a8b9U, 0x141ea9c8U,
-  0x57f11985U, 0xaf75074cU, 0xee99ddbbU, 0xa37f60fdU,
-  0xf701269fU, 0x5c72f5bcU, 0x44663bc5U, 0x5bfb7e34U,
-  0x8b432976U, 0xcb23c6dcU, 0xb6edfc68U, 0xb8e4f163U,
-  0xd731dccaU, 0x42638510U, 0x13972240U, 0x84c61120U,
-  0x854a247dU, 0xd2bb3df8U, 0xaef93211U, 0xc729a16dU,
-  0x1d9e2f4bU, 0xdcb230f3U, 0x0d8652ecU, 0x77c1e3d0U,
-  0x2bb3166cU, 0xa970b999U, 0x119448faU, 0x47e96422U,
-  0xa8fc8cc4U, 0xa0f03f1aU, 0x567d2cd8U, 0x223390efU,
-  0x87494ec7U, 0xd938d1c1U, 0x8ccaa2feU, 0x98d40b36U,
-  0xa6f581cfU, 0xa57ade28U, 0xdab78e26U, 0x3fadbfa4U,
-  0x2c3a9de4U, 0x5078920dU, 0x6a5fcc9bU, 0x547e4662U,
-  0xf68d13c2U, 0x90d8b8e8U, 0x2e39f75eU, 0x82c3aff5U,
-  0x9f5d80beU, 0x69d0937cU, 0x6fd52da9U, 0xcf2512b3U,
-  0xc8ac993bU, 0x10187da7U, 0xe89c636eU, 0xdb3bbb7bU,
-  0xcd267809U, 0x6e5918f4U, 0xec9ab701U, 0x834f9aa8U,
-  0xe6956e65U, 0xaaffe67eU, 0x21bccf08U, 0xef15e8e6U,
-  0xbae79bd9U, 0x4a6f36ceU, 0xea9f09d4U, 0x29b07cd6U,
-  0x31a4b2afU, 0x2a3f2331U, 0xc6a59430U, 0x35a266c0U,
-  0x744ebc37U, 0xfc82caa6U, 0xe090d0b0U, 0x33a7d815U,
-  0xf104984aU, 0x41ecdaf7U, 0x7fcd500eU, 0x1791f62fU,
-  0x764dd68dU, 0x43efb04dU, 0xccaa4d54U, 0xe49604dfU,
-  0x9ed1b5e3U, 0x4c6a881bU, 0xc12c1fb8U, 0x4665517fU,
-  0x9d5eea04U, 0x018c355dU, 0xfa877473U, 0xfb0b412eU,
-  0xb3671d5aU, 0x92dbd252U, 0xe9105633U, 0x6dd64713U,
-  0x9ad7618cU, 0x37a10c7aU, 0x59f8148eU, 0xeb133c89U,
-  0xcea927eeU, 0xb761c935U, 0xe11ce5edU, 0x7a47b13cU,
-  0x9cd2df59U, 0x55f2733fU, 0x1814ce79U, 0x73c737bfU,
-  0x53f7cdeaU, 0x5ffdaa5bU, 0xdf3d6f14U, 0x7844db86U,
-  0xcaaff381U, 0xb968c43eU, 0x3824342cU, 0xc2a3405fU,
-  0x161dc372U, 0xbce2250cU, 0x283c498bU, 0xff0d9541U,
-  0x39a80171U, 0x080cb3deU, 0xd8b4e49cU, 0x6456c190U,
-  0x7bcb8461U, 0xd532b670U, 0x486c5c74U, 0xd0b85742U,
-};
-
-static const uint32 Td1[256]=
-{
-  0x5051f4a7U, 0x537e4165U, 0xc31a17a4U, 0x963a275eU,
-  0xcb3bab6bU, 0xf11f9d45U, 0xabacfa58U, 0x934be303U,
-  0x552030faU, 0xf6ad766dU, 0x9188cc76U, 0x25f5024cU,
-  0xfc4fe5d7U, 0xd7c52acbU, 0x80263544U, 0x8fb562a3U,
-  0x49deb15aU, 0x6725ba1bU, 0x9845ea0eU, 0xe15dfec0U,
-  0x02c32f75U, 0x12814cf0U, 0xa38d4697U, 0xc66bd3f9U,
-  0xe7038f5fU, 0x9515929cU, 0xebbf6d7aU, 0xda955259U,
-  0x2dd4be83U, 0xd3587421U, 0x2949e069U, 0x448ec9c8U,
-  0x6a75c289U, 0x78f48e79U, 0x6b99583eU, 0xdd27b971U,
-  0xb6bee14fU, 0x17f088adU, 0x66c920acU, 0xb47dce3aU,
-  0x1863df4aU, 0x82e51a31U, 0x60975133U, 0x4562537fU,
-  0xe0b16477U, 0x84bb6baeU, 0x1cfe81a0U, 0x94f9082bU,
-  0x58704868U, 0x198f45fdU, 0x8794de6cU, 0xb7527bf8U,
-  0x23ab73d3U, 0xe2724b02U, 0x57e31f8fU, 0x2a6655abU,
-  0x07b2eb28U, 0x032fb5c2U, 0x9a86c57bU, 0xa5d33708U,
-  0xf2302887U, 0xb223bfa5U, 0xba02036aU, 0x5ced1682U,
-  0x2b8acf1cU, 0x92a779b4U, 0xf0f307f2U, 0xa14e69e2U,
-  0xcd65daf4U, 0xd50605beU, 0x1fd13462U, 0x8ac4a6feU,
-  0x9d342e53U, 0xa0a2f355U, 0x32058ae1U, 0x75a4f6ebU,
-  0x390b83ecU, 0xaa4060efU, 0x065e719fU, 0x51bd6e10U,
-  0xf93e218aU, 0x3d96dd06U, 0xaedd3e05U, 0x464de6bdU,
-  0xb591548dU, 0x0571c45dU, 0x6f0406d4U, 0xff605015U,
-  0x241998fbU, 0x97d6bde9U, 0xcc894043U, 0x7767d99eU,
-  0xbdb0e842U, 0x8807898bU, 0x38e7195bU, 0xdb79c8eeU,
-  0x47a17c0aU, 0xe97c420fU, 0xc9f8841eU, 0x00000000U,
-  0x83098086U, 0x48322bedU, 0xac1e1170U, 0x4e6c5a72U,
-  0xfbfd0effU, 0x560f8538U, 0x1e3daed5U, 0x27362d39U,
-  0x640a0fd9U, 0x21685ca6U, 0xd19b5b54U, 0x3a24362eU,
-  0xb10c0a67U, 0x0f9357e7U, 0xd2b4ee96U, 0x9e1b9b91U,
-  0x4f80c0c5U, 0xa261dc20U, 0x695a774bU, 0x161c121aU,
-  0x0ae293baU, 0xe5c0a02aU, 0x433c22e0U, 0x1d121b17U,
-  0x0b0e090dU, 0xadf28bc7U, 0xb92db6a8U, 0xc8141ea9U,
-  0x8557f119U, 0x4caf7507U, 0xbbee99ddU, 0xfda37f60U,
-  0x9ff70126U, 0xbc5c72f5U, 0xc544663bU, 0x345bfb7eU,
-  0x768b4329U, 0xdccb23c6U, 0x68b6edfcU, 0x63b8e4f1U,
-  0xcad731dcU, 0x10426385U, 0x40139722U, 0x2084c611U,
-  0x7d854a24U, 0xf8d2bb3dU, 0x11aef932U, 0x6dc729a1U,
-  0x4b1d9e2fU, 0xf3dcb230U, 0xec0d8652U, 0xd077c1e3U,
-  0x6c2bb316U, 0x99a970b9U, 0xfa119448U, 0x2247e964U,
-  0xc4a8fc8cU, 0x1aa0f03fU, 0xd8567d2cU, 0xef223390U,
-  0xc787494eU, 0xc1d938d1U, 0xfe8ccaa2U, 0x3698d40bU,
-  0xcfa6f581U, 0x28a57adeU, 0x26dab78eU, 0xa43fadbfU,
-  0xe42c3a9dU, 0x0d507892U, 0x9b6a5fccU, 0x62547e46U,
-  0xc2f68d13U, 0xe890d8b8U, 0x5e2e39f7U, 0xf582c3afU,
-  0xbe9f5d80U, 0x7c69d093U, 0xa96fd52dU, 0xb3cf2512U,
-  0x3bc8ac99U, 0xa710187dU, 0x6ee89c63U, 0x7bdb3bbbU,
-  0x09cd2678U, 0xf46e5918U, 0x01ec9ab7U, 0xa8834f9aU,
-  0x65e6956eU, 0x7eaaffe6U, 0x0821bccfU, 0xe6ef15e8U,
-  0xd9bae79bU, 0xce4a6f36U, 0xd4ea9f09U, 0xd629b07cU,
-  0xaf31a4b2U, 0x312a3f23U, 0x30c6a594U, 0xc035a266U,
-  0x37744ebcU, 0xa6fc82caU, 0xb0e090d0U, 0x1533a7d8U,
-  0x4af10498U, 0xf741ecdaU, 0x0e7fcd50U, 0x2f1791f6U,
-  0x8d764dd6U, 0x4d43efb0U, 0x54ccaa4dU, 0xdfe49604U,
-  0xe39ed1b5U, 0x1b4c6a88U, 0xb8c12c1fU, 0x7f466551U,
-  0x049d5eeaU, 0x5d018c35U, 0x73fa8774U, 0x2efb0b41U,
-  0x5ab3671dU, 0x5292dbd2U, 0x33e91056U, 0x136dd647U,
-  0x8c9ad761U, 0x7a37a10cU, 0x8e59f814U, 0x89eb133cU,
-  0xeecea927U, 0x35b761c9U, 0xede11ce5U, 0x3c7a47b1U,
-  0x599cd2dfU, 0x3f55f273U, 0x791814ceU, 0xbf73c737U,
-  0xea53f7cdU, 0x5b5ffdaaU, 0x14df3d6fU, 0x867844dbU,
-  0x81caaff3U, 0x3eb968c4U, 0x2c382434U, 0x5fc2a340U,
-  0x72161dc3U, 0x0cbce225U, 0x8b283c49U, 0x41ff0d95U,
-  0x7139a801U, 0xde080cb3U, 0x9cd8b4e4U, 0x906456c1U,
-  0x617bcb84U, 0x70d532b6U, 0x74486c5cU, 0x42d0b857U,
-};
-
-static const uint32 Td2[256]=
-{
-  0xa75051f4U, 0x65537e41U, 0xa4c31a17U, 0x5e963a27U,
-  0x6bcb3babU, 0x45f11f9dU, 0x58abacfaU, 0x03934be3U,
-  0xfa552030U, 0x6df6ad76U, 0x769188ccU, 0x4c25f502U,
-  0xd7fc4fe5U, 0xcbd7c52aU, 0x44802635U, 0xa38fb562U,
-  0x5a49deb1U, 0x1b6725baU, 0x0e9845eaU, 0xc0e15dfeU,
-  0x7502c32fU, 0xf012814cU, 0x97a38d46U, 0xf9c66bd3U,
-  0x5fe7038fU, 0x9c951592U, 0x7aebbf6dU, 0x59da9552U,
-  0x832dd4beU, 0x21d35874U, 0x692949e0U, 0xc8448ec9U,
-  0x896a75c2U, 0x7978f48eU, 0x3e6b9958U, 0x71dd27b9U,
-  0x4fb6bee1U, 0xad17f088U, 0xac66c920U, 0x3ab47dceU,
-  0x4a1863dfU, 0x3182e51aU, 0x33609751U, 0x7f456253U,
-  0x77e0b164U, 0xae84bb6bU, 0xa01cfe81U, 0x2b94f908U,
-  0x68587048U, 0xfd198f45U, 0x6c8794deU, 0xf8b7527bU,
-  0xd323ab73U, 0x02e2724bU, 0x8f57e31fU, 0xab2a6655U,
-  0x2807b2ebU, 0xc2032fb5U, 0x7b9a86c5U, 0x08a5d337U,
-  0x87f23028U, 0xa5b223bfU, 0x6aba0203U, 0x825ced16U,
-  0x1c2b8acfU, 0xb492a779U, 0xf2f0f307U, 0xe2a14e69U,
-  0xf4cd65daU, 0xbed50605U, 0x621fd134U, 0xfe8ac4a6U,
-  0x539d342eU, 0x55a0a2f3U, 0xe132058aU, 0xeb75a4f6U,
-  0xec390b83U, 0xefaa4060U, 0x9f065e71U, 0x1051bd6eU,
-
-  0x8af93e21U, 0x063d96ddU, 0x05aedd3eU, 0xbd464de6U,
-  0x8db59154U, 0x5d0571c4U, 0xd46f0406U, 0x15ff6050U,
-  0xfb241998U, 0xe997d6bdU, 0x43cc8940U, 0x9e7767d9U,
-  0x42bdb0e8U, 0x8b880789U, 0x5b38e719U, 0xeedb79c8U,
-  0x0a47a17cU, 0x0fe97c42U, 0x1ec9f884U, 0x00000000U,
-  0x86830980U, 0xed48322bU, 0x70ac1e11U, 0x724e6c5aU,
-  0xfffbfd0eU, 0x38560f85U, 0xd51e3daeU, 0x3927362dU,
-  0xd9640a0fU, 0xa621685cU, 0x54d19b5bU, 0x2e3a2436U,
-  0x67b10c0aU, 0xe70f9357U, 0x96d2b4eeU, 0x919e1b9bU,
-  0xc54f80c0U, 0x20a261dcU, 0x4b695a77U, 0x1a161c12U,
-  0xba0ae293U, 0x2ae5c0a0U, 0xe0433c22U, 0x171d121bU,
-  0x0d0b0e09U, 0xc7adf28bU, 0xa8b92db6U, 0xa9c8141eU,
-  0x198557f1U, 0x074caf75U, 0xddbbee99U, 0x60fda37fU,
-  0x269ff701U, 0xf5bc5c72U, 0x3bc54466U, 0x7e345bfbU,
-  0x29768b43U, 0xc6dccb23U, 0xfc68b6edU, 0xf163b8e4U,
-  0xdccad731U, 0x85104263U, 0x22401397U, 0x112084c6U,
-  0x247d854aU, 0x3df8d2bbU, 0x3211aef9U, 0xa16dc729U,
-  0x2f4b1d9eU, 0x30f3dcb2U, 0x52ec0d86U, 0xe3d077c1U,
-  0x166c2bb3U, 0xb999a970U, 0x48fa1194U, 0x642247e9U,
-  0x8cc4a8fcU, 0x3f1aa0f0U, 0x2cd8567dU, 0x90ef2233U,
-  0x4ec78749U, 0xd1c1d938U, 0xa2fe8ccaU, 0x0b3698d4U,
-  0x81cfa6f5U, 0xde28a57aU, 0x8e26dab7U, 0xbfa43fadU,
-  0x9de42c3aU, 0x920d5078U, 0xcc9b6a5fU, 0x4662547eU,
-  0x13c2f68dU, 0xb8e890d8U, 0xf75e2e39U, 0xaff582c3U,
-  0x80be9f5dU, 0x937c69d0U, 0x2da96fd5U, 0x12b3cf25U,
-  0x993bc8acU, 0x7da71018U, 0x636ee89cU, 0xbb7bdb3bU,
-  0x7809cd26U, 0x18f46e59U, 0xb701ec9aU, 0x9aa8834fU,
-  0x6e65e695U, 0xe67eaaffU, 0xcf0821bcU, 0xe8e6ef15U,
-  0x9bd9bae7U, 0x36ce4a6fU, 0x09d4ea9fU, 0x7cd629b0U,
-  0xb2af31a4U, 0x23312a3fU, 0x9430c6a5U, 0x66c035a2U,
-  0xbc37744eU, 0xcaa6fc82U, 0xd0b0e090U, 0xd81533a7U,
-  0x984af104U, 0xdaf741ecU, 0x500e7fcdU, 0xf62f1791U,
-  0xd68d764dU, 0xb04d43efU, 0x4d54ccaaU, 0x04dfe496U,
-  0xb5e39ed1U, 0x881b4c6aU, 0x1fb8c12cU, 0x517f4665U,
-  0xea049d5eU, 0x355d018cU, 0x7473fa87U, 0x412efb0bU,
-  0x1d5ab367U, 0xd25292dbU, 0x5633e910U, 0x47136dd6U,
-  0x618c9ad7U, 0x0c7a37a1U, 0x148e59f8U, 0x3c89eb13U,
-  0x27eecea9U, 0xc935b761U, 0xe5ede11cU, 0xb13c7a47U,
-  0xdf599cd2U, 0x733f55f2U, 0xce791814U, 0x37bf73c7U,
-  0xcdea53f7U, 0xaa5b5ffdU, 0x6f14df3dU, 0xdb867844U,
-  0xf381caafU, 0xc43eb968U, 0x342c3824U, 0x405fc2a3U,
-  0xc372161dU, 0x250cbce2U, 0x498b283cU, 0x9541ff0dU,
-  0x017139a8U, 0xb3de080cU, 0xe49cd8b4U, 0xc1906456U,
-  0x84617bcbU, 0xb670d532U, 0x5c74486cU, 0x5742d0b8U,
-};
-
-static const uint32 Td3[256]=
-{
-  0xf4a75051U, 0x4165537eU, 0x17a4c31aU, 0x275e963aU,
-  0xab6bcb3bU, 0x9d45f11fU, 0xfa58abacU, 0xe303934bU,
-  0x30fa5520U, 0x766df6adU, 0xcc769188U, 0x024c25f5U,
-  0xe5d7fc4fU, 0x2acbd7c5U, 0x35448026U, 0x62a38fb5U,
-  0xb15a49deU, 0xba1b6725U, 0xea0e9845U, 0xfec0e15dU,
-  0x2f7502c3U, 0x4cf01281U, 0x4697a38dU, 0xd3f9c66bU,
-  0x8f5fe703U, 0x929c9515U, 0x6d7aebbfU, 0x5259da95U,
-  0xbe832dd4U, 0x7421d358U, 0xe0692949U, 0xc9c8448eU,
-  0xc2896a75U, 0x8e7978f4U, 0x583e6b99U, 0xb971dd27U,
-  0xe14fb6beU, 0x88ad17f0U, 0x20ac66c9U, 0xce3ab47dU,
-  0xdf4a1863U, 0x1a3182e5U, 0x51336097U, 0x537f4562U,
-  0x6477e0b1U, 0x6bae84bbU, 0x81a01cfeU, 0x082b94f9U,
-  0x48685870U, 0x45fd198fU, 0xde6c8794U, 0x7bf8b752U,
-  0x73d323abU, 0x4b02e272U, 0x1f8f57e3U, 0x55ab2a66U,
-  0xeb2807b2U, 0xb5c2032fU, 0xc57b9a86U, 0x3708a5d3U,
-  0x2887f230U, 0xbfa5b223U, 0x036aba02U, 0x16825cedU,
-  0xcf1c2b8aU, 0x79b492a7U, 0x07f2f0f3U, 0x69e2a14eU,
-  0xdaf4cd65U, 0x05bed506U, 0x34621fd1U, 0xa6fe8ac4U,
-  0x2e539d34U, 0xf355a0a2U, 0x8ae13205U, 0xf6eb75a4U,
-  0x83ec390bU, 0x60efaa40U, 0x719f065eU, 0x6e1051bdU,
-  0x218af93eU, 0xdd063d96U, 0x3e05aeddU, 0xe6bd464dU,
-  0x548db591U, 0xc45d0571U, 0x06d46f04U, 0x5015ff60U,
-  0x98fb2419U, 0xbde997d6U, 0x4043cc89U, 0xd99e7767U,
-  0xe842bdb0U, 0x898b8807U, 0x195b38e7U, 0xc8eedb79U,
-  0x7c0a47a1U, 0x420fe97cU, 0x841ec9f8U, 0x00000000U,
-  0x80868309U, 0x2bed4832U, 0x1170ac1eU, 0x5a724e6cU,
-  0x0efffbfdU, 0x8538560fU, 0xaed51e3dU, 0x2d392736U,
-  0x0fd9640aU, 0x5ca62168U, 0x5b54d19bU, 0x362e3a24U,
-  0x0a67b10cU, 0x57e70f93U, 0xee96d2b4U, 0x9b919e1bU,
-  0xc0c54f80U, 0xdc20a261U, 0x774b695aU, 0x121a161cU,
-  0x93ba0ae2U, 0xa02ae5c0U, 0x22e0433cU, 0x1b171d12U,
-  0x090d0b0eU, 0x8bc7adf2U, 0xb6a8b92dU, 0x1ea9c814U,
-  0xf1198557U, 0x75074cafU, 0x99ddbbeeU, 0x7f60fda3U,
-  0x01269ff7U, 0x72f5bc5cU, 0x663bc544U, 0xfb7e345bU,
-  0x4329768bU, 0x23c6dccbU, 0xedfc68b6U, 0xe4f163b8U,
-  0x31dccad7U, 0x63851042U, 0x97224013U, 0xc6112084U,
-  0x4a247d85U, 0xbb3df8d2U, 0xf93211aeU, 0x29a16dc7U,
-  0x9e2f4b1dU, 0xb230f3dcU, 0x8652ec0dU, 0xc1e3d077U,
-  0xb3166c2bU, 0x70b999a9U, 0x9448fa11U, 0xe9642247U,
-  0xfc8cc4a8U, 0xf03f1aa0U, 0x7d2cd856U, 0x3390ef22U,
-  0x494ec787U, 0x38d1c1d9U, 0xcaa2fe8cU, 0xd40b3698U,
-  0xf581cfa6U, 0x7ade28a5U, 0xb78e26daU, 0xadbfa43fU,
-  0x3a9de42cU, 0x78920d50U, 0x5fcc9b6aU, 0x7e466254U,
-  0x8d13c2f6U, 0xd8b8e890U, 0x39f75e2eU, 0xc3aff582U,
-  0x5d80be9fU, 0xd0937c69U, 0xd52da96fU, 0x2512b3cfU,
-  0xac993bc8U, 0x187da710U, 0x9c636ee8U, 0x3bbb7bdbU,
-  0x267809cdU, 0x5918f46eU, 0x9ab701ecU, 0x4f9aa883U,
-  0x956e65e6U, 0xffe67eaaU, 0xbccf0821U, 0x15e8e6efU,
-  0xe79bd9baU, 0x6f36ce4aU, 0x9f09d4eaU, 0xb07cd629U,
-  0xa4b2af31U, 0x3f23312aU, 0xa59430c6U, 0xa266c035U,
-  0x4ebc3774U, 0x82caa6fcU, 0x90d0b0e0U, 0xa7d81533U,
-  0x04984af1U, 0xecdaf741U, 0xcd500e7fU, 0x91f62f17U,
-  0x4dd68d76U, 0xefb04d43U, 0xaa4d54ccU, 0x9604dfe4U,
-  0xd1b5e39eU, 0x6a881b4cU, 0x2c1fb8c1U, 0x65517f46U,
-  0x5eea049dU, 0x8c355d01U, 0x877473faU, 0x0b412efbU,
-  0x671d5ab3U, 0xdbd25292U, 0x105633e9U, 0xd647136dU,
-  0xd7618c9aU, 0xa10c7a37U, 0xf8148e59U, 0x133c89ebU,
-  0xa927eeceU, 0x61c935b7U, 0x1ce5ede1U, 0x47b13c7aU,
-  0xd2df599cU, 0xf2733f55U, 0x14ce7918U, 0xc737bf73U,
-  0xf7cdea53U, 0xfdaa5b5fU, 0x3d6f14dfU, 0x44db8678U,
-  0xaff381caU, 0x68c43eb9U, 0x24342c38U, 0xa3405fc2U,
-  0x1dc37216U, 0xe2250cbcU, 0x3c498b28U, 0x0d9541ffU,
-  0xa8017139U, 0x0cb3de08U, 0xb4e49cd8U, 0x56c19064U,
-  0xcb84617bU, 0x32b670d5U, 0x6c5c7448U, 0xb85742d0U,
-};
-
-static const uint32 Td4[256]=
-{
-  0x52525252U, 0x09090909U, 0x6a6a6a6aU, 0xd5d5d5d5U,
-  0x30303030U, 0x36363636U, 0xa5a5a5a5U, 0x38383838U,
-  0xbfbfbfbfU, 0x40404040U, 0xa3a3a3a3U, 0x9e9e9e9eU,
-  0x81818181U, 0xf3f3f3f3U, 0xd7d7d7d7U, 0xfbfbfbfbU,
-  0x7c7c7c7cU, 0xe3e3e3e3U, 0x39393939U, 0x82828282U,
-  0x9b9b9b9bU, 0x2f2f2f2fU, 0xffffffffU, 0x87878787U,
-  0x34343434U, 0x8e8e8e8eU, 0x43434343U, 0x44444444U,
-  0xc4c4c4c4U, 0xdedededeU, 0xe9e9e9e9U, 0xcbcbcbcbU,
-  0x54545454U, 0x7b7b7b7bU, 0x94949494U, 0x32323232U,
-  0xa6a6a6a6U, 0xc2c2c2c2U, 0x23232323U, 0x3d3d3d3dU,
-  0xeeeeeeeeU, 0x4c4c4c4cU, 0x95959595U, 0x0b0b0b0bU,
-  0x42424242U, 0xfafafafaU, 0xc3c3c3c3U, 0x4e4e4e4eU,
-  0x08080808U, 0x2e2e2e2eU, 0xa1a1a1a1U, 0x66666666U,
-  0x28282828U, 0xd9d9d9d9U, 0x24242424U, 0xb2b2b2b2U,
-  0x76767676U, 0x5b5b5b5bU, 0xa2a2a2a2U, 0x49494949U,
-  0x6d6d6d6dU, 0x8b8b8b8bU, 0xd1d1d1d1U, 0x25252525U,
-  0x72727272U, 0xf8f8f8f8U, 0xf6f6f6f6U, 0x64646464U,
-  0x86868686U, 0x68686868U, 0x98989898U, 0x16161616U,
-  0xd4d4d4d4U, 0xa4a4a4a4U, 0x5c5c5c5cU, 0xccccccccU,
-  0x5d5d5d5dU, 0x65656565U, 0xb6b6b6b6U, 0x92929292U,
-  0x6c6c6c6cU, 0x70707070U, 0x48484848U, 0x50505050U,
-  0xfdfdfdfdU, 0xededededU, 0xb9b9b9b9U, 0xdadadadaU,
-  0x5e5e5e5eU, 0x15151515U, 0x46464646U, 0x57575757U,
-  0xa7a7a7a7U, 0x8d8d8d8dU, 0x9d9d9d9dU, 0x84848484U,
-  0x90909090U, 0xd8d8d8d8U, 0xababababU, 0x00000000U,
-  0x8c8c8c8cU, 0xbcbcbcbcU, 0xd3d3d3d3U, 0x0a0a0a0aU,
-  0xf7f7f7f7U, 0xe4e4e4e4U, 0x58585858U, 0x05050505U,
-  0xb8b8b8b8U, 0xb3b3b3b3U, 0x45454545U, 0x06060606U,
-  0xd0d0d0d0U, 0x2c2c2c2cU, 0x1e1e1e1eU, 0x8f8f8f8fU,
-  0xcacacacaU, 0x3f3f3f3fU, 0x0f0f0f0fU, 0x02020202U,
-  0xc1c1c1c1U, 0xafafafafU, 0xbdbdbdbdU, 0x03030303U,
-  0x01010101U, 0x13131313U, 0x8a8a8a8aU, 0x6b6b6b6bU,
-  0x3a3a3a3aU, 0x91919191U, 0x11111111U, 0x41414141U,
-  0x4f4f4f4fU, 0x67676767U, 0xdcdcdcdcU, 0xeaeaeaeaU,
-  0x97979797U, 0xf2f2f2f2U, 0xcfcfcfcfU, 0xcecececeU,
-  0xf0f0f0f0U, 0xb4b4b4b4U, 0xe6e6e6e6U, 0x73737373U,
-  0x96969696U, 0xacacacacU, 0x74747474U, 0x22222222U,
-  0xe7e7e7e7U, 0xadadadadU, 0x35353535U, 0x85858585U,
-  0xe2e2e2e2U, 0xf9f9f9f9U, 0x37373737U, 0xe8e8e8e8U,
-  0x1c1c1c1cU, 0x75757575U, 0xdfdfdfdfU, 0x6e6e6e6eU,
-  0x47474747U, 0xf1f1f1f1U, 0x1a1a1a1aU, 0x71717171U,
-  0x1d1d1d1dU, 0x29292929U, 0xc5c5c5c5U, 0x89898989U,
-  0x6f6f6f6fU, 0xb7b7b7b7U, 0x62626262U, 0x0e0e0e0eU,
-  0xaaaaaaaaU, 0x18181818U, 0xbebebebeU, 0x1b1b1b1bU,
-  0xfcfcfcfcU, 0x56565656U, 0x3e3e3e3eU, 0x4b4b4b4bU,
-  0xc6c6c6c6U, 0xd2d2d2d2U, 0x79797979U, 0x20202020U,
-  0x9a9a9a9aU, 0xdbdbdbdbU, 0xc0c0c0c0U, 0xfefefefeU,
-  0x78787878U, 0xcdcdcdcdU, 0x5a5a5a5aU, 0xf4f4f4f4U,
-  0x1f1f1f1fU, 0xddddddddU, 0xa8a8a8a8U, 0x33333333U,
-  0x88888888U, 0x07070707U, 0xc7c7c7c7U, 0x31313131U,
-  0xb1b1b1b1U, 0x12121212U, 0x10101010U, 0x59595959U,
-  0x27272727U, 0x80808080U, 0xececececU, 0x5f5f5f5fU,
-  0x60606060U, 0x51515151U, 0x7f7f7f7fU, 0xa9a9a9a9U,
-  0x19191919U, 0xb5b5b5b5U, 0x4a4a4a4aU, 0x0d0d0d0dU,
-  0x2d2d2d2dU, 0xe5e5e5e5U, 0x7a7a7a7aU, 0x9f9f9f9fU,
-  0x93939393U, 0xc9c9c9c9U, 0x9c9c9c9cU, 0xefefefefU,
-  0xa0a0a0a0U, 0xe0e0e0e0U, 0x3b3b3b3bU, 0x4d4d4d4dU,
-  0xaeaeaeaeU, 0x2a2a2a2aU, 0xf5f5f5f5U, 0xb0b0b0b0U,
-  0xc8c8c8c8U, 0xebebebebU, 0xbbbbbbbbU, 0x3c3c3c3cU,
-  0x83838383U, 0x53535353U, 0x99999999U, 0x61616161U,
-  0x17171717U, 0x2b2b2b2bU, 0x04040404U, 0x7e7e7e7eU,
-  0xbabababaU, 0x77777777U, 0xd6d6d6d6U, 0x26262626U,
-  0xe1e1e1e1U, 0x69696969U, 0x14141414U, 0x63636363U,
-  0x55555555U, 0x21212121U, 0x0c0c0c0cU, 0x7d7d7d7dU,
-};
-
-
-/* for 128-bit blocks, Rijndael never uses more than 10 rcon values */
-static const uint32 rcon[]=
-{
-  0x01000000, 0x02000000, 0x04000000, 0x08000000,
-  0x10000000, 0x20000000, 0x40000000, 0x80000000,
-  0x1B000000, 0x36000000,
-};
-
-#if defined(_MSC_VER) && defined(__i386__)
-
-#define RJ_SWAP(x) (_lrotl(x, 8) & 0x00ff00ff | _lrotr(x, 8) & 0xff00ff00)
-#define GETuint32(p) RJ_SWAP(*((uint32 *)(p)))
-#define PUTuint32(ct, st) { *((uint32 *)(ct)) = RJ_SWAP((st)); }
-
-#else
-
-#define GETuint32(pt) (((uint32)(pt)[0] << 24) ^ ((uint32)(pt)[1] << 16)\
-	^ ((uint32)(pt)[2] <<  8) ^ ((uint32)(pt)[3]))
-#define PUTuint32(ct, st) { (ct)[0] = (uint8)((st) >> 24); (ct)[1]\
-= (uint8)((st) >> 16); (ct)[2] = (uint8)((st) >>  8); (ct)[3] = (uint8)(st); }
-
-#endif /* defined(_MSC_VER) && defined(__i386__) */
-
-
-/*
-  Expand the cipher key into the encryption key schedule.
-
- RETURN
-   The number of rounds for the given cipher key size.
-*/
-
-int rijndaelKeySetupEnc(uint32 rk[/*4*(Nr + 1)*/], const uint8 cipherKey[],
-			int keyBits)
-{
-  int i = 0;
-  uint32 temp;
-
-  rk[0] = GETuint32(cipherKey	  );
-  rk[1] = GETuint32(cipherKey +  4);
-  rk[2] = GETuint32(cipherKey +  8);
-  rk[3] = GETuint32(cipherKey + 12);
-  if (keyBits == 128)
-  {
-    for (;;)
-    {
-      temp  = rk[3];
-      rk[4] = (rk[0] ^
-	       (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-	       (Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-	       (Te4[(temp      ) & 0xff] & 0x0000ff00) ^
-	       (Te4[(temp >> 24)       ] & 0x000000ff) ^
-	       rcon[i]);
-      rk[5] = rk[1] ^ rk[4];
-      rk[6] = rk[2] ^ rk[5];
-      rk[7] = rk[3] ^ rk[6];
-      if (++i == 10)
-	return 10;
-      rk += 4;
-    }
-  }
-  rk[4] = GETuint32(cipherKey + 16);
-  rk[5] = GETuint32(cipherKey + 20);
-  if (keyBits == 192)
-  {
-    for (;;)
-    {
-      temp = rk[ 5];
-      rk[ 6] = (rk[ 0] ^
-		(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-		(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-		(Te4[(temp	) & 0xff] & 0x0000ff00) ^
-		(Te4[(temp >> 24)	] & 0x000000ff) ^
-		rcon[i]);
-      rk[ 7] = rk[ 1] ^ rk[ 6];
-      rk[ 8] = rk[ 2] ^ rk[ 7];
-      rk[ 9] = rk[ 3] ^ rk[ 8];
-      if (++i == 8)
-      {
-	return 12;
-      }
-      rk[10] = rk[ 4] ^ rk[ 9];
-      rk[11] = rk[ 5] ^ rk[10];
-      rk += 6;
-    }
-  }
-  rk[6] = GETuint32(cipherKey + 24);
-  rk[7] = GETuint32(cipherKey + 28);
-  if (keyBits == 256)
-  {
-    for (;;)
-    {
-      temp = rk[ 7];
-      rk[ 8] = (rk[ 0] ^
-		(Te4[(temp >> 16) & 0xff] & 0xff000000) ^
-		(Te4[(temp >>  8) & 0xff] & 0x00ff0000) ^
-		(Te4[(temp	) & 0xff] & 0x0000ff00) ^
-		(Te4[(temp >> 24)	] & 0x000000ff) ^
-		rcon[i]);
-      rk[ 9] = rk[ 1] ^ rk[ 8];
-      rk[10] = rk[ 2] ^ rk[ 9];
-      rk[11] = rk[ 3] ^ rk[10];
-      if (++i == 7)
-      {
-	return 14;
-      }
-      temp = rk[11];
-      rk[12] = (rk[ 4] ^
-		(Te4[(temp >> 24)	] & 0xff000000) ^
-		(Te4[(temp >> 16) & 0xff] & 0x00ff0000) ^
-		(Te4[(temp >>  8) & 0xff] & 0x0000ff00) ^
-		(Te4[(temp	) & 0xff] & 0x000000ff));
-      rk[13] = rk[ 5] ^ rk[12];
-      rk[14] = rk[ 6] ^ rk[13];
-      rk[15] = rk[ 7] ^ rk[14];
-      rk += 8;
-    }
-  }
-  return 0;
-}
-
-
-/*
-  Expand the cipher key into the decryption key schedule.
-
-  RETURN
-    The number of rounds for the given cipher key size.
-*/
-
-int rijndaelKeySetupDec(uint32 rk[/*4*(Nr + 1)*/], const uint8 cipherKey[],
-			int keyBits)
-{
-  int nr, i, j;
-  uint32 temp;
-
-  /* expand the cipher key: */
-  nr = rijndaelKeySetupEnc(rk, cipherKey, keyBits);
-  /* invert the order of the round keys: */
-  for (i = 0, j = 4*nr; i < j; i += 4, j -= 4)
-  {
-    temp = rk[i    ]; rk[i    ] = rk[j	  ]; rk[j    ] = temp;
-    temp = rk[i + 1]; rk[i + 1] = rk[j + 1]; rk[j + 1] = temp;
-    temp = rk[i + 2]; rk[i + 2] = rk[j + 2]; rk[j + 2] = temp;
-    temp = rk[i + 3]; rk[i + 3] = rk[j + 3]; rk[j + 3] = temp;
-  }
-  /*
-    Apply the inverse MixColumn transform to all round keys but the first
-    and the last:
-  */
-  for (i = 1; i < nr; i++)
-  {
-    rk += 4;
-
-    rk[0]= (
-	    Td0[Te4[(rk[0] >> 24)	  ] & 0xff] ^
-	    Td1[Te4[(rk[0] >> 16) & 0xff] & 0xff] ^
-	    Td2[Te4[(rk[0] >>  8) & 0xff] & 0xff] ^
-	    Td3[Te4[(rk[0]	  ) & 0xff] & 0xff]);
-
-    rk[1]= (Td0[Te4[(rk[1] >> 24)	  ] & 0xff] ^
-	    Td1[Te4[(rk[1] >> 16) & 0xff] & 0xff] ^
-	    Td2[Te4[(rk[1] >>  8) & 0xff] & 0xff] ^
-	    Td3[Te4[(rk[1]	  ) & 0xff] & 0xff]);
-
-    rk[2]= (Td0[Te4[(rk[2] >> 24)	  ] & 0xff] ^
-	    Td1[Te4[(rk[2] >> 16) & 0xff] & 0xff] ^
-	    Td2[Te4[(rk[2] >>  8) & 0xff] & 0xff] ^
-	    Td3[Te4[(rk[2]	  ) & 0xff] & 0xff]);
-
-    rk[3]= (Td0[Te4[(rk[3] >> 24)	  ] & 0xff] ^
-	    Td1[Te4[(rk[3] >> 16) & 0xff] & 0xff] ^
-	    Td2[Te4[(rk[3] >>  8) & 0xff] & 0xff] ^
-	    Td3[Te4[(rk[3]	  ) & 0xff] & 0xff]);
-  }
-  return nr;
-}
-
-
-void rijndaelEncrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
-		     const uint8 pt[16], uint8 ct[16])
-{
-  uint32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-  int r;
-#endif /* FULL_UNROLL */
-
-  /* map byte array block to cipher state and add initial round key: */
-  s0 = GETuint32(pt	) ^ rk[0];
-  s1 = GETuint32(pt +  4) ^ rk[1];
-  s2 = GETuint32(pt +  8) ^ rk[2];
-  s3 = GETuint32(pt + 12) ^ rk[3];
-
-#ifdef FULL_UNROLL
-  /* round 1: */
-  t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-       ^ Te3[s3 & 0xff] ^ rk[ 4]);
-  t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-       ^ Te3[s0 & 0xff] ^ rk[ 5]);
-  t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-       ^ Te3[s1 & 0xff] ^ rk[ 6]);
-  t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-       ^ Te3[s2 & 0xff] ^ rk[ 7]);
-
-  /* round 2: */
-  s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff]
-       ^ Te3[t3 & 0xff] ^ rk[ 8]);
-  s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff]
-       ^ Te3[t0 & 0xff] ^ rk[ 9]);
-  s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff]
-       ^ Te3[t1 & 0xff] ^ rk[10]);
-  s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff]
-       ^ Te3[t2 & 0xff] ^ rk[11]);
-
-  /* round 3: */
-  t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-       ^ Te3[s3 & 0xff] ^ rk[12]);
-  t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-       ^ Te3[s0 & 0xff] ^ rk[13]);
-  t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-       ^ Te3[s1 & 0xff] ^ rk[14]);
-  t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-       ^ Te3[s2 & 0xff] ^ rk[15]);
-
-  /* round 4: */
-  s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff]
-       ^ Te3[t3 & 0xff] ^ rk[16]);
-  s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff]
-       ^ Te3[t0 & 0xff] ^ rk[17]);
-  s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff]
-       ^ Te3[t1 & 0xff] ^ rk[18]);
-  s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff]
-       ^ Te3[t2 & 0xff] ^ rk[19]);
-
-  /* round 5: */
-  t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-       ^ Te3[s3 & 0xff] ^ rk[20]);
-  t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-       ^ Te3[s0 & 0xff] ^ rk[21]);
-  t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-       ^ Te3[s1 & 0xff] ^ rk[22]);
-  t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-       ^ Te3[s2 & 0xff] ^ rk[23]);
-
-  /* round 6: */
-  s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff]
-       ^ Te3[t3 & 0xff] ^ rk[24]);
-  s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff]
-       ^ Te3[t0 & 0xff] ^ rk[25]);
-  s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff]
-       ^ Te3[t1 & 0xff] ^ rk[26]);
-  s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff]
-       ^ Te3[t2 & 0xff] ^ rk[27]);
-
-  /* round 7: */
-  t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-       ^ Te3[s3 & 0xff] ^ rk[28]);
-  t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-       ^ Te3[s0 & 0xff] ^ rk[29]);
-  t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-       ^ Te3[s1 & 0xff] ^ rk[30]);
-  t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-       ^ Te3[s2 & 0xff] ^ rk[31]);
-
-  /* round 8: */
-  s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff]
-       ^ Te3[t3 & 0xff] ^ rk[32]);
-  s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff]
-       ^ Te3[t0 & 0xff] ^ rk[33]);
-  s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff]
-       ^ Te3[t1 & 0xff] ^ rk[34]);
-  s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff]
-       ^ Te3[t2 & 0xff] ^ rk[35]);
-
-  /* round 9: */
-  t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-       ^ Te3[s3 & 0xff] ^ rk[36]);
-  t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-       ^ Te3[s0 & 0xff] ^ rk[37]);
-  t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-       ^ Te3[s1 & 0xff] ^ rk[38]);
-  t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-       ^ Te3[s2 & 0xff] ^ rk[39]);
-
-  if (Nr > 10)
-  {
-    /* round 10: */
-    s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>  8) & 0xff]
-	 ^ Te3[t3 & 0xff] ^ rk[40]);
-    s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>  8) & 0xff]
-	 ^ Te3[t0 & 0xff] ^ rk[41]);
-    s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>  8) & 0xff]
-	 ^ Te3[t1 & 0xff] ^ rk[42]);
-    s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>  8) & 0xff]
-	 ^ Te3[t2 & 0xff] ^ rk[43]);
-
-    /* round 11: */
-    t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>  8) & 0xff]
-	 ^ Te3[s3 & 0xff] ^ rk[44]);
-    t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>  8) & 0xff]
-	 ^ Te3[s0 & 0xff] ^ rk[45]);
-    t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>  8) & 0xff]
-	 ^ Te3[s1 & 0xff] ^ rk[46]);
-    t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>  8) & 0xff]
-	 ^ Te3[s2 & 0xff] ^ rk[47]);
-
-    if (Nr > 12)
-    {
-      /* round 12: */
-      s0= (Te0[t0 >> 24] ^ Te1[(t1 >> 16) & 0xff] ^ Te2[(t2 >>	8) & 0xff]
-	   ^ Te3[t3 & 0xff] ^ rk[48]);
-      s1= (Te0[t1 >> 24] ^ Te1[(t2 >> 16) & 0xff] ^ Te2[(t3 >>	8) & 0xff]
-	   ^ Te3[t0 & 0xff] ^ rk[49]);
-      s2= (Te0[t2 >> 24] ^ Te1[(t3 >> 16) & 0xff] ^ Te2[(t0 >>	8) & 0xff]
-	   ^ Te3[t1 & 0xff] ^ rk[50]);
-      s3= (Te0[t3 >> 24] ^ Te1[(t0 >> 16) & 0xff] ^ Te2[(t1 >>	8) & 0xff]
-	   ^ Te3[t2 & 0xff] ^ rk[51]);
-
-      /* round 13: */
-      t0= (Te0[s0 >> 24] ^ Te1[(s1 >> 16) & 0xff] ^ Te2[(s2 >>	8) & 0xff]
-	   ^ Te3[s3 & 0xff] ^ rk[52]);
-      t1= (Te0[s1 >> 24] ^ Te1[(s2 >> 16) & 0xff] ^ Te2[(s3 >>	8) & 0xff]
-	   ^ Te3[s0 & 0xff] ^ rk[53]);
-      t2= (Te0[s2 >> 24] ^ Te1[(s3 >> 16) & 0xff] ^ Te2[(s0 >>	8) & 0xff]
-	   ^ Te3[s1 & 0xff] ^ rk[54]);
-      t3= (Te0[s3 >> 24] ^ Te1[(s0 >> 16) & 0xff] ^ Te2[(s1 >>	8) & 0xff]
-	   ^ Te3[s2 & 0xff] ^ rk[55]);
-    }
-  }
-  rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-
-  /* Nr - 1 full rounds: */
-
-  r = Nr >> 1;
-  for (;;)
-  {
-    t0= (Te0[(s0 >> 24)  ] ^
-	 Te1[(s1 >> 16) & 0xff] ^
-	 Te2[(s2 >>	8) & 0xff] ^
-	 Te3[(s3	 ) & 0xff] ^
-	 rk[4]);
-
-    t1= (Te0[(s1 >> 24)  ] ^
-	 Te1[(s2 >> 16) & 0xff] ^
-	 Te2[(s3 >>	8) & 0xff] ^
-	 Te3[(s0	 ) & 0xff] ^
-	 rk[5]);
-
-    t2= (Te0[(s2 >> 24)  ] ^
-	 Te1[(s3 >> 16) & 0xff] ^
-	 Te2[(s0 >>	8) & 0xff] ^
-	 Te3[(s1	 ) & 0xff] ^
-	 rk[6]);
-
-    t3= (Te0[(s3 >> 24)  ] ^
-	 Te1[(s0 >> 16) & 0xff] ^
-	 Te2[(s1 >>	8) & 0xff] ^
-	 Te3[(s2	 ) & 0xff] ^
-	 rk[7]);
-
-    rk+= 8;
-    if (--r == 0)
-      break;
-
-    s0= (Te0[(t0 >> 24)  ] ^
-	 Te1[(t1 >> 16) & 0xff] ^
-	 Te2[(t2 >>	8) & 0xff] ^
-	 Te3[(t3	 ) & 0xff] ^
-	 rk[0]);
-
-    s1= (Te0[(t1 >> 24)  ] ^
-	 Te1[(t2 >> 16) & 0xff] ^
-	 Te2[(t3 >>	8) & 0xff] ^
-	 Te3[(t0	 ) & 0xff] ^
-	 rk[1]);
-
-    s2= (Te0[(t2 >> 24)  ] ^
-	 Te1[(t3 >> 16) & 0xff] ^
-	 Te2[(t0 >>	8) & 0xff] ^
-	 Te3[(t1	 ) & 0xff] ^
-	 rk[2]);
-
-    s3= (Te0[(t3 >> 24)  ] ^
-	 Te1[(t0 >> 16) & 0xff] ^
-	 Te2[(t1 >>	8) & 0xff] ^
-	 Te3[(t2	 ) & 0xff] ^
-	 rk[3]);
-  }
-#endif /* FULL_UNROLL */
-
-  /* Apply last round and map cipher state to byte array block: */
-  s0= ((Te4[(t0 >> 24)	] & 0xff000000) ^
-       (Te4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-       (Te4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-       (Te4[(t3 ) & 0xff] & 0x000000ff) ^
-       rk[0]);
-  PUTuint32(ct	   , s0);
-
-  s1= ((Te4[(t1 >> 24)	] & 0xff000000) ^
-       (Te4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-       (Te4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-       (Te4[(t0 ) & 0xff] & 0x000000ff) ^
-       rk[1]);
-  PUTuint32(ct +  4, s1);
-
-  s2= ((Te4[(t2 >> 24)	] & 0xff000000) ^
-       (Te4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-       (Te4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-       (Te4[(t1 ) & 0xff] & 0x000000ff) ^
-       rk[2]);
-  PUTuint32(ct +  8, s2);
-
-  s3= ((Te4[(t3 >> 24)	] & 0xff000000) ^
-       (Te4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-       (Te4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-       (Te4[(t2 ) & 0xff] & 0x000000ff) ^
-       rk[3]);
-  PUTuint32(ct + 12, s3);
-}
-
-
-void rijndaelDecrypt(const uint32 rk[/*4*(Nr + 1)*/], int Nr,
-		     const uint8 ct[16], uint8 pt[16])
-{
-  uint32 s0, s1, s2, s3, t0, t1, t2, t3;
-#ifndef FULL_UNROLL
-  int r;
-#endif /* FULL_UNROLL */
-
-  /* Map byte array block to cipher state and add initial round key: */
-
-  s0 = GETuint32(ct	) ^ rk[0];
-  s1 = GETuint32(ct +  4) ^ rk[1];
-  s2 = GETuint32(ct +  8) ^ rk[2];
-  s3 = GETuint32(ct + 12) ^ rk[3];
-
-#ifdef FULL_UNROLL
-  /* round 1: */
-  t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-       ^ Td3[s1 & 0xff] ^ rk[ 4]);
-  t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-       ^ Td3[s2 & 0xff] ^ rk[ 5]);
-  t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-       ^ Td3[s3 & 0xff] ^ rk[ 6]);
-  t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-       ^ Td3[s0 & 0xff] ^ rk[ 7]);
-
-  /* round 2: */
-  s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff]
-       ^ Td3[t1 & 0xff] ^ rk[ 8]);
-  s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff]
-       ^ Td3[t2 & 0xff] ^ rk[ 9]);
-  s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff]
-       ^ Td3[t3 & 0xff] ^ rk[10]);
-  s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff]
-       ^ Td3[t0 & 0xff] ^ rk[11]);
-
-  /* round 3: */
-  t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-       ^ Td3[s1 & 0xff] ^ rk[12]);
-  t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-       ^ Td3[s2 & 0xff] ^ rk[13]);
-  t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-       ^ Td3[s3 & 0xff] ^ rk[14]);
-  t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-       ^ Td3[s0 & 0xff] ^ rk[15]);
-
-  /* round 4: */
-  s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff]
-       ^ Td3[t1 & 0xff] ^ rk[16]);
-  s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff]
-       ^ Td3[t2 & 0xff] ^ rk[17]);
-  s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff]
-       ^ Td3[t3 & 0xff] ^ rk[18]);
-  s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff]
-       ^ Td3[t0 & 0xff] ^ rk[19]);
-
-  /* round 5: */
-  t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-       ^ Td3[s1 & 0xff] ^ rk[20]);
-  t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-       ^ Td3[s2 & 0xff] ^ rk[21]);
-  t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-       ^ Td3[s3 & 0xff] ^ rk[22]);
-  t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-       ^ Td3[s0 & 0xff] ^ rk[23]);
-
-  /* round 6: */
-  s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff]
-       ^ Td3[t1 & 0xff] ^ rk[24]);
-  s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff]
-       ^ Td3[t2 & 0xff] ^ rk[25]);
-  s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff]
-       ^ Td3[t3 & 0xff] ^ rk[26]);
-  s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff]
-       ^ Td3[t0 & 0xff] ^ rk[27]);
-
-  /* round 7: */
-  t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-       ^ Td3[s1 & 0xff] ^ rk[28]);
-  t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-       ^ Td3[s2 & 0xff] ^ rk[29]);
-  t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-       ^ Td3[s3 & 0xff] ^ rk[30]);
-  t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-       ^ Td3[s0 & 0xff] ^ rk[31]);
-
-  /* round 8: */
-  s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff]
-       ^ Td3[t1 & 0xff] ^ rk[32]);
-  s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff]
-       ^ Td3[t2 & 0xff] ^ rk[33]);
-  s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff]
-       ^ Td3[t3 & 0xff] ^ rk[34]);
-  s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff]
-       ^ Td3[t0 & 0xff] ^ rk[35]);
-
-  /* round 9: */
-  t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-       ^ Td3[s1 & 0xff] ^ rk[36]);
-  t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-       ^ Td3[s2 & 0xff] ^ rk[37]);
-  t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-       ^ Td3[s3 & 0xff] ^ rk[38]);
-  t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-       ^ Td3[s0 & 0xff] ^ rk[39]);
-
-  if (Nr > 10)
-  {
-    /* round 10: */
-    s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>  8) & 0xff]
-	 ^ Td3[t1 & 0xff] ^ rk[40]);
-    s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>  8) & 0xff]
-	 ^ Td3[t2 & 0xff] ^ rk[41]);
-    s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>  8) & 0xff]
-	 ^ Td3[t3 & 0xff] ^ rk[42]);
-    s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>  8) & 0xff]
-	 ^ Td3[t0 & 0xff] ^ rk[43]);
-
-    /* round 11: */
-    t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>  8) & 0xff]
-	 ^ Td3[s1 & 0xff] ^ rk[44]);
-    t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>  8) & 0xff]
-	 ^ Td3[s2 & 0xff] ^ rk[45]);
-    t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>  8) & 0xff]
-	 ^ Td3[s3 & 0xff] ^ rk[46]);
-    t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>  8) & 0xff]
-	 ^ Td3[s0 & 0xff] ^ rk[47]);
-
-    if (Nr > 12)
-    {
-      /* round 12: */
-      s0= (Td0[t0 >> 24] ^ Td1[(t3 >> 16) & 0xff] ^ Td2[(t2 >>	8) & 0xff]
-	   ^ Td3[t1 & 0xff] ^ rk[48]);
-      s1= (Td0[t1 >> 24] ^ Td1[(t0 >> 16) & 0xff] ^ Td2[(t3 >>	8) & 0xff]
-	   ^ Td3[t2 & 0xff] ^ rk[49]);
-      s2= (Td0[t2 >> 24] ^ Td1[(t1 >> 16) & 0xff] ^ Td2[(t0 >>	8) & 0xff]
-	   ^ Td3[t3 & 0xff] ^ rk[50]);
-      s3= (Td0[t3 >> 24] ^ Td1[(t2 >> 16) & 0xff] ^ Td2[(t1 >>	8) & 0xff]
-	   ^ Td3[t0 & 0xff] ^ rk[51]);
-
-      /* round 13: */
-      t0= (Td0[s0 >> 24] ^ Td1[(s3 >> 16) & 0xff] ^ Td2[(s2 >>	8) & 0xff]
-	   ^ Td3[s1 & 0xff] ^ rk[52]);
-      t1= (Td0[s1 >> 24] ^ Td1[(s0 >> 16) & 0xff] ^ Td2[(s3 >>	8) & 0xff]
-	   ^ Td3[s2 & 0xff] ^ rk[53]);
-      t2= (Td0[s2 >> 24] ^ Td1[(s1 >> 16) & 0xff] ^ Td2[(s0 >>	8) & 0xff]
-	   ^ Td3[s3 & 0xff] ^ rk[54]);
-      t3= (Td0[s3 >> 24] ^ Td1[(s2 >> 16) & 0xff] ^ Td2[(s1 >>	8) & 0xff]
-	   ^ Td3[s0 & 0xff] ^ rk[55]);
-    }
-  }
-  rk += Nr << 2;
-#else  /* !FULL_UNROLL */
-
-  /* Nr - 1 full rounds: */
-  r= (Nr >> 1);
-  for (;;)
-  {
-    t0= (Td0[(s0 >> 24)  ] ^
-	 Td1[(s3 >> 16) & 0xff] ^
-	 Td2[(s2 >>	8) & 0xff] ^
-	 Td3[(s1	 ) & 0xff] ^
-	 rk[4]);
-
-    t1= (Td0[(s1 >> 24)  ] ^
-	 Td1[(s0 >> 16) & 0xff] ^
-	 Td2[(s3 >>	8) & 0xff] ^
-	 Td3[(s2	 ) & 0xff] ^
-	 rk[5]);
-
-    t2= (Td0[(s2 >> 24)  ] ^
-	 Td1[(s1 >> 16) & 0xff] ^
-	 Td2[(s0 >>	8) & 0xff] ^
-	 Td3[(s3	 ) & 0xff] ^
-	 rk[6]);
-
-    t3= (Td0[(s3 >> 24)  ] ^
-	 Td1[(s2 >> 16) & 0xff] ^
-	 Td2[(s1 >>	8) & 0xff] ^
-	 Td3[(s0	 ) & 0xff] ^
-	 rk[7]);
-
-    rk+= 8;
-    if (--r == 0)
-      break;
-
-    s0= (Td0[(t0 >> 24)  ] ^
-	 Td1[(t3 >> 16) & 0xff] ^
-	 Td2[(t2 >>	8) & 0xff] ^
-	 Td3[(t1	 ) & 0xff] ^
-	 rk[0]);
-
-    s1= (Td0[(t1 >> 24)  ] ^
-	 Td1[(t0 >> 16) & 0xff] ^
-	 Td2[(t3 >>	8) & 0xff] ^
-	 Td3[(t2	 ) & 0xff] ^
-	 rk[1]);
-
-    s2= (Td0[(t2 >> 24)  ] ^
-	 Td1[(t1 >> 16) & 0xff] ^
-	 Td2[(t0 >>	8) & 0xff] ^
-	 Td3[(t3	 ) & 0xff] ^
-	 rk[2]);
-
-    s3= (Td0[(t3 >> 24)  ] ^
-	 Td1[(t2 >> 16) & 0xff] ^
-	 Td2[(t1 >>	8) & 0xff] ^
-	 Td3[(t0	 ) & 0xff] ^
-	 rk[3]);
-  }
-
-#endif /* FULL_UNROLL */
-
-  /* Apply last round and map cipher state to byte array block: */
-
-  s0= ((Td4[(t0 >> 24)	] & 0xff000000) ^
-       (Td4[(t3 >> 16) & 0xff] & 0x00ff0000) ^
-       (Td4[(t2 >>  8) & 0xff] & 0x0000ff00) ^
-       (Td4[(t1 ) & 0xff] & 0x000000ff) ^
-       rk[0]);
-  PUTuint32(pt	   , s0);
-
-  s1= ((Td4[(t1 >> 24)	] & 0xff000000) ^
-       (Td4[(t0 >> 16) & 0xff] & 0x00ff0000) ^
-       (Td4[(t3 >>  8) & 0xff] & 0x0000ff00) ^
-       (Td4[(t2 ) & 0xff] & 0x000000ff) ^
-       rk[1]);
-  PUTuint32(pt +  4, s1);
-
-  s2= ((Td4[(t2 >> 24)	] & 0xff000000) ^
-       (Td4[(t1 >> 16) & 0xff] & 0x00ff0000) ^
-       (Td4[(t0 >>  8) & 0xff] & 0x0000ff00) ^
-       (Td4[(t3 ) & 0xff] & 0x000000ff) ^
-       rk[2]);
-  PUTuint32(pt +  8, s2);
-
-  s3= ((Td4[(t3 >> 24)	] & 0xff000000) ^
-       (Td4[(t2 >> 16) & 0xff] & 0x00ff0000) ^
-       (Td4[(t1 >>  8) & 0xff] & 0x0000ff00) ^
-       (Td4[(t0 ) & 0xff] & 0x000000ff) ^
-       rk[3]);
-  PUTuint32(pt + 12, s3);
-}

=== added directory 'mysys_ssl'
=== added file 'mysys_ssl/CMakeLists.txt'
--- a/mysys_ssl/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ b/mysys_ssl/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -0,0 +1,28 @@
+# Copyright (c) 2012, 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
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
+                    ${CMAKE_SOURCE_DIR}/mysys_ssl
+                    ${SSL_INCLUDE_DIRS})
+
+IF(SSL_DEFINES)
+ADD_DEFINITIONS(${SSL_DEFINES})
+ENDIF()
+
+SET(MYSYS_SSL_SOURCES default.c my_getopt.c my_aes.cc)
+
+ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
+TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES})
+DTRACE_INSTRUMENT(mysys_ssl)

=== renamed file 'mysys/default.c' => 'mysys_ssl/default.c'
--- a/mysys/default.c	2012-03-06 14:29:42 +0000
+++ b/mysys_ssl/default.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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
@@ -24,19 +24,24 @@
  pre- and end 'blank space' are removed from options and values. The
  following escape sequences are recognized in values:  \b \t \n \r \\
 
- The following arguments are handled automaticly;  If used, they must be
+ The following arguments are handled automatically;  If used, they must be
  first argument on the command line!
- --no-defaults	; no options are read.
+ --no-defaults	; no options are read, except for the ones provided in the
+                  login file.
  --defaults-file=full-path-to-default-file	; Only this file will be read.
  --defaults-extra-file=full-path-to-default-file ; Read this file before ~/
  --defaults-group-suffix  ; Also read groups with concat(group, suffix)
  --print-defaults	  ; Print the modified command line and exit
+ --login-path=login-path-name ; Read options under login-path-name from
+                                the login file.
 ****************************************************************************/
 
-#include "mysys_priv.h"
+#include "../mysys/mysys_priv.h"
+#include "my_default.h"
 #include "m_string.h"
 #include "m_ctype.h"
 #include <my_dir.h>
+#include <my_aes.h>
 #ifdef __WIN__
 #include <winbase.h>
 #endif
@@ -88,12 +93,22 @@ my_bool my_getopt_is_args_separator(cons
 const char *my_defaults_file=0;
 const char *my_defaults_group_suffix=0;
 const char *my_defaults_extra_file=0;
+const char *my_login_path= 0;
+const char *my_login_file= 0;
 
 static char my_defaults_file_buffer[FN_REFLEN];
 static char my_defaults_extra_file_buffer[FN_REFLEN];
 
+static char my_login_file_buffer[FN_REFLEN];
+const char *my_key= "..May..the..force..be..with..you..";
 static my_bool defaults_already_read= FALSE;
 
+/* Set to TRUE, if --no-defaults is found. */
+static my_bool found_no_defaults= FALSE;
+
+/* Set to TRUE, when login file is being processed. */
+static my_bool is_login_file= FALSE;
+
 /* Which directories are searched for options (and in which order) */
 
 #define MAX_DEFAULT_DIRS 6
@@ -131,6 +146,7 @@ static int search_default_file_with_ext(
                                         void *func_ctx,
 					const char *dir, const char *ext,
 					const char *config_file, int recursion_level);
+static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file);
 
 
 /**
@@ -171,7 +187,7 @@ static char *remove_end_comment(char *pt
 
   RETURNS
    0   All OK
-   2   Out of memory or path to long
+   2   Out of memory or path too long
    3   Not able to get working directory
  */
 
@@ -206,10 +222,12 @@ fn_expand(const char *filename, char *re
   func                        Pointer to the function to process options
   func_ctx                    It's context. Usually it is the structure to
                               store additional options.
+  default_directories         List of default directories.
+
   DESCRIPTION
     Process the default options from argc & argv
     Read through each found config file looks and calls 'func' to process
-    each option.
+    each option. This function also reads options from login file.
 
   NOTES
     --defaults-group-suffix is only processed if we are called from
@@ -234,74 +252,124 @@ int my_search_option_files(const char *c
   int error= 0;
   DBUG_ENTER("my_search_option_files");
 
-  /* Check if we want to force the use a specific default file */
-  *args_used+= get_defaults_options(*argc - *args_used, *argv + *args_used,
-                                    (char **) &forced_default_file,
-                                    (char **) &forced_extra_defaults,
-                                    (char **) &my_defaults_group_suffix);
+  /* Skip if default files have already been read. */
+  if (! defaults_already_read)
+  {
+    /* Check if we want to force the use a specific default file */
+    *args_used+= get_defaults_options(*argc - *args_used, *argv + *args_used,
+                                      (char **) &forced_default_file,
+                                      (char **) &forced_extra_defaults,
+                                      (char **) &my_defaults_group_suffix,
+                                      (char **) &my_login_path);
 
-  if (! my_defaults_group_suffix)
-    my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
+    if (! my_defaults_group_suffix)
+      my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
 
-  if (forced_extra_defaults && !defaults_already_read)
-  {
-    int error= fn_expand(forced_extra_defaults, my_defaults_extra_file_buffer);
-    if (error)
-      DBUG_RETURN(error);
-    my_defaults_extra_file= my_defaults_extra_file_buffer;
-  }
+    if (forced_extra_defaults && !defaults_already_read)
+    {
+      int error= fn_expand(forced_extra_defaults,
+                           my_defaults_extra_file_buffer);
+      if (error)
+        DBUG_RETURN(error);
 
-  if (forced_default_file && !defaults_already_read)
-  {
-    int error= fn_expand(forced_default_file, my_defaults_file_buffer);
-    if (error)
-      DBUG_RETURN(error);
-    my_defaults_file= my_defaults_file_buffer;
-  }
+      my_defaults_extra_file= my_defaults_extra_file_buffer;
+    }
 
-  defaults_already_read= TRUE;
+    if (forced_default_file && !defaults_already_read)
+    {
+      int error= fn_expand(forced_default_file, my_defaults_file_buffer);
+      if (error)
+        DBUG_RETURN(error);
+      my_defaults_file= my_defaults_file_buffer;
+    }
 
-  /*
-    We can only handle 'defaults-group-suffix' if we are called from
-    load_defaults() as otherwise we can't know the type of 'func_ctx'
-  */
+    defaults_already_read= TRUE;
+
+    /*
+      We can only handle 'defaults-group-suffix' if we are called from
+      load_defaults() as otherwise we can't know the type of 'func_ctx'
+    */
 
-  if (my_defaults_group_suffix && func == handle_default_option)
+    if (my_defaults_group_suffix && func == handle_default_option)
+    {
+      /* Handle --defaults-group-suffix= */
+      uint i;
+      const char **extra_groups;
+      const size_t instance_len= strlen(my_defaults_group_suffix);
+      struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
+      char *ptr;
+      TYPELIB *group= ctx->group;
+
+      if (!(extra_groups=
+            (const char**)alloc_root(ctx->alloc,
+                                     (2*group->count+1)*sizeof(char*))))
+        DBUG_RETURN(2);
+
+      for (i= 0; i < group->count; i++)
+      {
+        size_t len;
+        extra_groups[i]= group->type_names[i];  /** copy group */
+
+        len= strlen(extra_groups[i]);
+        if (!(ptr= alloc_root(ctx->alloc, (uint) (len+instance_len+1))))
+          DBUG_RETURN(2);
+
+        extra_groups[i+group->count]= ptr;
+
+        /** Construct new group */
+        memcpy(ptr, extra_groups[i], len);
+        memcpy(ptr+len, my_defaults_group_suffix, instance_len+1);
+      }
+
+      group->count*= 2;
+      group->type_names= extra_groups;
+      group->type_names[group->count]= 0;
+    }
+  }
+  else if (my_login_path && func == handle_default_option)
   {
-    /* Handle --defaults-group-suffix= */
+    /* Handle --login_path= */
     uint i;
+    size_t len;
     const char **extra_groups;
-    const size_t instance_len= strlen(my_defaults_group_suffix); 
+    size_t instance_len= 0;
     struct handle_option_ctx *ctx= (struct handle_option_ctx*) func_ctx;
     char *ptr;
     TYPELIB *group= ctx->group;
-    
-    if (!(extra_groups= 
-	  (const char**)alloc_root(ctx->alloc,
-                                   (2*group->count+1)*sizeof(char*))))
+
+    if (!(extra_groups= (const char**)alloc_root(ctx->alloc,
+                                                 (group->count + 2)
+                                                 * sizeof(char *))))
       DBUG_RETURN(2);
-    
+
     for (i= 0; i < group->count; i++)
     {
-      size_t len;
-      extra_groups[i]= group->type_names[i]; /** copy group */
-      
+      extra_groups[i]= group->type_names[i];    /** copy group */
+    }
+
+    extra_groups[i]= my_login_path;
+
+    if (my_defaults_group_suffix && func == handle_default_option)
+    {
+      instance_len= strlen(my_defaults_group_suffix);
       len= strlen(extra_groups[i]);
-      if (!(ptr= alloc_root(ctx->alloc, (uint) (len+instance_len+1))))
-       DBUG_RETURN(2);
-      
-      extra_groups[i+group->count]= ptr;
-      
+
+      if (!(ptr= alloc_root(ctx->alloc, (uint) (len + instance_len + 1))))
+        DBUG_RETURN(2);
+
+      extra_groups[i + 1]= ptr;
+
       /** Construct new group */
       memcpy(ptr, extra_groups[i], len);
-      memcpy(ptr+len, my_defaults_group_suffix, instance_len+1);
+      memcpy(ptr+len, my_defaults_group_suffix, instance_len + 1);
+      group->count += 1;
     }
-    
-    group->count*= 2;
+
+    group->count += 1;
     group->type_names= extra_groups;
     group->type_names[group->count]= 0;
   }
-  
+
   // If conf_file is an absolute path, we only read it
   if (dirname_length(conf_file))
   {
@@ -321,7 +389,7 @@ int my_search_option_files(const char *c
       goto err;
     }
   }
-  else
+  else if (! found_no_defaults)
   {
     for (dirs= default_directories ; *dirs; dirs++)
     {
@@ -399,7 +467,9 @@ static int handle_default_option(void *i
 
 
 /*
-  Gets options from the command line
+  Gets options from the command line, however if --no-defaults
+  option is used, --defaults-file & --defaults-extra-file options
+  would be ignored.
 
   SYNOPSIS
     get_defaults_options()
@@ -407,6 +477,8 @@ static int handle_default_option(void *i
     argv			Pointer to argv of original program
     defaults                    --defaults-file option
     extra_defaults              --defaults-extra-file option
+    group_suffix                --defaults-group-suffix option
+    login_path                  --login-path option
 
   RETURN
     # Number of arguments used from *argv
@@ -417,32 +489,51 @@ static int handle_default_option(void *i
 int get_defaults_options(int argc, char **argv,
                          char **defaults,
                          char **extra_defaults,
-                         char **group_suffix)
+                         char **group_suffix,
+                         char **login_path)
 {
-  int org_argc= argc, prev_argc= 0;
-  *defaults= *extra_defaults= *group_suffix= 0;
+  int org_argc= argc, prev_argc= 0, default_option_count= 0;
+  *defaults= *extra_defaults= *group_suffix= *login_path= 0;
 
   while (argc >= 2 && argc != prev_argc)
   {
     /* Skip program name or previously handled argument */
     argv++;
     prev_argc= argc;                            /* To check if we found */
-    if (!*defaults && is_prefix(*argv,"--defaults-file="))
+    /* --no-defaults is always the first option. */
+    if (is_prefix(*argv,"--no-defaults") && ! default_option_count)
+    {
+       argc--;
+       default_option_count ++;
+       continue;
+    }
+    if (!*defaults && is_prefix(*argv, "--defaults-file=") && ! found_no_defaults)
     {
       *defaults= *argv + sizeof("--defaults-file=")-1;
        argc--;
+       default_option_count ++;
        continue;
     }
-    if (!*extra_defaults && is_prefix(*argv,"--defaults-extra-file="))
+    if (!*extra_defaults && is_prefix(*argv, "--defaults-extra-file=")
+        && ! found_no_defaults)
     {
       *extra_defaults= *argv + sizeof("--defaults-extra-file=")-1;
       argc--;
+      default_option_count ++;
       continue;
     }
     if (!*group_suffix && is_prefix(*argv, "--defaults-group-suffix="))
     {
       *group_suffix= *argv + sizeof("--defaults-group-suffix=")-1;
       argc--;
+      default_option_count ++;
+      continue;
+    }
+    if (!*login_path && is_prefix(*argv, "--login-path="))
+    {
+      *login_path= *argv + sizeof("--login-path=")-1;
+      argc--;
+      default_option_count ++;
       continue;
     }
   }
@@ -529,6 +620,12 @@ int my_load_defaults(const char *conf_fi
   uint args_sep= my_getopt_use_args_separator ? 1 : 0;
   DBUG_ENTER("load_defaults");
 
+  /*
+    Set it to FALSE, as this function can be invoked
+    multiple times with different conf_file.
+  */
+  defaults_already_read= FALSE;
+
   init_alloc_root(&alloc,512,0);
   if ((dirs= init_default_directories(&alloc)) == NULL)
     goto err;
@@ -536,37 +633,8 @@ int my_load_defaults(const char *conf_fi
     Check if the user doesn't want any default option processing
     --no-defaults is always the first option
   */
-  if (*argc >= 2 && !strcmp(argv[0][1],"--no-defaults"))
-  {
-    /* remove the --no-defaults argument and return only the other arguments */
-    uint i, j;
-    if (!(ptr=(char*) alloc_root(&alloc,sizeof(alloc)+
-				 (*argc + 1)*sizeof(char*))))
-      goto err;
-    res= (char**) (ptr+sizeof(alloc));
-    res[0]= **argv;				/* Copy program name */
-    j= 1;                 /* Start from 1 for the reset result args */
-    if (my_getopt_use_args_separator)
-    {
-      /* set arguments separator */
-      set_args_separator(&res[1]);
-      j++;
-    }
-    for (i=2 ; i < (uint) *argc ; i++, j++)
-      res[j]=argv[0][i];
-    res[j]=0;					/* End pointer */
-    /*
-      Update the argc, if have not added args separator, then we have
-      to decrease argc because we have removed the "--no-defaults".
-    */
-    if (!my_getopt_use_args_separator)
-      (*argc)--;
-    *argv=res;
-    *(MEM_ROOT*) ptr= alloc;			/* Save alloc root for free */
-    if (default_directories)
-      *default_directories= dirs;
-    DBUG_RETURN(0);
-  }
+  if (*argc >= 2 && !strcmp(argv[0][1], "--no-defaults"))
+    found_no_defaults= TRUE;
 
   group.count=0;
   group.name= "defaults";
@@ -582,13 +650,26 @@ int my_load_defaults(const char *conf_fi
   ctx.args= &args;
   ctx.group= &group;
 
-  if ((error= my_search_option_files(conf_file, argc, argv, &args_used,
+  if ((error= my_search_option_files(conf_file, argc, argv,
+                                    &args_used, handle_default_option,
+                                    (void *) &ctx, dirs)))
+  {
+    free_root(&alloc,MYF(0));
+    DBUG_RETURN(error);
+  }
+
+  /* Read options from login group. */
+  is_login_file= TRUE;
+  if (set_login_file_name() &&
+      (error= my_search_option_files(my_login_file,argc, argv, &args_used,
                                      handle_default_option, (void *) &ctx,
                                      dirs)))
   {
     free_root(&alloc,MYF(0));
     DBUG_RETURN(error);
   }
+  is_login_file= FALSE;
+
   /*
     Here error contains <> 0 only if we have a fully specified conf_file
     or a forced default file
@@ -631,6 +712,13 @@ int my_load_defaults(const char *conf_fi
   *argv= (char**) res;
   *(MEM_ROOT*) ptr= alloc;			/* Save alloc root for free */
   delete_dynamic(&args);
+
+  if (default_directories)
+    *default_directories= dirs;
+
+  if (found_no_defaults)
+    DBUG_RETURN(0);
+
   if (found_print_defaults)
   {
     int i;
@@ -643,9 +731,6 @@ int my_load_defaults(const char *conf_fi
     exit(0);
   }
 
-  if (default_directories)
-    *default_directories= dirs;
-
   DBUG_RETURN(0);
 
  err:
@@ -812,7 +897,7 @@ static int search_default_file_with_ext(
   if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
     return 1;					/* Ignore wrong files */
 
-  while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
+  while (mysql_file_getline(buff, sizeof(buff) - 1, fp))
   {
     line++;
     /* Ignore comment and empty lines */
@@ -1037,6 +1122,54 @@ static char *remove_end_comment(char *pt
 }
 
 
+/**
+  Read one line from the specified file. In case
+  of scrambled login file, the line read is first
+  decrypted and then returned.
+
+  @param str  [out]       Buffer to store the read text.
+  @param size [in]        At max, size-1 bytes to be read.
+  @param file [in]        Source file.
+
+  @return 1               Success
+          0               Error
+*/
+
+static my_bool mysql_file_getline(char *str, int size, MYSQL_FILE *file)
+{
+  uchar cipher[4096], len_buf[MAX_CIPHER_STORE_LEN];
+  int length= 0, cipher_len= 0;
+
+  if (is_login_file)
+  {
+   if (mysql_file_fread(file, len_buf, MAX_CIPHER_STORE_LEN,
+                        MYF(MY_WME)) == MAX_CIPHER_STORE_LEN)
+   {
+     cipher_len= sint4korr(len_buf);
+     if (cipher_len > size)
+       return 0;
+   }
+
+   mysql_file_fread(file, cipher, cipher_len, MYF(MY_WME));
+   if ((length= my_aes_decrypt((const char *) cipher, cipher_len, str, my_key,
+                               strlen(my_key))) < 0)
+   {
+     /* Attempt to decrypt failed. */
+     return 0;
+   }
+   str[length]= 0;
+   return 1;
+  }
+  else
+  {
+    if (mysql_file_fgets(str, size, file))
+      return 1;
+    else
+      return 0;
+  }
+}
+
+
 void my_print_default_files(const char *conf_file)
 {
   const char *empty_list[]= { "", 0 };
@@ -1114,9 +1247,13 @@ void print_defaults(const char *conf_fil
   }
   puts("\nThe following options may be given as the first argument:\n\
 --print-defaults        Print the program argument list and exit.\n\
---no-defaults           Don't read default options from any option file.\n\
+--no-defaults           Don't read default options from any option file,\n\
+                        except for login file.\n\
 --defaults-file=#       Only read default options from the given file #.\n\
---defaults-extra-file=# Read this file after the global files are read.");
+--defaults-extra-file=# Read this file after the global files are read.\n\
+--defaults-group-suffix=#\n\
+                        Also read groups with concat(group, suffix)\n\
+--login-path=#          Read this path from the login file.");
 }
 
 
@@ -1257,3 +1394,32 @@ static const char **init_default_directo
 
   return (errors > 0 ? NULL : dirs);
 }
+
+/**
+  Generate and store the login file name in my_login_file.
+
+  @return 1 - Success
+          0 - Failure
+*/
+
+int set_login_file_name()
+{
+    /* Read options from login group. */
+    if (getenv("MYSQL_TEST_LOGIN_FILE"))
+      sprintf(my_login_file_buffer, "%s", getenv("MYSQL_TEST_LOGIN_FILE"));
+#ifdef _WIN32
+    else if (getenv("APPDATA"))
+      sprintf(my_login_file_buffer, "%s\\MySQL\\.mylogin.cnf", getenv("APPDATA"));
+#else
+    else if (getenv("HOME"))
+      sprintf(my_login_file_buffer, "%s/.mylogin.cnf", getenv("HOME"));
+#endif
+    else
+    {
+      my_login_file= NULL;
+      return 0;
+    }
+    my_login_file= my_login_file_buffer;
+    return 1;
+}
+

=== added file 'mysys_ssl/my_aes.cc'
--- a/mysys_ssl/my_aes.cc	1970-01-01 00:00:00 +0000
+++ b/mysys_ssl/my_aes.cc	2012-05-24 09:31:49 +0000
@@ -0,0 +1,291 @@
+/* Copyright (c) 2002, 2012, 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
+ the Free Software Foundation; version 2 of the License.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+
+
+#include <my_global.h>
+#include <m_string.h>
+#include <my_aes.h>
+
+#if defined(HAVE_YASSL)
+#include "aes.hpp"
+#include "openssl/ssl.h"
+#elif defined(HAVE_OPENSSL)
+#include <openssl/aes.h>
+#include <openssl/evp.h>
+#endif
+
+enum encrypt_dir { MY_AES_ENCRYPT, MY_AES_DECRYPT };
+
+#define MY_AES_BLOCK_SIZE 16                    /* Block size in bytes */
+
+/* If bad data discovered during decoding */
+#define AES_BAD_DATA  -1
+
+/**
+  This is internal function just keeps joint code of Key generation
+
+  SYNOPSIS
+    my_aes_create_key()
+    @param key        [in]       Key to use for real key creation
+    @param key_length [in]       Length of the key
+    @param rkey       [out]      Real key (used by OpenSSL/YaSSL)
+
+  @return
+    0         Ok
+    -1        Error; Note: The current impementation never returns this
+*/
+
+static int my_aes_create_key(const char *key, int key_length, uint8 *rkey)
+{
+  uint8 *rkey_end= rkey + AES_KEY_LENGTH / 8;   /* Real key boundary */
+  uint8 *ptr;                                   /* Start of the real key*/
+  const char *sptr;                             /* Start of the working key */
+  const char *key_end= key + key_length;        /* Working key boundary*/
+
+  memset(rkey, 0, AES_KEY_LENGTH / 8);          /* Set initial key  */
+
+  for (ptr= rkey, sptr= key; sptr < key_end; ptr ++, sptr ++)
+  {
+    if (ptr == rkey_end)
+      /*  Just loop over tmp_key until we used all key */
+      ptr= rkey;
+    *ptr ^= (uint8) *sptr;
+  }
+#ifdef AES_USE_KEY_BITS
+  /*
+   This block is intended to allow more weak encryption if application
+   build with libmysqld needs to correspond to export regulations
+   It should be never used in normal distribution as does not give
+   any speed improvement.
+   To get worse security define AES_USE_KEY_BITS to number of bits
+   you want key to be. It should be divisible by 8
+
+   WARNING: Changing this value results in changing of enryption for
+   all key lengths  so altering this value will result in impossibility
+   to decrypt data encrypted with previous value
+  */
+#define AES_USE_KEY_BYTES (AES_USE_KEY_BITS/8)
+  /*
+   To get weaker key we use first AES_USE_KEY_BYTES bytes of created key
+   and cyclically copy them until we created all required key length
+  */
+  for (ptr= rkey+AES_USE_KEY_BYTES, sptr=rkey ; ptr < rkey_end;
+       ptr ++, sptr ++)
+  {
+    if (sptr == rkey + AES_USE_KEY_BYTES)
+      sptr= rkey;
+    *ptr= *sptr;
+  }
+#endif
+  return 0;
+}
+
+
+/**
+  Crypt buffer with AES encryption algorithm.
+
+  SYNOPSIS
+     my_aes_encrypt()
+     @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
+
+  @return
+    >= 0             Size of encrypted data
+    < 0              Error
+*/
+
+int my_aes_encrypt(const char* source, int source_length, char* dest,
+                   const char* key, int key_length)
+{
+#if defined(HAVE_YASSL)
+  TaoCrypt::AES_ECB_Encryption enc;
+#elif defined(HAVE_OPENSSL)
+  EVP_CIPHER_CTX ctx;
+
+  /* Used in EVP_EncryptFinal() */
+  uint8 dummy_block[MY_AES_BLOCK_SIZE];
+  int u_len, f_len;
+#endif
+
+  /* The real key to be used for encryption */
+  uint8 rkey[AES_KEY_LENGTH / 8];
+  uint8 block[MY_AES_BLOCK_SIZE];                /* 128 bit block used for padding */
+  int rc;                                        /* result codes */
+  int num_blocks;                                /* number of complete blocks */
+  char pad_len;                                  /* pad size for the last block */
+  int i;
+
+  if ((rc= my_aes_create_key(key, key_length, rkey)))
+    return rc;
+
+#if defined(HAVE_YASSL)
+  enc.SetKey((const TaoCrypt::byte *) rkey, MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+  EVP_EncryptInit(&ctx, EVP_aes_128_ecb(), (const unsigned char *) rkey,
+                  NULL);
+  /*
+    Since we are taking care of padding, the length of data
+    encrypted is exact multiple of the block size. So we can
+    safely turn off OpenSSL's internal padding.
+  */
+  EVP_CIPHER_CTX_set_padding(&ctx, 0);
+#endif
+
+  num_blocks = source_length / MY_AES_BLOCK_SIZE;
+
+  for (i = num_blocks; i > 0; i--)              /* Encode complete blocks */
+  {
+#if defined(HAVE_YASSL)
+    enc.Process((TaoCrypt::byte *) dest, (const TaoCrypt::byte *) source,
+                MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+    EVP_EncryptUpdate(&ctx, (unsigned char *) dest, &u_len,
+                      (unsigned const char *) source, MY_AES_BLOCK_SIZE);
+#endif
+    source += MY_AES_BLOCK_SIZE;
+    dest += MY_AES_BLOCK_SIZE;
+  }
+
+  /* Encode the rest. We always have incomplete block */
+  pad_len = MY_AES_BLOCK_SIZE - (source_length -
+                                 MY_AES_BLOCK_SIZE * num_blocks);
+  memcpy(block, source, 16 - pad_len);
+  memset(block + MY_AES_BLOCK_SIZE - pad_len, pad_len,  pad_len);
+
+#if defined(HAVE_YASSL)
+  enc.Process((TaoCrypt::byte *) dest, (const TaoCrypt::byte *) block,
+              MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+  EVP_EncryptUpdate(&ctx, (unsigned char *) dest, &u_len,
+                    (unsigned const char *) block, MY_AES_BLOCK_SIZE);
+  EVP_EncryptFinal(&ctx, (unsigned char *) dummy_block, &f_len);
+#endif
+
+  return MY_AES_BLOCK_SIZE * (num_blocks + 1);
+}
+
+
+/**
+  DeCrypt buffer with AES encryption algorithm.
+
+  SYNOPSIS
+    my_aes_decrypt()
+    @param source        [in]   Pointer to data for decryption
+    @param source_length [in]   Size of encrypted data
+    @param dest          [out]  Buffer to place decrypted data (must
+                                be large enough)
+    @param key           [in]   Key to be used for decryption
+    @param key_length    [in]   Length of the key. Will handle keys of any length
+
+  @return
+    >= 0             Size of encrypted data
+    < 0              Error
+*/
+
+int my_aes_decrypt(const char *source, int source_length, char *dest,
+                   const char *key, int key_length)
+{
+#if defined(HAVE_YASSL)
+  TaoCrypt::AES_ECB_Decryption dec;
+#elif defined(HAVE_OPENSSL)
+  EVP_CIPHER_CTX ctx;
+
+  /* Used in EVP_DecryptFinal() */
+  uint8 dummy_block[MY_AES_BLOCK_SIZE];
+  int u_len, f_len;
+#endif
+
+  /* The real key to be used for decryption */
+  uint8 rkey[AES_KEY_LENGTH / 8];
+  /* 128 bit block used for padding */
+  uint8 block[MY_AES_BLOCK_SIZE];
+  int rc;                                       /* Result codes */
+  int num_blocks;                               /* Number of complete blocks */
+  /* Pad size for the last block */
+  uint pad_len;
+  int i;
+
+  if ((rc= my_aes_create_key(key, key_length, rkey)))
+    return rc;
+
+#if defined(HAVE_YASSL)
+  dec.SetKey((const TaoCrypt::byte *) rkey, MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+  EVP_DecryptInit(&ctx, EVP_aes_128_ecb(), (const unsigned char *) rkey, NULL);
+  EVP_CIPHER_CTX_set_padding(&ctx, 0);
+#endif
+
+  num_blocks = source_length / MY_AES_BLOCK_SIZE;
+
+  if ((source_length != num_blocks * MY_AES_BLOCK_SIZE) || num_blocks == 0 )
+    /* Input size has to be even and at least one block */
+    return AES_BAD_DATA;
+
+  /* Decode all but last blocks */
+  for (i = num_blocks - 1; i > 0; i--)
+  {
+#if defined(HAVE_YASSL)
+    dec.Process((TaoCrypt::byte *) dest, (const TaoCrypt::byte *) source,
+                MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+    EVP_DecryptUpdate(&ctx, (unsigned char *) dest, &u_len,
+                      (unsigned const char *) source, MY_AES_BLOCK_SIZE);
+#endif
+
+    source += MY_AES_BLOCK_SIZE;
+    dest += MY_AES_BLOCK_SIZE;
+  }
+
+#if defined(HAVE_YASSL)
+  dec.Process((TaoCrypt::byte *) block, (const TaoCrypt::byte *) source,
+              MY_AES_BLOCK_SIZE);
+#elif defined(HAVE_OPENSSL)
+  EVP_DecryptUpdate(&ctx, (unsigned char *) block, &u_len,
+                    (unsigned const char *) source, MY_AES_BLOCK_SIZE);
+  EVP_DecryptFinal(&ctx, (unsigned char *) dummy_block, &f_len);
+#endif
+
+  /* Use last char in the block as size */
+  pad_len = (uint) (uchar) block[MY_AES_BLOCK_SIZE - 1];
+
+  if (pad_len > MY_AES_BLOCK_SIZE)
+    return AES_BAD_DATA;
+  /* We could also check whole padding but we do not really need this */
+
+  memcpy(dest, block, MY_AES_BLOCK_SIZE - pad_len);
+  return MY_AES_BLOCK_SIZE * num_blocks - pad_len;
+}
+
+
+/**
+  Get size of buffer which will be large enough for encrypted data
+
+  SYNOPSIS
+    my_aes_get_size()
+    @param source_length  [in] Length of data to be encrypted
+
+  @return
+    Size of buffer required to store encrypted data
+*/
+
+int my_aes_get_size(int source_length)
+{
+  return MY_AES_BLOCK_SIZE * (source_length / MY_AES_BLOCK_SIZE)
+    + MY_AES_BLOCK_SIZE;
+}
+

=== added file 'mysys_ssl/my_default.h'
--- a/mysys_ssl/my_default.h	1970-01-01 00:00:00 +0000
+++ b/mysys_ssl/my_default.h	2012-05-24 09:31:49 +0000
@@ -0,0 +1,58 @@
+/* Copyright (c) 2012, 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
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1307  USA */
+
+#ifndef MY_DEFAULT_INCLUDED
+#define MY_DEFAULT_INCLUDED
+
+/*
+  Number of byte used to store the length of
+  cipher that follows.
+*/
+#define MAX_CIPHER_STORE_LEN 4U
+#ifdef __cplusplus
+extern "C" {
+#endif
+extern const char *my_defaults_extra_file;
+extern const char *my_defaults_group_suffix;
+extern const char *my_defaults_file;
+extern const char* my_login_file;
+extern const char* my_key;
+extern my_bool my_getopt_use_args_separator;
+
+/* Define the type of function to be passed to process_default_option_files */
+typedef int (*Process_option_func)(void *ctx, const char *group_name,
+                                   const char *option);
+
+extern my_bool my_getopt_is_args_separator(const char* arg);
+extern int get_defaults_options(int argc, char **argv,
+                                char **defaults, char **extra_defaults,
+                                char **group_suffix, char **login_path);
+extern int my_load_defaults(const char *conf_file, const char **groups,
+                            int *argc, char ***argv, const char ***);
+extern int load_defaults(const char *conf_file, const char **groups,
+                         int *argc, char ***argv);
+extern int my_search_option_files(const char *conf_file, int *argc,
+                                  char ***argv, uint *args_used,
+                                  Process_option_func func, void *func_ctx,
+                                  const char **default_directories);
+extern void free_defaults(char **argv);
+extern void my_print_default_files(const char *conf_file);
+extern void print_defaults(const char *conf_file, const char **groups);
+extern int set_login_file_name();
+#ifdef __cplusplus
+}
+#endif
+
+#endif  // MY_DEFAULT_INCLUDED

=== renamed file 'mysys/my_getopt.c' => 'mysys_ssl/my_getopt.c'
--- a/mysys/my_getopt.c	2012-03-06 14:29:42 +0000
+++ b/mysys_ssl/my_getopt.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2012, 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
@@ -16,11 +16,11 @@
 #include <my_global.h>
 #include <m_string.h>
 #include <stdlib.h>
-#include <my_sys.h>
 #include <mysys_err.h>
 #include <my_getopt.h>
 #include <errno.h>
 #include <m_string.h>
+#include "my_default.h"
 
 typedef void (*init_func_p)(const struct my_option *option, void *variable,
                             longlong value);

=== modified file 'sql-common/client.c'
--- a/sql-common/client.c	2011-12-09 21:08:37 +0000
+++ b/sql-common/client.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2012, 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
@@ -57,6 +57,7 @@ my_bool	net_flush(NET *net);
 #endif /*EMBEDDED_LIBRARY*/
 
 #include <my_sys.h>
+#include "my_default.h"
 #include <mysys_err.h>
 #include <m_string.h>
 #include <m_ctype.h>

=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt	2012-05-22 09:03:56 +0000
+++ b/sql/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -17,6 +17,7 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include 
   ${CMAKE_SOURCE_DIR}/sql 
   ${CMAKE_SOURCE_DIR}/regex 
+  ${CMAKE_SOURCE_DIR}/mysys_ssl
   ${ZLIB_INCLUDE_DIR}
   ${SSL_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/sql
@@ -213,7 +214,7 @@ ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
 ADD_DEPENDENCIES(sql GenServerSource)
 DTRACE_INSTRUMENT(sql)
 TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} 
-  mysys dbug strings vio regex   
+  mysys mysys_ssl dbug strings vio regex   
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${SSL_LIBRARIES})
 
@@ -291,7 +292,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
     # incremental appears to crash from time to time,if used with /DEF option
     SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${mysqld_link_flags} /DEF:mysqld.def /INCREMENTAL:NO")
 
-    FOREACH (CORELIB sql mysys dbug strings)
+    FOREACH (CORELIB sql mysys mysys_ssl dbug strings)
       GET_TARGET_PROPERTY(LOC ${CORELIB} LOCATION)
       FILE(TO_NATIVE_PATH ${LOC} LOC)
       SET (LIB_LOCATIONS ${LIB_LOCATIONS} ${LOC}) 
@@ -309,7 +310,7 @@ IF(NOT WITHOUT_DYNAMIC_PLUGINS)
 ENDIF()
 
 SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) 
-TARGET_LINK_LIBRARIES(mysqld sql binlog rpl master slave sql mysys)
+TARGET_LINK_LIBRARIES(mysqld sql binlog rpl master slave sql mysys mysys_ssl)
 
 # Provide plugins with minimal set of libraries
 SET(INTERFACE_LIBS ${LIBRT})
@@ -321,7 +322,7 @@ ENDIF()
 # On Solaris, some extra effort is required in order to get dtrace probes
 # from static libraries
 DTRACE_INSTRUMENT_STATIC_LIBS(mysqld 
- "sql;mysys;${MYSQLD_STATIC_PLUGIN_LIBS}")
+ "sql;mysys;mysys_ssl;${MYSQLD_STATIC_PLUGIN_LIBS}")
  
 
 SET(WITH_MYSQLD_LDFLAGS "" CACHE STRING "Additional linker flags for mysqld")
@@ -380,7 +381,7 @@ ADD_CUSTOM_COMMAND(
 
 MYSQL_ADD_EXECUTABLE(mysql_tzinfo_to_sql tztime.cc)
 SET_TARGET_PROPERTIES(mysql_tzinfo_to_sql PROPERTIES COMPILE_FLAGS "-DTZINFO2SQL")
-TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys)
+TARGET_LINK_LIBRARIES(mysql_tzinfo_to_sql mysys mysys_ssl)
 
 ADD_CUSTOM_TARGET( 
         GenServerSource

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-05-23 11:20:06 +0000
+++ b/sql/mysqld.cc	2012-05-24 09:31:49 +0000
@@ -76,6 +76,7 @@
 
 #include "global_threads.h"
 #include "mysqld.h"
+#include "my_default.h"
 
 #ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
 #include "../storage/perfschema/pfs_server.h"

=== modified file 'sql/sql_plugin.cc'
--- a/sql/sql_plugin.cc	2012-04-13 12:00:39 +0000
+++ b/sql/sql_plugin.cc	2012-05-24 09:31:49 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2012, 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
@@ -33,6 +33,7 @@
 #include "sql_audit.h"
 #include <mysql/plugin_auth.h>
 #include "lock.h"                               // MYSQL_LOCK_IGNORE_TIMEOUT
+#include "my_default.h"
 
 #include <algorithm>
 

=== modified file 'storage/myisam/CMakeLists.txt'
--- a/storage/myisam/CMakeLists.txt	2011-09-07 10:08:09 +0000
+++ b/storage/myisam/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -13,6 +13,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/mysys_ssl)
+
 SET(MYISAM_SOURCES  ft_boolean_search.c ft_nlq_search.c ft_parser.c ft_static.c
                                 ha_myisam.cc
 				ft_stopwords.c ft_update.c mi_cache.c mi_changed.c mi_check.c
@@ -34,20 +36,24 @@ MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES
 TARGET_LINK_LIBRARIES(myisam mysys)
 
 MYSQL_ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
-TARGET_LINK_LIBRARIES(myisam_ftdump myisam)
+TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys_ssl)
+SET_TARGET_PROPERTIES(myisam_ftdump PROPERTIES LINKER_LANGUAGE CXX)
 
 MYSQL_ADD_EXECUTABLE(myisamchk myisamchk.c)
-TARGET_LINK_LIBRARIES(myisamchk myisam)
+TARGET_LINK_LIBRARIES(myisamchk myisam mysys_ssl)
+SET_TARGET_PROPERTIES(myisamchk PROPERTIES LINKER_LANGUAGE CXX)
 
 MYSQL_ADD_EXECUTABLE(myisamlog myisamlog.c)
 TARGET_LINK_LIBRARIES(myisamlog myisam)
 
 MYSQL_ADD_EXECUTABLE(myisampack myisampack.c)
-TARGET_LINK_LIBRARIES(myisampack myisam)
+TARGET_LINK_LIBRARIES(myisampack myisam mysys_ssl)
+SET_TARGET_PROPERTIES(myisampack PROPERTIES LINKER_LANGUAGE CXX)
 
 IF(WITH_UNIT_TESTS AND FALSE)
   ADD_EXECUTABLE(mi_test1 mi_test1.c)
-  TARGET_LINK_LIBRARIES(mi_test1 myisam)
+  TARGET_LINK_LIBRARIES(mi_test1 myisam mysys_ssl)
+  SET_TARGET_PROPERTIES(mi_test1 PROPERTIES LINKER_LANGUAGE CXX)
 
   ADD_EXECUTABLE(mi_test2 mi_test2.c)
   TARGET_LINK_LIBRARIES(mi_test2 myisam)

=== modified file 'storage/myisam/myisamchk.c'
--- a/storage/myisam/myisamchk.c	2012-03-06 14:29:42 +0000
+++ b/storage/myisam/myisamchk.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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
@@ -16,6 +16,7 @@
 /* Describe, check and repair of MyISAM tables */
 
 #include "fulltext.h"
+#include "my_default.h"
 
 #include <m_ctype.h>
 #include <stdarg.h>

=== modified file 'storage/myisam/myisampack.c'
--- a/storage/myisam/myisampack.c	2011-12-09 21:08:37 +0000
+++ b/storage/myisam/myisampack.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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
@@ -20,6 +20,7 @@
 #endif
 
 #include "myisamdef.h"
+#include "my_default.h"
 #include <queues.h>
 #include <my_tree.h>
 #include "mysys_err.h"

=== modified file 'tests/CMakeLists.txt'
--- a/tests/CMakeLists.txt	2010-10-27 11:32:32 +0000
+++ b/tests/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2012, 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
@@ -15,7 +15,9 @@
 
 ADD_DEFINITIONS("-DMYSQL_CLIENT")
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+INCLUDE_DIRECTORIES(
+  ${CMAKE_SOURCE_DIR}/include
+  ${CMAKE_SOURCE_DIR}/mysys_ssl)
 
 ADD_EXECUTABLE(mysql_client_test mysql_client_test.c)
 TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient)

=== modified file 'tests/mysql_client_test.c'
--- a/tests/mysql_client_test.c	2012-03-06 14:29:42 +0000
+++ b/tests/mysql_client_test.c	2012-05-24 09:31:49 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2012, 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
@@ -28,6 +28,7 @@
 
 #include <my_global.h>
 #include <my_sys.h>
+#include "my_default.h"
 #include <mysql.h>
 #include <errmsg.h>
 #include <my_getopt.h>

=== modified file 'unittest/gunit/CMakeLists.txt'
--- a/unittest/gunit/CMakeLists.txt	2012-05-18 22:41:42 +0000
+++ b/unittest/gunit/CMakeLists.txt	2012-05-24 09:31:49 +0000
@@ -201,8 +201,10 @@ ADD_LIBRARY(gunit_large STATIC
   gunit_test_main_server.cc test_utils.cc tap_event_listener.cc thread_utils.cc)
 ADD_DEPENDENCIES(gunit_small GenError)
 ADD_DEPENDENCIES(gunit_large GenError)
-TARGET_LINK_LIBRARIES(gunit_small mysys mytap dbug strings ${GTEST_LIBRARIES})
-TARGET_LINK_LIBRARIES(gunit_large mysys mytap dbug strings ${GTEST_LIBRARIES})
+TARGET_LINK_LIBRARIES(gunit_small
+  mysys mysys_ssl mytap dbug strings ${GTEST_LIBRARIES})
+TARGET_LINK_LIBRARIES(gunit_large
+  mysys mysys_ssl mytap dbug strings ${GTEST_LIBRARIES})
 MESSAGE(STATUS "GTEST_LIBRARIES:${GTEST_LIBRARIES}")
 
 # Add some defines.

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (nirbhay.choubey:3777 to 3778) WL#5603Nirbhay Choubey24 May