diff options
| author | andrey <andrey@php.net> | 2012-09-25 18:26:02 +0200 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-09-25 18:26:02 +0200 |
| commit | 263b37bee1ea92e30791b15af710b509da4b8ca8 (patch) | |
| tree | cc31b3ed520c7935233de1dc417999f5a7bd977c /ext/mysqlnd/mysqlnd_auth.c | |
| parent | 6074df91c6ab80a1fae7c7e8ff5be1c1db342af0 (diff) | |
| download | php-git-263b37bee1ea92e30791b15af710b509da4b8ca8.tar.gz | |
change public key setting to PERDIR and finish code that allows
to set the key file programatically per mysqli_options()
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index d4373cf648..ce03be4447 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -488,7 +488,9 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, MYSQLND_G(sha256_server_public_key); php_stream * stream; DBG_ENTER("mysqlnd_sha256_get_rsa_key"); - + DBG_INF_FMT("options_s256_pk=[%s] MYSQLND_G(sha256_server_public_key)=[%s]", + net_options->sha256_server_public_key? net_options->sha256_server_public_key:"n/a", + MYSQLND_G(sha256_server_public_key)? MYSQLND_G(sha256_server_public_key):"n/a"); if (!fname || fname[0] == '\0') { MYSQLND_PACKET_SHA256_PK_REQUEST * pk_req_packet = NULL; MYSQLND_PACKET_SHA256_PK_REQUEST_RESPONSE * pk_resp_packet = NULL; @@ -539,6 +541,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, DBG_RETURN(NULL); } else { char * key_str = NULL; + DBG_INF_FMT("Key in a file. [%s]", fname); stream = php_stream_open_wrapper((char *) fname, "rb", REPORT_ERRORS, NULL); if (stream) { @@ -546,6 +549,7 @@ mysqlnd_sha256_get_rsa_key(MYSQLND_CONN_DATA * conn, BIO * bio = BIO_new_mem_buf(key_str, len); ret = PEM_read_bio_RSA_PUBKEY(bio, NULL, NULL, NULL); BIO_free(bio); + DBG_INF("Successfully loaded"); } if (key_str) { DBG_INF_FMT("Public key:%*.s", len, key_str); |