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/10/10 22:00:20 UTC

[1/2] git commit: TS-3125: SSL ctx is set to a constant allowing for potential inappropriate session reuse

Repository: trafficserver
Updated Branches:
  refs/heads/master 5146b1261 -> 78bdc859b


TS-3125: SSL ctx is set to a constant allowing for potential inappropriate session reuse


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

Branch: refs/heads/master
Commit: 21b7540c25b675ceac23742d8457f80ffe06b83f
Parents: 5146b12
Author: Brian Geffon <br...@apache.org>
Authored: Fri Oct 10 12:58:35 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Oct 10 12:58:35 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/21b7540c/iocore/net/SSLUtils.cc
----------------------------------------------------------------------
diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc
index b2a1c63..400e7c7 100644
--- a/iocore/net/SSLUtils.cc
+++ b/iocore/net/SSLUtils.cc
@@ -1057,10 +1057,13 @@ SSLInitServerContext(
     const SSLConfigParams * params,
     const ssl_user_config & sslMultCertSettings)
 {
-  int         session_id_context;
   int         server_verify_client;
   ats_scoped_str  completeServerCertPath;
   SSL_CTX *   ctx = SSLDefaultServerContext();
+  EVP_MD_CTX digest;
+  STACK_OF(X509_NAME) *ca_list;
+  unsigned char hash_buf[EVP_MAX_MD_SIZE];
+  unsigned int hash_len = 0;
 
   // disable selected protocols
   SSL_CTX_set_options(ctx, params->ssl_ctx_options);
@@ -1224,16 +1227,48 @@ SSLInitServerContext(
       server_verify_client = SSL_VERIFY_NONE;
       Error("illegal client certification level %d in records.config", server_verify_client);
     }
-
-    // XXX I really don't think that this is a good idea. We should be setting this a some finer granularity,
-    // possibly per SSL CTX. httpd uses md5(host:port), which seems reasonable.
-    session_id_context = 1;
-    SSL_CTX_set_session_id_context(ctx, (const unsigned char *) &session_id_context, sizeof(session_id_context));
-
     SSL_CTX_set_verify(ctx, server_verify_client, NULL);
     SSL_CTX_set_verify_depth(ctx, params->verify_depth); // might want to make configurable at some point.
+  }
+
+  ca_list = SSL_load_client_CA_file(params->serverCACertFilename);
+  SSL_CTX_set_client_CA_list(ctx, ca_list);
+  EVP_MD_CTX_init(&digest);
+
+  if (EVP_DigestInit_ex(&digest, evp_md_func, NULL) == 0) {
+   SSLError("EVP_DigestInit_ex failed");
+   goto fail;
+  }
+
+  Debug("ssl", "Using '%s' in hash for session id context", sslMultCertSettings.cert.get());
+
+  if (EVP_DigestUpdate(&digest, sslMultCertSettings.cert, strlen(sslMultCertSettings.cert.get())) == 0) {
+   SSLError("EVP_DigestUpdate failed");
+   goto fail;
+  }
+
+  if (ca_list != NULL) {
+   size_t num_certs = sk_X509_NAME_num(ca_list);
+
+   for (size_t i = 0; i < num_certs; i++) {
+     X509_NAME *name = sk_X509_NAME_value(ca_list, i);
+     if (X509_NAME_digest(name, evp_md_func, hash_buf /* borrow our final hash buffer. */, &hash_len) == 0 ||
+         EVP_DigestUpdate(&digest, hash_buf, hash_len) == 0) {
+       SSLError("Adding X509 name to digest failed");
+       goto fail;
+     }
+   }
+  }
+
+  if (EVP_DigestFinal_ex(&digest, hash_buf, &hash_len) == 0) {
+   SSLError("EVP_DigestFinal_ex failed");
+   goto fail;
+  }
 
-    SSL_CTX_set_client_CA_list(ctx, SSL_load_client_CA_file(params->serverCACertFilename));
+  EVP_MD_CTX_cleanup(&digest);
+  if (SSL_CTX_set_session_id_context(ctx, hash_buf, hash_len) == 0) {
+   SSLError("SSL_CTX_set_session_id_context failed");
+   goto fail;
   }
 
   if (params->cipherSuite != NULL) {


[2/2] git commit: TS-3125: Update changes

Posted by br...@apache.org.
TS-3125: Update changes


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

Branch: refs/heads/master
Commit: 78bdc859b46335994954199293e6797f1d00e168
Parents: 21b7540
Author: Brian Geffon <br...@apache.org>
Authored: Fri Oct 10 12:58:58 2014 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Fri Oct 10 12:58:58 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/78bdc859/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index b80bb25..29681f0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 5.2.0
 
+  *) [TS-3125] SSL ctx is set to a constant allowing for potential inappropriate session reuse
+  
   *) [TS-3060] Enhance POST timeout scenario to send HTTP status response
 
   *) [TS-3120] Overlapping remap rank when using .include directives.