|
Line
Link Here
|
| 0 |
-- mysql/sql/mysqld.cc.orig 2019-10-23 22:45:56.809305796 +0900 |
0 |
++ mysql/sql/mysqld.cc 2019-10-23 22:47:12.861546697 +0900 |
|
Lines 4834-4844
Link Here
|
| 4834 |
static int init_ssl_communication() { |
4834 |
static int init_ssl_communication() { |
| 4835 |
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
4835 |
char ssl_err_string[OPENSSL_ERROR_LENGTH] = {'\0'}; |
|
|
4836 |
#ifndef LIBRESSL_VERSION_NUMBER |
| 4836 |
int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); |
4837 |
int ret_fips_mode = set_fips_mode(opt_ssl_fips_mode, ssl_err_string); |
| 4837 |
if (ret_fips_mode != 1) { |
4838 |
if (ret_fips_mode != 1) { |
| 4838 |
LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); |
4839 |
LogErr(ERROR_LEVEL, ER_SSL_FIPS_MODE_ERROR, ssl_err_string); |
| 4839 |
return 1; |
4840 |
return 1; |
| 4840 |
} |
4841 |
} |
|
|
4842 |
#endif |
| 4841 |
if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; |
4843 |
if (SslAcceptorContext::singleton_init(opt_use_ssl)) return 1; |
| 4842 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
4844 |
#if OPENSSL_VERSION_NUMBER < 0x10100000L |
| 4843 |
-- mysql/vio/viosslfactories.cc.orig 2019-10-23 22:11:21.892836666 +0900 |
4845 |
++ mysql/vio/viosslfactories.cc 2019-10-23 22:10:20.606623898 +0900 |
|
Lines 467-473
Link Here
|
| 467 |
EXIT: |
467 |
EXIT: |
| 468 |
return rc; |
468 |
return rc; |
| 469 |
} |
469 |
} |
| 470 |
#endif |
|
|
| 471 |
/** |
470 |
/** |
| 472 |
Get fips mode from openssl library, |
471 |
Get fips mode from openssl library, |
|
Lines 475-480
Link Here
|
| 475 |
@returns openssl current fips mode |
474 |
@returns openssl current fips mode |
| 476 |
*/ |
475 |
*/ |
| 477 |
uint get_fips_mode() { return FIPS_mode(); } |
476 |
uint get_fips_mode() { return FIPS_mode(); } |
|
|
477 |
#endif |
| 478 |
long process_tls_version(const char *tls_version) { |
478 |
long process_tls_version(const char *tls_version) { |
| 479 |
const char *separator = ","; |
479 |
const char *separator = ","; |
