diff --git a/include/ma_global.h b/include/ma_global.h index 330b578d..0d5c2c2b 100644 --- a/include/ma_global.h +++ b/include/ma_global.h @@ -709,6 +709,7 @@ typedef char *my_string; /* String of characters */ typedef unsigned long size_s; /* Size of strings (In string-funcs) */ typedef int myf; /* Type of MyFlags in my_funcs */ typedef char my_bool; /* Small bool */ +typedef unsigned long long my_ulonglong; #if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) typedef char bool; /* Ordinary boolean values 0 1 */ #endif diff --git a/include/mysql.h b/include/mysql.h index ae8db74f..4f6b98c1 100644 --- a/include/mysql.h +++ b/include/mysql.h @@ -37,6 +37,7 @@ extern "C" { #if !defined (_global_h) && !defined (MY_GLOBAL_INCLUDED) /* If not standard header */ #include typedef char my_bool; +typedef unsigned long long my_ulonglong; #if !defined(_WIN32) #define STDCALL @@ -467,7 +468,7 @@ void my_set_error(MYSQL *mysql, unsigned int error_nr, /* Functions to get information from the MYSQL and MYSQL_RES structures */ /* Should definitely be used if one uses shared libraries */ -unsigned long long STDCALL mysql_num_rows(MYSQL_RES *res); +my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res); unsigned int STDCALL mysql_num_fields(MYSQL_RES *res); my_bool STDCALL mysql_eof(MYSQL_RES *res); MYSQL_FIELD *STDCALL mysql_fetch_field_direct(MYSQL_RES *res, @@ -479,11 +480,11 @@ unsigned int STDCALL mysql_field_tell(MYSQL_RES *res); unsigned int STDCALL mysql_field_count(MYSQL *mysql); my_bool STDCALL mysql_more_results(MYSQL *mysql); int STDCALL mysql_next_result(MYSQL *mysql); -unsigned long long STDCALL mysql_affected_rows(MYSQL *mysql); +my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql); my_bool STDCALL mysql_autocommit(MYSQL *mysql, my_bool mode); my_bool STDCALL mysql_commit(MYSQL *mysql); my_bool STDCALL mysql_rollback(MYSQL *mysql); -unsigned long long STDCALL mysql_insert_id(MYSQL *mysql); +my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql); unsigned int STDCALL mysql_errno(MYSQL *mysql); char * STDCALL mysql_error(MYSQL *mysql); char * STDCALL mysql_info(MYSQL *mysql); diff --git a/libmariadb/mariadb_lib.c b/libmariadb/mariadb_lib.c index 3f4039c0..d69b9efb 100644 --- a/libmariadb/mariadb_lib.c +++ b/libmariadb/mariadb_lib.c @@ -3213,7 +3213,7 @@ mysql_options4(MYSQL *mysql,enum mysql_option option, const void *arg1, const vo ****************************************************************************/ /* MYSQL_RES */ -unsigned long long STDCALL mysql_num_rows(MYSQL_RES *res) +my_ulonglong STDCALL mysql_num_rows(MYSQL_RES *res) { return res->row_count; } @@ -3256,7 +3256,7 @@ unsigned int STDCALL mysql_field_count(MYSQL *mysql) return mysql->field_count; } -unsigned long long STDCALL mysql_affected_rows(MYSQL *mysql) +my_ulonglong STDCALL mysql_affected_rows(MYSQL *mysql) { return (mysql)->affected_rows; } @@ -3277,7 +3277,7 @@ my_bool STDCALL mysql_rollback(MYSQL *mysql) return((my_bool)mysql_real_query(mysql, "ROLLBACK", sizeof("ROLLBACK"))); } -unsigned long long STDCALL mysql_insert_id(MYSQL *mysql) +my_ulonglong STDCALL mysql_insert_id(MYSQL *mysql) { return (mysql)->insert_id; } diff --git a/libmariadb/secure/ma_cipher.h b/libmariadb/secure/ma_cipher.h deleted file mode 100644 index 4f0e009a..00000000 --- a/libmariadb/secure/ma_cipher.h +++ /dev/null @@ -1,186 +0,0 @@ -#ifdef _WIN32 - #define SCHANNEL_CIPHER(a,b,c,d,e) ,a,b,c,d,e -#else - #define SCHANNEL_CIPHER(a,b,c,d,e) -#endif - - -struct st_cipher_suite { - const char *rfc_name; - const char *openssl_name; - const char *gnutls_name; - const char *nss_name; -#ifdef _WIN32 - ALG_ID exch; - ALG_ID encrypt; - ALG_ID hash; - ALG_ID sign; - int strength; -#endif -}; - -const struct st_cipher_suite tls_ciphers[] = -{ - { /* RFC cipher ID 0x000013 */ - "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA", - "DHE-DSS-DES-CBC3-SHA", - "TLS_DHE_DSS_3DES_EDE_CBC_SHA1", - "TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA" - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_3DES, CALG_SHA1, CALG_DSS_SIGN, 0) - }, - { "TLS_DHE_DSS_WITH_AES_128_CBC_SHA", - "DHE-DSS-AES128-SHA", - "TLS_DHE_DSS_AES_128_CBC_SHA1", - "TLS_DHE_DSS_WITH_AES_128_CBC_SHA" - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_AES_128, CALG_SHA1,CALG_DSS_SIGN, 0) - }, - { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA", - "DHE-DSS-AES256-SHA", - "TLS_DHE_DSS_AES_256_CBC_SHA1", - "TLS_DHE_DSS_WITH_AES_256_CBC_SHA" - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_AES_256, CALG_SHA1, CALG_DSS_SIGN, 0) - }, - { "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256", - "DHE-DSS-AES256-SHA256", - "TLS_DHE_DSS_AES_256_CBC_SHA256", - "TLS_DHE_DSS_WITH_AES_256_CBC_SHA256" - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_AES_256, CALG_SHA_256, CALG_DSS_SIGN, 0) - }, - { "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256", - "DHE-RSA-AES128-GCM-SHA256", - "TLS_DHE_RSA_AES_128_GCM_SHA256", - "TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_AES_128, CALG_SHA_128, 0, 0 - )}, - { "TLS_DHE_RSA_WITH_AES_256_GCM_SHA384", - "DHE-RSA-AES256-GCM-SHA384", - "TLS_DHE_RSA_AES_256_GCM_SHA384", - NULL - SCHANNEL_CIPHER(CALG_DH_EPHEM, CALG_AES_256, CALG_SHA384, 0, 0) - }, - { "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA", - "ECDHE-ECDSA-AES128-SHA", - "TLS_ECDHE_ECDSA_AES_128_CBC_SHA1", - "TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA" - SCHANNEL_CIPHER(CALG_ECDSA, CALG_AES128, CALG_SHA1, 0, 0) - }, - { "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", - "ECDHE-ECDSA-AES128-GCM-SHA256", - "TLS_ECDHE_ECDSA_AES_128_GCM_SHA256", - "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256" - SCHANNEL_CIPHER(CALG_ECDSA, CALG_AES128, CALG_SHA256, 0, 0) - }, - { "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA384", - NULL, - NULL, - NULL - SCHANNEL_CIPHER(CALG_ECDSA, CALG_AES128, CALG_SHA384, 0, 0) - }, - { "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA", - "ECDHE-ECDSA-AES256-SHA", - "TLS_ECDHE_ECDSA_AES_256_CBC_SHA1", - "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA" - SCHANNEL_CIPHER(CALG_ECDSA, CALG_AES256, CALG_SHA1, 0, 0) - }, - { "TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA384", - "ECDHE-ECDSA-AES256-SHA384", - "TLS_ECDHE_ECDSA_AES_256_CBC_SHA384", - NULL - SCHANNEL_CIPHER(CALG_ECDSA, CALG_AES256, CALG_SHA384, 0, 0) - }, - { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA", - "ECDHE-RSA-AES128-SHA", - "TLS_ECDHE_RSA_AES_128_CBC_SHA1", - "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA" - SCHANNEL_CIPHER(0xAE06, CALG_AES128, CALG_SHA1, 0, 0) - }, - { "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256", - "ECDHE-RSA-AES128-SHA256", - "TLS_ECDHE_RSA_AES_128_CBC_SHA256", - "TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" - SCHANNEL_CIPHER(0xAE06, CALG_AES128, CALG_SHA256, 0, 0) - }, - { "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA256", - NULL, - NULL, - NULL - SCHANNEL_CIPHER(0xAE06, CALG_AES256, CALG_SHA256, 0, 0) - }, - { "TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384", - "ECDHE-RSA-AES256-SHA384", - "TLS_ECDHE_RSA_AES_256_CBC_SHA384", - NULL - SCHANNEL_CIPHER(0xAE06, CALG_AES256, CALG_SHA384, 0, 0) - }, - { "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA", - NULL, - NULL, - "TLS_RSA_EXPORT_WITH_DES40_CBC_SHA" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_3DES, CALG_SHA1, 0, 0) - }, - { "TLS_RSA_WITH_3DES_EDE_CBC_SHA", - NULL, - "TLS_RSA_3DES_EDE_CBC_SHA1", - "TLS_RSA_WITH_3DES_EDE_CBC_SHA" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_3DES, CALG_SHA1, 0, 0) - }, - { "TLS_RSA_WITH_AES_128_CBC_SHA", - "AES128-SHA", - "TLS_RSA_AES_128_CBC_SHA1", - "TLS_RSA_WITH_AES_128_CBC_SHA" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_128, CALG_SHA1, 0, 0) - }, - { "TLS_RSA_WITH_AES_128_CBC_SHA256", - "AES128-SHA256", - "TLS_RSA_AES_128_CBC_SHA256", - "TLS_RSA_WITH_AES_128_CBC_SHA256" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_128, CALG_SHA256, 0, 0) - }, - { "TLS_RSA_WITH_AES_128_GCM_SHA256", - "AES128-GCM-SHA256", - "TLS_RSA_AES_128_GCM_SHA256", - "TLS_RSA_WITH_AES_128_GCM_SHA256" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_128, CALG_SHA256, 0, 0) - }, - { "TLS_RSA_WITH_AES_256_CBC_SHA", - "AES256-SHA", - "TLS_RSA_AES_256_CBC_SHA1", - "TLS_RSA_WITH_AES_256_CBC_SHA" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_256, CALG_SHA1, 0, 0) - }, - { "TLS_RSA_WITH_AES_256_CBC_SHA256", - "AES256-SHA256", - "TLS_RSA_AES_256_CBC_SHA256", - "TLS_RSA_WITH_AES_256_CBC_SHA256" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_256, CALG_SHA_256,0, 0) - }, - { "TLS_RSA_WITH_AES_256_GCM_SHA384", - "AES256-GCM-SHA384", - "TLS_RSA_AES_256_GCM_SHA384", - NULL - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_AES_256, CALG_SHA384, 0, 0) - }, - { "TLS_RSA_WITH_NULL_SHA256", - "NULL-SHA256", - "TLS_RSA_NULL_SHA256", - "TLS_RSA_WITH_NULL_SHA256" - SCHANNEL_CIPHER(CALG_RSA_KEYX, 0, CALG_SHA_256, 0, 0) - }, - { "TLS_RSA_WITH_RC4_128_MD5", - NULL, - "TLS_RSA_ARCFOUR_128_MD5", - "TLS_RSA_WITH_RC4_128_MD5" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_RC4, CALG_MD5, 0, 0) - }, - { "TLS_RSA_WITH_RC4_128_SHA", - NULL, - "TLS_RSA_ARCFOUR_128_SHA1", - "TLS_RSA_WITH_RC4_128_SHA" - SCHANNEL_CIPHER(CALG_RSA_KEYX, CALG_RC4, CALG_SHA1,0, 0) - }, - { NULL, - NULL, - NULL, - NULL - SCHANNEL_CIPHER(0, 0, 0, 0, 0)} -};