[1/2] trafficserver git commit: TS-3452: Better debug messages for SSL_ERROR_SSL

2015-03-17 Thread briang 
Repository: trafficserver
Updated Branches:
  refs/heads/master 68668e767 - 49d0ef822


TS-3452: Better debug messages for SSL_ERROR_SSL


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/6cd3e45c
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/6cd3e45c
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/6cd3e45c

Branch: refs/heads/master
Commit: 6cd3e45c9d8cc579f0bdc4dbd99b10aeb6438e1a
Parents: 68668e7
Author: Brian Geffon bri...@apache.org
Authored: Tue Mar 17 14:47:57 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Tue Mar 17 14:47:57 2015 -0700

--
 iocore/net/SSLUtils.cc | 43 ---
 1 file changed, 36 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/6cd3e45c/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 83ce5e5..eea8e98 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -2044,7 +2044,7 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t 
nbytes, int64_t nwritten)
   if (unlikely(nbytes == 0)) {
 return SSL_ERROR_NONE;
   }
-
+  ERR_clear_error();
   int ret = SSL_write(ssl, buf, (int)nbytes);
   if (ret  0) {
 nwritten = ret;
@@ -2054,8 +2054,14 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t 
nbytes, int64_t nwritten)
 }
 return SSL_ERROR_NONE;
   }
-
-  return SSL_get_error(ssl, ret);
+  int ssl_error = SSL_get_error(ssl, ret);
+  if (ssl_error == SSL_ERROR_SSL) {
+char buf[512];
+unsigned long e = ERR_get_error();
+ERR_error_string_n(e, buf, sizeof(buf));
+Debug(ssl.error.write, SSL write returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+  }
+  return ssl_error;
 }
 
 ssl_error_t
@@ -2066,34 +2072,57 @@ SSLReadBuffer(SSL * ssl, void * buf, int64_t nbytes, 
int64_t nread)
   if (unlikely(nbytes == 0)) {
 return SSL_ERROR_NONE;
   }
-
+  ERR_clear_error();
   int ret = SSL_read(ssl, buf, (int)nbytes);
   if (ret  0) {
 nread = ret;
 return SSL_ERROR_NONE;
   }
+  int ssl_error = SSL_get_error(ssl, ret);
+  if (ssl_error == SSL_ERROR_SSL) {
+char buf[512];
+unsigned long e = ERR_get_error();
+ERR_error_string_n(e, buf, sizeof(buf));
+Debug(ssl.error.read, SSL read returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+  }
 
-  return SSL_get_error(ssl, ret);
+  return ssl_error;
 }
 
 ssl_error_t
 SSLAccept(SSL * ssl)
 {
+  ERR_clear_error();
   int ret = SSL_accept(ssl);
   if (ret  0) {
 return SSL_ERROR_NONE;
   }
+  int ssl_error = SSL_get_error(ssl, ret);
+  if (ssl_error == SSL_ERROR_SSL) {
+char buf[512];
+unsigned long e = ERR_get_error();
+ERR_error_string_n(e, buf, sizeof(buf));
+Debug(ssl.error.accept, SSL accept returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+  }
 
-  return SSL_get_error(ssl, ret);
+  return ssl_error;
 }
 
 ssl_error_t
 SSLConnect(SSL * ssl)
 {
+  ERR_clear_error();
   int ret = SSL_connect(ssl);
   if (ret  0) {
 return SSL_ERROR_NONE;
   }
+  int ssl_error = SSL_get_error(ssl, ret);
+   if (ssl_error == SSL_ERROR_SSL) {
+ char buf[512];
+ unsigned long e = ERR_get_error();
+ ERR_error_string_n(e, buf, sizeof(buf));
+ Debug(ssl.error.connect, SSL connect returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+   }
 
-  return SSL_get_error(ssl, ret);
+   return ssl_error;
 }

[2/2] trafficserver git commit: TS-3452: Better debug messages for SSL_ERROR_SSL: update changes

2015-03-17 Thread briang 
TS-3452: Better debug messages for SSL_ERROR_SSL: update changes


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/49d0ef82
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/49d0ef82
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/49d0ef82

Branch: refs/heads/master
Commit: 49d0ef822c097c83b9714dfc7ef7c7932c1ed935
Parents: 6cd3e45
Author: Brian Geffon bri...@apache.org
Authored: Tue Mar 17 14:48:14 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Tue Mar 17 14:48:14 2015 -0700

--
 CHANGES | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/49d0ef82/CHANGES
--
diff --git a/CHANGES b/CHANGES
index c99ccc5..dbc0f0d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
  -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.3.0
 
+  *) [TS-3452] Better debug messages for SSL_ERROR_SSL errors
+
   *) [TS-3439] Chunked responses don't honor keep-alive.
  
   *) [TS-3437] Make DH params configurable.

trafficserver git commit: TS-3452: Better debug messages for SSL_ERROR_SSL: fixing format string warning

