WL#13289: Remove yaSSL support from the 5.7 codebase

RB#22399

Author: gkodinov

.gitignore

@@ -548,55 +548,6 @@ extra/resolve_stack_dump
 extra/resolveip
 extra/sql_state.h
 extra/tztime.cc
-extra/yassl/src/.deps/buffer.Plo
-extra/yassl/src/.deps/cert_wrapper.Plo
-extra/yassl/src/.deps/crypto_wrapper.Plo
-extra/yassl/src/.deps/handshake.Plo
-extra/yassl/src/.deps/lock.Plo
-extra/yassl/src/.deps/log.Plo
-extra/yassl/src/.deps/socket_wrapper.Plo
-extra/yassl/src/.deps/ssl.Plo
-extra/yassl/src/.deps/template_instnt.Plo
-extra/yassl/src/.deps/timer.Plo
-extra/yassl/src/.deps/yassl_error.Plo
-extra/yassl/src/.deps/yassl_imp.Plo
-extra/yassl/src/.deps/yassl_int.Plo
-extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
-extra/yassl/taocrypt/benchmark/benchmark
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
-extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
-extra/yassl/taocrypt/test/.deps/test-test.Po
-extra/yassl/taocrypt/test/test
-extra/yassl/testsuite/.deps/testsuite-client.Po
-extra/yassl/testsuite/.deps/testsuite-echoclient.Po
-extra/yassl/testsuite/.deps/testsuite-echoserver.Po
-extra/yassl/testsuite/.deps/testsuite-server.Po
-extra/yassl/testsuite/.deps/testsuite-test.Po
-extra/yassl/testsuite/.deps/testsuite-testsuite.Po
-extra/yassl/testsuite/testsuite
 fcns.c
 fcns.h
 gdbinit

BUILD/SETUP.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2019, 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 Library General Public
@@ -100,11 +100,8 @@ path=`dirname $0`
 export AM_MAKEFLAGS
 AM_MAKEFLAGS="-j 6"
 
-# SSL library to use.--with-ssl will select our bundled yaSSL
-# implementation of SSL. To use openSSl you will nee too point out
-# the location of openSSL headers and lbs on your system.
-# Ex --with-ssl=/usr
-SSL_LIBRARY=--with-ssl
+# SSL library to use.
+SSL_LIBRARY=--with-ssl=system
 
 if [ "x$warning_mode" = "xpedantic" ]; then
   warnings="-W -Wall -ansi -pedantic -Wno-long-long -Wno-unused -D_POSIX_SOURCE"
@@ -232,11 +229,9 @@ fi
 
 # The  -fprofile-arcs and -ftest-coverage options cause GCC to instrument the
 # code with profiling information used by gcov.
-# The -DDISABLE_TAO_ASM is needed to avoid build failures in Yassl.
 # The -DHAVE_gcov enables code to write out coverage info even when crashing.
 
 gcov_compile_flags="-fprofile-arcs -ftest-coverage"
-gcov_compile_flags="$gcov_compile_flags -DDISABLE_TAO_ASM"
 gcov_compile_flags="$gcov_compile_flags -DMYSQL_SERVER_SUFFIX=-gcov -DHAVE_gcov"
 
 # GCC4 needs -fprofile-arcs -ftest-coverage on the linker command line (as well

CMakeLists.txt

@@ -562,7 +562,7 @@ IF(BUILD_BUNDLED_ZLIB)
     ${CMAKE_CURRENT_BINARY_DIR}/zlib
     )
 ENDIF()
-# Add bundled yassl/taocrypt or system openssl.
+# Add openssl.
 MYSQL_CHECK_SSL()
 # Add system/bundled editline.
 MYSQL_CHECK_EDITLINE()

client/base/mysql_connection_options.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2014, 2019, 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
@@ -163,15 +163,13 @@ MYSQL* Mysql_connection_options::create_connection()
   mysql_options4(connection, MYSQL_OPT_CONNECT_ATTR_ADD,
                   "program_name", this->m_program->get_name().c_str());
 
-#if !defined(HAVE_YASSL)
   if (this->m_server_public_key.has_value())
   {
     opt_server_public_key=
       const_cast <char *> (this->m_server_public_key.value().c_str());
   }
 
   opt_get_server_public_key= this->m_get_server_public_key ? TRUE : FALSE;
-#endif /* !HAVE_YASSL */
 
   set_server_public_key(connection);
   set_get_server_public_key_option(connection);

client/mysql_install_db.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2012, 2019, 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
@@ -61,9 +61,6 @@ using namespace std;
 
 #define PROGRAM_NAME "mysql_install_db"
 #define MYSQLD_EXECUTABLE "mysqld"
