Print openssl errors when debugging enabled.

eclipse · May 16, 2016 · c6ef86b · c6ef86b
1 parent 99ea5ca
commit c6ef86b
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/lib/net_mosq.c b/lib/net_mosq.c
@@ -305,6 +305,19 @@ int net__try_connect(struct mosquitto *mosq, const char *host, uint16_t port, mo
 
 
 #ifdef WITH_TLS
+void net__print_ssl_error(struct mosquitto *mosq)
+{
+ char ebuf[256];
+ unsigned long e;
+
+ e = ERR_get_error();
+ while(e){
+ log__printf(mosq, MOSQ_LOG_ERR, "OpenSSL Error: %s", ERR_error_string(e, ebuf));
+ e = ERR_get_error();
+ }
+}
+
+
 int net__socket_connect_tls(struct mosquitto *mosq)
 {
  int ret;
@@ -321,6 +334,7 @@ int net__socket_connect_tls(struct mosquitto *mosq)
  }else{
  COMPAT_CLOSE(mosq->sock);
  mosq->sock = INVALID_SOCKET;
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  }else{
@@ -377,6 +391,7 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  if(!mosq->ssl_ctx){
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to create TLS context.");
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
 
@@ -394,6 +409,7 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  if(ret == 0){
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to set TLS ciphers. Check cipher list \"%s\".", mosq->tls_ciphers);
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  }
@@ -418,6 +434,7 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  }
 #endif
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  if(mosq->tls_cert_reqs == 0){
@@ -440,6 +457,7 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to load client certificate \"%s\".", mosq->tls_certfile);
 #endif
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  }
@@ -452,12 +470,14 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Unable to load client key file \"%s\".", mosq->tls_keyfile);
 #endif
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  ret = SSL_CTX_check_private_key(mosq->ssl_ctx);
  if(ret != 1){
  log__printf(mosq, MOSQ_LOG_ERR, "Error: Client certificate/key are inconsistent.");
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  }
@@ -470,12 +490,14 @@ int net__socket_connect(struct mosquitto *mosq, const char *host, uint16_t port,
  mosq->ssl = SSL_new(mosq->ssl_ctx);
  if(!mosq->ssl){
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  SSL_set_ex_data(mosq->ssl, tls_ex_index_mosq, mosq);
  bio = BIO_new_socket(sock, BIO_NOCLOSE);
  if(!bio){
  COMPAT_CLOSE(sock);
+ net__print_ssl_error(mosq);
  return MOSQ_ERR_TLS;
  }
  SSL_set_bio(mosq->ssl, bio, bio);
@@ -499,8 +521,6 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
 #ifdef WITH_TLS
  int ret;
  int err;
- char ebuf[256];
- unsigned long e;
 #endif
  assert(mosq);
  errno = 0;
@@ -517,11 +537,7 @@ ssize_t net__read(struct mosquitto *mosq, void *buf, size_t count)
  mosq->want_write = true;
  errno = EAGAIN;
  }else{
- e = ERR_get_error();
- while(e){
- log__printf(mosq, MOSQ_LOG_ERR, "OpenSSL Error: %s", ERR_error_string(e, ebuf));
- e = ERR_get_error();
- }
+ net__print_ssl_error(mosq);
  errno = EPROTO;
  }
  }
@@ -547,8 +563,6 @@ ssize_t net__write(struct mosquitto *mosq, void *buf, size_t count)
 #ifdef WITH_TLS
  int ret;
  int err;
- char ebuf[256];
- unsigned long e;
 #endif
  assert(mosq);
 
@@ -566,11 +580,7 @@ ssize_t net__write(struct mosquitto *mosq, void *buf, size_t count)
  mosq->want_write = true;
  errno = EAGAIN;
  }else{
- e = ERR_get_error();
- while(e){
- log__printf(mosq, MOSQ_LOG_ERR, "OpenSSL Error: %s", ERR_error_string(e, ebuf));
- e = ERR_get_error();
- }
+ net__print_ssl_error(mosq);
  errno = EPROTO;
  }
  }