maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly handle key and cert files. Better logging.

Browse Source
This commit is contained in:
Michael Jumper 2013-07-22 15:42:11 -07:00
parent def887868a
commit 7b7227aefb
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/guacd/daemon.c
View File

@ -505,20 +505,24 @@ int main(int argc, char* argv[]) {
#ifdef ENABLE_SSL #ifdef ENABLE_SSL
/* Init SSL if enabled */ /* Init SSL if enabled */
if (key_file != NULL) { if (key_file != NULL || cert_file != NULL) {
/* Init SSL */ /* Init SSL */
guacd_log_info("Communication will be encrypted with SSL/TLS."); guacd_log_info("Communication will require SSL/TLS.");
SSL_library_init(); SSL_library_init();
SSL_load_error_strings(); SSL_load_error_strings();
ssl_context = SSL_CTX_new(SSLv23_server_method()); ssl_context = SSL_CTX_new(SSLv23_server_method());
/* Load key */ /* Load key */
if (key_file != NULL) {
guacd_log_info("Using PEM keyfile %s", key_file); guacd_log_info("Using PEM keyfile %s", key_file);
if (!SSL_CTX_use_PrivateKey_file(ssl_context, key_file, SSL_FILETYPE_PEM)) { if (!SSL_CTX_use_PrivateKey_file(ssl_context, key_file, SSL_FILETYPE_PEM)) {
guacd_log_error("Unable to load keyfile."); guacd_log_error("Unable to load keyfile.");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
}
else
guacd_log_info("No PEM keyfile given - SSL/TLS may not work.");
/* Load cert file if specified */ /* Load cert file if specified */
if (cert_file != NULL) { if (cert_file != NULL) {
@ -528,6 +532,8 @@ int main(int argc, char* argv[]) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
} }
else
guacd_log_info("No certificate file given - SSL/TLS may not work.");
} }
#endif #endif
@ -627,7 +633,7 @@ int main(int argc, char* argv[]) {
if (ssl_context != NULL) { if (ssl_context != NULL) {
socket = guac_socket_open_secure(ssl_context, connected_socket_fd); socket = guac_socket_open_secure(ssl_context, connected_socket_fd);
if (socket == NULL) { if (socket == NULL) {
guacd_log_error("Error opening secure connection"); guacd_log_guac_error("Error opening secure connection");
return 0; return 0;
} }
} }