database/mariadb-connector-c
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-c.git synced 2025-08-08 14:02:17 +03:00
Code Activity

Added new option MARIADB_OPT_SSL_PASSWORD which allows use of

Browse Source 
decrypted client certificate (private key only).
Currently this option is supported by GnuTLS and OpenSSL only
This commit is contained in:
Georg Richter
2015-11-13 12:41:29 +01:00
parent b936015139
commit 32f1903f97
8 changed files with 142 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libmariadb/secure/openssl.c
View File

@@ -238,6 +238,15 @@ void ma_ssl_end()
return;
}
int ma_ssl_get_password(char *buf, int size, int rwflag, void *userdata)
{
bzero(buf, size);
if (userdata)
strncpy(buf, (char *)userdata, size);
return strlen(buf);
}
static int ma_ssl_set_certs(MYSQL *mysql)
{
char *certfile= mysql->options.ssl_cert,
@@ -270,12 +279,24 @@ static int ma_ssl_set_certs(MYSQL *mysql)
if (SSL_CTX_use_certificate_file(SSL_context, certfile, SSL_FILETYPE_PEM) != 1)
goto error;
/* set key */
/* If the private key file is encrypted, we need to register a callback function
* for providing password. */
if (OPT_HAS_EXT_VAL(mysql, ssl_pw))
{
SSL_CTX_set_default_passwd_cb_userdata(SSL_context, (void *)mysql->options.extension->ssl_pw);
SSL_CTX_set_default_passwd_cb(SSL_context, ma_ssl_get_password);
}
if (keyfile && keyfile[0])
{
if (SSL_CTX_use_PrivateKey_file(SSL_context, keyfile, SSL_FILETYPE_PEM) != 1)
goto error;
}
if (OPT_HAS_EXT_VAL(mysql, ssl_pw))
{
SSL_CTX_set_default_passwd_cb_userdata(SSL_context, NULL);
SSL_CTX_set_default_passwd_cb(SSL_context, NULL);
}
/* verify key */
if (certfile && !SSL_CTX_check_private_key(SSL_context))
goto error;
@@ -329,6 +350,7 @@ static int my_verify_callback(int ok, X509_STORE_CTX *ctx)
return ok;
}
void *ma_ssl_init(MYSQL *mysql)
{
int verify;