Changeset 5079a1f4e83875fdd95077bb5fae8079eb8b4bd9

Timestamp:

06/30/11 18:33:12 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1309458792 -0400

git-parent:

[4aa2e303bdcdd333ed242664a426033f21f36f3b], [656d110dfdc2753bab8fafb81152ec58a377583a]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1309458792 -0400

Message:

Merge branch 'master' into d_metrics

Files:

• src/eventer/eventer_SSL_fd_opset.c (modified) (4 diffs)

src/eventer/eventer_SSL_fd_opset.c

@@ -51 +51 @@
-  SSL_CTX *internal_ssl_ctx;
-  time_t creation_time;
+  unsigned crl_loaded:1;
-  noit_atomic32_t refcnt;
-} ssl_ctx_cache_node;
@@ -73 +74 @@
-
-#define ssl_ctx ssl_ctx_cn->internal_ssl_ctx
+#define ssl_ctx_crl_loaded ssl_ctx_cn->crl_loaded
-
-/* Static function prototypes */
@@ -402 +404 @@
-  X509_STORE *store;
-  X509_LOOKUP *lookup;
+  if(ctx->ssl_ctx_crl_loaded) return 1;
-  store = SSL_CTX_get_cert_store(ctx->ssl_ctx);
-  lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
@@ -407 +410 @@
-  X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK |
-                              X509_V_FLAG_CRL_CHECK_ALL);
+  if(!ret) eventer_ssl_error();
+  else ctx->ssl_ctx_crl_loaded = 1;
-  return ret;
-}