You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2014/07/02 03:13:39 UTC
[1/2] git commit: Change ticket verification/mint-ing to Debug
instead of Note
Repository: trafficserver
Updated Branches:
refs/heads/master 46d7cc7b9 -> b3f11f242
Change ticket verification/mint-ing to Debug instead of Note
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/fe7060ef
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/fe7060ef
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/fe7060ef
Branch: refs/heads/master
Commit: fe7060ef5f931a6836027f34860d4b9e0b56e81a
Parents: 3ccf42e
Author: Thomas Jackson <ja...@gmail.com>
Authored: Tue Jul 1 18:06:24 2014 -0700
Committer: Thomas Jackson <ja...@gmail.com>
Committed: Tue Jul 1 18:06:24 2014 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/fe7060ef/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index 3d98a5c..abdda20 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -799,7 +799,7 @@ SSLDiagnostic(const SrcLoc& loc, bool debug, SSLNetVConnection * vc, const char
if (unlikely(diags->on())) {
diags->log("ssl", DL_Debug, loc.file, loc.func, loc.line,
"SSL::%lu:%s:%s:%d%s%s%s%s", es, ERR_error_string(l, buf), file, line,
- (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : "",
+ (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : "",
ip_buf_flag? ": peer address is " : "", ip_buf);
}
} else {
@@ -1447,7 +1447,7 @@ ssl_callback_session_ticket(
RAND_pseudo_bytes(iv, EVP_MAX_IV_LENGTH);
EVP_EncryptInit_ex(cipher_ctx, EVP_aes_128_cbc(), NULL, ssl_ticket_key->aes_key, iv);
HMAC_Init_ex(hctx, ssl_ticket_key->hmac_secret, 16, evp_md_func, NULL);
- Note("create ticket for a new session");
+ Debug("ssl", "create ticket for a new session");
return 0;
} else if (enc == 0) {
@@ -1459,7 +1459,7 @@ ssl_callback_session_ticket(
EVP_DecryptInit_ex(cipher_ctx, EVP_aes_128_cbc(), NULL, ssl_ticket_key->aes_key, iv);
HMAC_Init_ex(hctx, ssl_ticket_key->hmac_secret, 16, evp_md_func, NULL);
- Note("verify the ticket for an existing session." );
+ Debug("ssl", "verify the ticket for an existing session.");
return 1;
}
[2/2] git commit: Merge branch 'master' of
https://github.com/jacksontj/trafficserver
Posted by br...@apache.org.
Merge branch 'master' of https://github.com/jacksontj/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b3f11f24
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b3f11f24
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b3f11f24
Branch: refs/heads/master
Commit: b3f11f2421a1571224fde7b52c6975c5a0fdba73
Parents: 46d7cc7 fe7060e
Author: Brian Geffon <br...@apache.org>
Authored: Tue Jul 1 18:13:11 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Tue Jul 1 18:13:11 2014 -0700
----------------------------------------------------------------------
iocore/net/SSLUtils.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------