-#if defined(HAVE_YASSL)
-#define MYSQL_CERT_SETUP_EXECUTABLE "mysql_ssl_rsa_setup"
-#endif /* HAVE_YASSL */
 #define MAX_MYSQLD_ARGUMENTS 10
 #define MAX_USER_NAME_LEN 32
 
@@ -81,10 +78,6 @@ char *opt_adminhost= 0;
 char default_authplugin[]= "mysql_native_password";
 char *opt_authplugin= 0;
 char *opt_mysqldfile= 0;
-#if defined (HAVE_YASSL)
-char *opt_mysql_cert_setup_file= 0;
-char default_mysql_cert_setup_file[]= MYSQL_CERT_SETUP_EXECUTABLE;
-#endif
 char *opt_randpwdfile= 0;
 char default_randpwfile[]= ".mysql_secret";
 char *opt_langpath= 0;
@@ -148,10 +141,6 @@ static struct my_option my_connection_options[]=
    &opt_ssl, 0, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"mysqld-file", 0, "Qualified path to the mysqld binary.", &opt_mysqldfile,
    0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#if defined(HAVE_YASSL)
-  {"ssl-setup-file", 0, "Qualified path to the mysql_ssl_setup binary", &opt_mysql_cert_setup_file,
-   0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   {"random-password-file", 0, "Specifies the qualified path to the "
      ".mysql_secret temporary password file.", &opt_randpwdfile,
    0, 0, GET_STR_ALLOC, REQUIRED_ARG, 0,
@@ -624,70 +613,6 @@ bool assert_mysqld_exists(const string &opt_mysqldfile,
   return true;
 }
 
-#if defined(HAVE_YASSL)
-/**
- Attempts to locate the mysql_ssl_rsa_setup file.
- If opt_mysql_cert_setup_file is specified then the this assumed to be a
- correct qualified path to the mysql_ssl_rsa_setup executable.
- If opt_basedir is specified then opt_basedir+"/bin" is assumed to be a
- candidate path for the mysql_ssl_rsa_setup executable.
- If opt_srcdir is set then opt_srcdir+"/bin" is assumed to be a
- candidate path for the mysql_ssl_rsa_setup executable.
- If opt_builddir is set then opt_builddir+"/client" is assumed to be a
- candidate path for the mysql_system_tables executable.
-
- If the executable isn't found in any of these locations,
- attempt to search the local directory and "bin" subdirectory.
- Finally check "/usr/bin","/usr/sbin", "/usr/local/bin","/usr/local/sbin",
- "/opt/mysql/bin","/opt/mysql/sbin"
-
-*/
-bool assert_cert_generator_exists(const string &opt_mysql_cert_setup_file,
-                                  const string &opt_basedir,
-                                  const string &opt_builddir,
-                                  const string &opt_srcdir,
-                                  Path *qpath)
-{
-  vector<Path > spaths;
-  if (opt_mysql_cert_setup_file.length() > 0)
-  {
-    /* Use explicit option to file mysql_ssl_rsa_setup */
-    if (!locate_file(opt_mysql_cert_setup_file, 0, qpath))
-    {
-      error << "No such file: " << opt_mysql_cert_setup_file << endl;
-      return false;
-    }
-  }
-  else
-  {
-    if (opt_basedir.length() > 0)
-    {
-      spaths.push_back(Path(opt_basedir).
-        append("bin"));
-    }
-    if (opt_builddir.length() > 0)
-    {
-      spaths.push_back(Path(opt_builddir).
-        append("client"));
-    }
-
-    add_standard_search_paths(&spaths);
-
-    if (!locate_file(MYSQL_CERT_SETUP_EXECUTABLE, &spaths, qpath))
-    {
-      error << "Can't locate the server executable (mysql_ssl_rsa_setup)."
-            << endl;
-      info << "The following paths were searched: ";
-      copy(spaths.begin(), spaths.end(),
-           infix_ostream_iterator<Path >(info, ", "));
-      info << endl;
-      return false;
-    }
-  }
-  return true;
-}
-#endif /* HAVE_YASSL */
-
 
 bool assert_valid_language_directory(const string &opt_langpath,
                                      const string &opt_basedir,
@@ -803,19 +728,6 @@ void create_ssl_policy(string *ssl_type, string *ssl_cipher,
   *x509_subject= "";
 }
 
-#if defined(HAVE_YASSL)
-
-class SSL_generator_writer
-{
-public:
-  bool operator()(int fh MY_ATTRIBUTE((unused)))
-  {
-    return true;
-  }
-};
-
-#endif /* HAVE_YASSL */
-
 #define  READ_BUFFER_SIZE 2048
 #define TIMEOUT_IN_SEC 30
 
@@ -1563,20 +1475,6 @@ int main(int argc,char *argv[])
     return 1;
   }
 
-#if defined(HAVE_YASSL)
-  Path mysql_cert_setup;
-  if( !opt_insecure &&
-      !assert_cert_generator_exists(create_string(opt_mysql_cert_setup_file),
-                                    basedir,
-                                    builddir,
-                                    srcdir,
-                                    &mysql_cert_setup))
-  {
-    /* Subroutine reported error */
-    return 1;
-  }
-#endif /* HAVE_YASSL */
-
   if (opt_def_extra_file)
   {
     Path def_extra_file;
@@ -1706,23 +1604,6 @@ int main(int argc,char *argv[])
   command_line.push_back(string("--basedir=")
     .append(basedir));
 
-#if defined(HAVE_YASSL)
-  vector<string> cert_setup_command_line;
-  if (!opt_insecure)
-  {
-    if (opt_no_defaults == TRUE && opt_defaults_file == NULL &&
-        opt_def_extra_file == NULL)
-      cert_setup_command_line.push_back(string("--no-defaults"));
-    cert_setup_command_line.push_back(string("--datadir=")
-      .append(data_directory.to_str()));
-    cert_setup_command_line.push_back(string("--suffix=")
-      .append(MYSQL_SERVER_VERSION));
-  }
-#endif /* HAVE_YASSL */
-
-  // DEBUG
-  //mysqld_exec.append("\"").insert(0, "gnome-terminal -e \"gdb --args ");
-
   string ssl_type;
   string ssl_cipher;
   string x509_issuer;
@@ -1787,35 +1668,5 @@ int main(int argc,char *argv[])
          << endl;
   }
 
-#if defined(HAVE_YASSL)
-  if (!opt_insecure)
-  {
-    string ssl_output;
-    info << "Generating SSL Certificates" << endl;
-    success= process_execute(mysql_cert_setup.to_str(),
-                             cert_setup_command_line.begin(),
-                             cert_setup_command_line.end(),
-                             Process_reader(&ssl_output),
-                             SSL_generator_writer());
-    if (!success)
-    {
-      warning << "failed to execute " << mysql_cert_setup.to_str() << " ";
-      copy(cert_setup_command_line.begin(), cert_setup_command_line.end(),
-           infix_ostream_iterator<Path>(error, " "));
-      warning << endl;
-      warning << "SSL functionality may not work";
-      warning << endl;
-    }
-    else if ((ssl_output.size() > 0))
-    {
-      info << "SSL certificate generation :"
-           << endl
-           << ssl_output
-           << endl;
-    }
-  }
-
-#endif /* HAVE_YASSL */
-
   return 0;
 }

client/mysqltest.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2019, 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
@@ -6132,12 +6132,10 @@ void do_connect(struct st_command *command)
   if (ds_default_auth.length)
     mysql_options(&con_slot->mysql, MYSQL_DEFAULT_AUTH, ds_default_auth.str);
 
-#if !defined(HAVE_YASSL)
   /* Set server public_key */
   if (opt_server_public_key && *opt_server_public_key)
     mysql_options(&con_slot->mysql, MYSQL_SERVER_PUBLIC_KEY,
                   opt_server_public_key);
-#endif
 
   if (con_cleartext_enable)
     mysql_options(&con_slot->mysql, MYSQL_ENABLE_CLEARTEXT_PLUGIN,
@@ -7147,12 +7145,10 @@ static struct my_option my_long_options[] =
   {"plugin_dir", OPT_PLUGIN_DIR, "Directory for client-side plugins.",
     &opt_plugin_dir, &opt_plugin_dir, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#if !defined(HAVE_YASSL) 
   {"server-public-key-path", OPT_SERVER_PUBLIC_KEY,
    "File path to the server public RSA key in PEM format.",
    &opt_server_public_key, &opt_server_public_key, 0,
    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
-#endif
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 

cmake/build_configurations/feature_set.cmake

@@ -45,7 +45,7 @@ IF(FEATURE_SET AND NOT WITHOUT_SERVER)
 ENDIF()
 
 IF(NOT WITH_SSL)
-  SET(WITH_SSL bundled CACHE STRING "")
+  SET(WITH_SSL system CACHE STRING "")
 ENDIF()
 IF(NOT WITH_ZLIB)
   SET(WITH_ZLIB bundled CACHE STRING "")