Browse code

Improve PolarSSL key_state_read_{cipher, plain}text messages

Instead of logging the fact that an error occured, log the error code and
description (when available in the PolarSSL build).

Signed-off-by: Joachim Schipper <joachim.schipper@fox-it.com>
Acked-by: Adriaan de Jong <dejong@fox-it.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1363942465-3251-3-git-send-email-steffan.karger@fox-it.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7440
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 0219f115f3a2711d5c51457d6e97d6930916653b)

Steffan Karger authored on 2013/03/22 17:54:21
Showing 1 changed files
... ...
@@ -643,6 +643,7 @@ key_state_read_ciphertext (struct key_state_ssl *ks, struct buffer *buf,
643 643
 {
644 644
   int retval = 0;
645 645
   int len = 0;
646
+  char error_message[1024];
646 647
 
647 648
   perf_push (PERF_BIO_READ_CIPHERTEXT);
648 649
 
... ...
@@ -668,7 +669,8 @@ key_state_read_ciphertext (struct key_state_ssl *ks, struct buffer *buf,
668 668
       perf_pop ();
669 669
       if (POLARSSL_ERR_NET_WANT_WRITE == retval || POLARSSL_ERR_NET_WANT_READ == retval)
670 670
 	return 0;
671
-      msg (D_TLS_ERRORS, "TLS_ERROR: read tls_read_plaintext error");
671
+      error_strerror(retval, error_message, sizeof(error_message));
672
+      msg (D_TLS_ERRORS, "TLS_ERROR: read tls_read_ciphertext error: %d %s", retval, error_message);
672 673
       buf->len = 0;
673 674
       return -1;
674 675
     }
... ...
@@ -740,6 +742,7 @@ key_state_read_plaintext (struct key_state_ssl *ks, struct buffer *buf,
740 740
 {
741 741
   int retval = 0;
742 742
   int len = 0;
743
+  char error_message[1024];
743 744
 
744 745
   perf_push (PERF_BIO_READ_PLAINTEXT);
745 746
 
... ...
@@ -764,7 +767,8 @@ key_state_read_plaintext (struct key_state_ssl *ks, struct buffer *buf,
764 764
     {
765 765
       if (POLARSSL_ERR_NET_WANT_WRITE == retval || POLARSSL_ERR_NET_WANT_READ == retval)
766 766
 	return 0;
767
-      msg (D_TLS_ERRORS, "TLS_ERROR: read tls_read_plaintext error");
767
+      error_strerror(retval, error_message, sizeof(error_message));
768
+      msg (D_TLS_ERRORS, "TLS_ERROR: read tls_read_plaintext error: %d %s", retval, error_message);
768 769
       buf->len = 0;
769 770
       perf_pop ();
770 771
       return -1;