2015-03-17 Thread briang 
Repository: trafficserver
Updated Branches:
  refs/heads/master 49d0ef822 - a008a0a80


TS-3452: Better debug messages for SSL_ERROR_SSL: fixing format string warning


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/a008a0a8
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/a008a0a8
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/a008a0a8

Branch: refs/heads/master
Commit: a008a0a80cd9e32e6f45a404ffeb1619eb477fc7
Parents: 49d0ef8
Author: Brian Geffon bri...@apache.org
Authored: Tue Mar 17 14:54:19 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Tue Mar 17 14:54:19 2015 -0700

--
 iocore/net/SSLUtils.cc | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/a008a0a8/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index eea8e98..93d04f3 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -2059,7 +2059,7 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t 
nbytes, int64_t nwritten)
 char buf[512];
 unsigned long e = ERR_get_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.write, SSL write returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.write, SSL write returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
   }
   return ssl_error;
 }
@@ -2083,7 +2083,7 @@ SSLReadBuffer(SSL * ssl, void * buf, int64_t nbytes, 
int64_t nread)
 char buf[512];
 unsigned long e = ERR_get_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.read, SSL read returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.read, SSL read returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2102,7 +2102,7 @@ SSLAccept(SSL * ssl)
 char buf[512];
 unsigned long e = ERR_get_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.accept, SSL accept returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.accept, SSL accept returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2121,7 +2121,7 @@ SSLConnect(SSL * ssl)
  char buf[512];
  unsigned long e = ERR_get_error();
  ERR_error_string_n(e, buf, sizeof(buf));
- Debug(ssl.error.connect, SSL connect returned %d, ssl_error=%ld, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+ Debug(ssl.error.connect, SSL connect returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
}
 
return ssl_error;

trafficserver git commit: TS-3452: Better debug messages for SSL_ERROR_SSL: incorporate changes suggested by sudheer to peek.

2015-03-17 Thread briang 
Repository: trafficserver
Updated Branches:
  refs/heads/master a008a0a80 - 5fcd9d74f


TS-3452: Better debug messages for SSL_ERROR_SSL: incorporate changes suggested 
by sudheer to peek.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5fcd9d74
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5fcd9d74
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5fcd9d74

Branch: refs/heads/master
Commit: 5fcd9d74f20f8b9b3aa8dd361fa4d037676b00ef
Parents: a008a0a
Author: Brian Geffon bri...@apache.org
Authored: Tue Mar 17 15:02:32 2015 -0700
Committer: Brian Geffon bri...@apache.org
Committed: Tue Mar 17 15:02:32 2015 -0700

--
 iocore/net/SSLUtils.cc | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5fcd9d74/iocore/net/SSLUtils.cc
--
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 93d04f3..0ced75c 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -2057,9 +2057,9 @@ SSLWriteBuffer(SSL * ssl, const void * buf, int64_t 
nbytes, int64_t nwritten)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
 char buf[512];
-unsigned long e = ERR_get_error();
+unsigned long e = ERR_peek_last_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.write, SSL write returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.write, SSL write returned %d, ssl_error=%d, 
ERR_get_error=%ld (%s), ret, ssl_error, e, buf);
   }
   return ssl_error;
 }
@@ -2081,9 +2081,9 @@ SSLReadBuffer(SSL * ssl, void * buf, int64_t nbytes, 
int64_t nread)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
 char buf[512];
-unsigned long e = ERR_get_error();
+unsigned long e = ERR_peek_last_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.read, SSL read returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.read, SSL read returned %d, ssl_error=%d, 
ERR_get_error=%ld (%s), ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2100,9 +2100,9 @@ SSLAccept(SSL * ssl)
   int ssl_error = SSL_get_error(ssl, ret);
   if (ssl_error == SSL_ERROR_SSL) {
 char buf[512];
-unsigned long e = ERR_get_error();
+unsigned long e = ERR_peek_last_error();
 ERR_error_string_n(e, buf, sizeof(buf));
-Debug(ssl.error.accept, SSL accept returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+Debug(ssl.error.accept, SSL accept returned %d, ssl_error=%d, 
ERR_get_error=%ld (%s), ret, ssl_error, e, buf);
   }
 
   return ssl_error;
@@ -2119,9 +2119,9 @@ SSLConnect(SSL * ssl)
   int ssl_error = SSL_get_error(ssl, ret);
if (ssl_error == SSL_ERROR_SSL) {
  char buf[512];
- unsigned long e = ERR_get_error();
+ unsigned long e = ERR_peek_last_error();
  ERR_error_string_n(e, buf, sizeof(buf));
- Debug(ssl.error.connect, SSL connect returned %d, ssl_error=%d, 
ERR_get_error=%d (%s), ret, ssl_error, e, buf);
+ Debug(ssl.error.connect, SSL connect returned %d, ssl_error=%d, 
ERR_get_error=%ld (%s), ret, ssl_error, e, buf);
}
 
return ssl_error;