1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source 
vio/viossl.c:
  Remove warnings about unused variables
vio/viosslfactories.c:
  Remove warning about wrong cast
This commit is contained in:
unknown 2006-05-04 10:30:08 +02:00
parent 9aa5fa1df1
commit 3651240e36
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
vio/viossl.c
View File

@ -56,8 +56,10 @@ report_errors(SSL* ssl)
unsigned long l; unsigned long l;
const char *file; const char *file;
const char *data; const char *data;
int line,flags; int line, flags;
#ifndef DBUG_OFF
char buf[512]; char buf[512];
#endif
DBUG_ENTER("report_errors"); DBUG_ENTER("report_errors");
@ -67,15 +69,11 @@ report_errors(SSL* ssl)
file,line,(flags&ERR_TXT_STRING)?data:"")) ; file,line,(flags&ERR_TXT_STRING)?data:"")) ;
} }
#ifdef HAVE_YASSL
/*
The above calls to ERR_* doesn't return any messages when we
are using yaSSL since error is stored in the SSL object we used.
*/
if (ssl) if (ssl)
DBUG_PRINT("error", ("yaSSL: %s", ERR_error_string(SSL_get_error(ssl, l), buf))); DBUG_PRINT("error", ("error: %s",
#endif ERR_error_string(SSL_get_error(ssl, l), buf)));
DBUG_PRINT("info", ("errno: %d", socket_errno));
DBUG_PRINT("info", ("socket_errno: %d", socket_errno));
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }
@ -87,12 +85,11 @@ int vio_ssl_read(Vio *vio, gptr buf, int size)
DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d, ssl_: 0x%p", DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d, ssl_: 0x%p",
vio->sd, buf, size, vio->ssl_arg)); vio->sd, buf, size, vio->ssl_arg));
if ((r= SSL_read((SSL*) vio->ssl_arg, buf, size)) < 0) r= SSL_read((SSL*) vio->ssl_arg, buf, size);
{ #ifndef DBUG_OFF
int err= SSL_get_error((SSL*) vio->ssl_arg, r); if (r < 0)
DBUG_PRINT("error",("SSL_read(): %d SSL_get_error(): %d", r, err));
report_errors((SSL*) vio->ssl_arg); report_errors((SSL*) vio->ssl_arg);
} #endif
DBUG_PRINT("exit", ("%d", r)); DBUG_PRINT("exit", ("%d", r));
DBUG_RETURN(r); DBUG_RETURN(r);
} }
@ -104,8 +101,11 @@ int vio_ssl_write(Vio *vio, const gptr buf, int size)
DBUG_ENTER("vio_ssl_write"); DBUG_ENTER("vio_ssl_write");
DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size)); DBUG_PRINT("enter", ("sd: %d, buf: 0x%p, size: %d", vio->sd, buf, size));
if ((r= SSL_write((SSL*) vio->ssl_arg, buf, size)) < 0) r= SSL_write((SSL*) vio->ssl_arg, buf, size);
#ifndef DBUG_OFF
if (r < 0)
report_errors((SSL*) vio->ssl_arg); report_errors((SSL*) vio->ssl_arg);
#endif
DBUG_PRINT("exit", ("%d", r)); DBUG_PRINT("exit", ("%d", r));
DBUG_RETURN(r); DBUG_RETURN(r);
} }
@ -142,7 +142,6 @@ int vio_ssl_close(Vio *vio)
int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout) int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
{ {
SSL *ssl; SSL *ssl;
X509 *client_cert;
my_bool unused; my_bool unused;
my_bool net_blocking; my_bool net_blocking;
enum enum_vio_type old_type; enum enum_vio_type old_type;
@ -183,6 +182,7 @@ int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
#ifndef DBUG_OFF #ifndef DBUG_OFF
{ {
char buf[1024]; char buf[1024];
X509 *client_cert;
DBUG_PRINT("info",("cipher_name= '%s'", SSL_get_cipher_name(ssl))); DBUG_PRINT("info",("cipher_name= '%s'", SSL_get_cipher_name(ssl)));
if ((client_cert= SSL_get_peer_certificate (ssl))) if ((client_cert= SSL_get_peer_certificate (ssl)))
@ -217,7 +217,6 @@ int sslaccept(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout) int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
{ {
SSL *ssl; SSL *ssl;
X509 *server_cert;
my_bool unused; my_bool unused;
my_bool net_blocking; my_bool net_blocking;
enum enum_vio_type old_type; enum enum_vio_type old_type;
@ -255,20 +254,23 @@ int sslconnect(struct st_VioSSLFd *ptr, Vio *vio, long timeout)
DBUG_RETURN(1); DBUG_RETURN(1);
} }
#ifndef DBUG_OFF #ifndef DBUG_OFF
DBUG_PRINT("info",("cipher_name: '%s'" , SSL_get_cipher_name(ssl)));
if ((server_cert= SSL_get_peer_certificate (ssl)))
{ {
char buf[256]; X509 *server_cert;
DBUG_PRINT("info",("Server certificate:")); DBUG_PRINT("info",("cipher_name: '%s'" , SSL_get_cipher_name(ssl)));
X509_NAME_oneline(X509_get_subject_name(server_cert), buf, sizeof(buf));
DBUG_PRINT("info",("\t subject: %s", buf)); if ((server_cert= SSL_get_peer_certificate (ssl)))
X509_NAME_oneline (X509_get_issuer_name(server_cert), buf, sizeof(buf)); {
DBUG_PRINT("info",("\t issuer: %s", buf)); char buf[256];
X509_free (server_cert); DBUG_PRINT("info",("Server certificate:"));
X509_NAME_oneline(X509_get_subject_name(server_cert), buf, sizeof(buf));
DBUG_PRINT("info",("\t subject: %s", buf));
X509_NAME_oneline (X509_get_issuer_name(server_cert), buf, sizeof(buf));
DBUG_PRINT("info",("\t issuer: %s", buf));
X509_free (server_cert);
}
else
DBUG_PRINT("info",("Server does not have certificate."));
} }
else
DBUG_PRINT("info",("Server does not have certificate."));
#endif #endif
DBUG_RETURN(0); DBUG_RETURN(0);

2
vio/viosslfactories.c
View File

@ -339,7 +339,7 @@ new_VioSSLAcceptorFd(const char *key_file, const char *cert_file,
Use the ssl_fd pointer Use the ssl_fd pointer
*/ */
SSL_CTX_set_session_id_context(ssl_fd->ssl_context, SSL_CTX_set_session_id_context(ssl_fd->ssl_context,
ssl_fd, (const unsigned char *)ssl_fd,
sizeof(ssl_fd)); sizeof(ssl_fd));
return ssl_fd; return ssl_fd;