diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/crypt_genhash_impl.h | 32 | ||||
| -rw-r--r-- | include/mysql/client_authentication.h | 13 | ||||
| -rw-r--r-- | include/mysql_com.h | 4 | ||||
| -rw-r--r-- | include/password.h | 2 | ||||
| -rw-r--r-- | include/sql_common.h | 1 |
5 files changed, 3 insertions, 49 deletions
diff --git a/include/crypt_genhash_impl.h b/include/crypt_genhash_impl.h deleted file mode 100644 index af5afd23e86..00000000000 --- a/include/crypt_genhash_impl.h +++ /dev/null @@ -1,32 +0,0 @@ -/* defines and prototypes for using crypt_genhash_impl.cc */ - -#ifndef CRYPT_HASHGEN_IMPL_H -#define CRYPT_HASHGEN_IMPL_H -#define ROUNDS_DEFAULT 5000 -#define ROUNDS_MIN 1000 -#define ROUNDS_MAX 999999999 -#define MIXCHARS 32 -#define CRYPT_SALT_LENGTH 20 -#define CRYPT_MAGIC_LENGTH 3 -#define CRYPT_PARAM_LENGTH 13 -#define SHA256_HASH_LENGTH 43 -#define CRYPT_MAX_PASSWORD_SIZE (CRYPT_SALT_LENGTH + \ - SHA256_HASH_LENGTH + \ - CRYPT_MAGIC_LENGTH + \ - CRYPT_PARAM_LENGTH) - -int extract_user_salt(char **salt_begin, - char **salt_end); -C_MODE_START -char * -my_crypt_genhash(char *ctbuffer, - size_t ctbufflen, - const char *plaintext, - int plaintext_len, - const char *switchsalt, - const char **params); -void generate_user_salt(char *buffer, int buffer_len); -void xor_string(char *to, int to_len, char *pattern, int pattern_len); - -C_MODE_END -#endif diff --git a/include/mysql/client_authentication.h b/include/mysql/client_authentication.h deleted file mode 100644 index 2bd2fc98bac..00000000000 --- a/include/mysql/client_authentication.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CLIENT_AUTHENTICATION_H -#define CLIENT_AUTHENTICATION_H -#include "mysql.h" -#include "mysql/client_plugin.h" - -C_MODE_START -int sha256_password_auth_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql); -int sha256_password_init(char *, size_t, int, va_list); -int sha256_password_deinit(void); -C_MODE_END - -#endif - diff --git a/include/mysql_com.h b/include/mysql_com.h index d9f905eb657..be1d222eb07 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -265,11 +265,11 @@ enum enum_server_command CLIENT_REMEMBER_OPTIONS | \ CLIENT_PROGRESS | \ CLIENT_PLUGIN_AUTH | \ + CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | \ CLIENT_CONNECT_ATTRS) /* To be added later: - CLIENT_CONNECT_ATTRS, CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA, CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS */ @@ -641,7 +641,9 @@ void my_thread_end(void); #ifdef MY_GLOBAL_INCLUDED ulong STDCALL net_field_length(uchar **packet); my_ulonglong net_field_length_ll(uchar **packet); +my_ulonglong safe_net_field_length_ll(uchar **packet, size_t packet_len); uchar *net_store_length(uchar *pkg, ulonglong length); +uchar *safe_net_store_length(uchar *pkg, size_t pkg_len, ulonglong length); #endif #ifdef __cplusplus diff --git a/include/password.h b/include/password.h index 5dfea533546..082f917e7c0 100644 --- a/include/password.h +++ b/include/password.h @@ -24,8 +24,6 @@ void my_make_scrambled_password_323(char *to, const char *password, size_t pass_len); void my_make_scrambled_password(char *to, const char *password, size_t pass_len); -void my_make_scrambled_password_sha1(char *to, const char *password, - size_t pass_len); void hash_password(ulong *result, const char *password, uint password_len); diff --git a/include/sql_common.h b/include/sql_common.h index e7bade7e73b..39b8ce18517 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -35,7 +35,6 @@ struct st_mysql_options_extention { char *default_auth; char *ssl_crl; /* PEM CRL file */ char *ssl_crlpath; /* PEM directory of CRL-s? */ - char *server_public_key_path; void (*report_progress)(const MYSQL *mysql, unsigned int stage, unsigned int max_stage, |