diff options
| author | unknown <msvensson@neptunus.(none)> | 2007-02-06 17:34:06 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2007-02-06 17:34:06 +0100 |
| commit | 216be3cdc08cdb6d9422adb00aeb93b01a2ba956 (patch) | |
| tree | 6a6ee42de2795dc3fd6a48246fbf2fa4df2bbb8c /vio/viosslfactories.c | |
| parent | aff6c2e72318b959899b5257cdc08b8f0d4f71bb (diff) | |
| parent | 5ccb23ae89d6892dba40402d6e0f97cd9ca74f92 (diff) | |
| download | mariadb-git-216be3cdc08cdb6d9422adb00aeb93b01a2ba956.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/yassL-import/my50-yassL-import
into neptunus.(none):/home/msvensson/mysql/yassL-import/my51-yassL-import
vio/viosslfactories.c:
Auto merged
Diffstat (limited to 'vio/viosslfactories.c')
| -rw-r--r-- | vio/viosslfactories.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/vio/viosslfactories.c b/vio/viosslfactories.c index 147e80aa2f4..9b407d08b3b 100644 --- a/vio/viosslfactories.c +++ b/vio/viosslfactories.c @@ -84,10 +84,10 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) { if (SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0) { - DBUG_PRINT("error",("unable to get certificate from '%s'\n", cert_file)); - fprintf(stderr,"SSL error: "); - ERR_print_errors_fp(stderr); - fprintf(stderr,"Unable to get certificate from '%s'\n", cert_file); + DBUG_PRINT("error",("unable to get certificate from '%s'", cert_file)); + DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE);); + fprintf(stderr, "SSL error: Unable to get certificate from '%s'\n", + cert_file); fflush(stderr); DBUG_RETURN(1); } @@ -97,10 +97,10 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) if (SSL_CTX_use_PrivateKey_file(ctx, key_file, SSL_FILETYPE_PEM) <= 0) { - DBUG_PRINT("error", ("unable to get private key from '%s'\n", key_file)); - fprintf(stderr,"SSL error: "); - ERR_print_errors_fp(stderr); - fprintf(stderr,"Unable to get private key from '%s'\n", key_file); + DBUG_PRINT("error", ("unable to get private key from '%s'", key_file)); + DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE);); + fprintf(stderr, "SSL error: Unable to get private key from '%s'\n", + key_file); fflush(stderr); DBUG_RETURN(1); } @@ -112,7 +112,12 @@ vio_set_cert_stuff(SSL_CTX *ctx, const char *cert_file, const char *key_file) if (!SSL_CTX_check_private_key(ctx)) { DBUG_PRINT("error", - ("Private key does not match the certificate public key\n")); + ("Private key does not match the certificate public key")); + DBUG_EXECUTE("error", ERR_print_errors_fp(DBUG_FILE);); + fprintf(stderr, + "SSL error: " + "Private key does not match the certificate public key\n"); + fflush(stderr); DBUG_RETURN(1); } } |