Changeset 5079a1f4e83875fdd95077bb5fae8079eb8b4bd9

Show
Ignore:
Timestamp:
06/30/11 18:33:12 (3 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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/eventer/eventer_SSL_fd_opset.c

    ra335d72 r656d110  
    5151  SSL_CTX *internal_ssl_ctx; 
    5252  time_t creation_time; 
     53  unsigned crl_loaded:1; 
    5354  noit_atomic32_t refcnt; 
    5455} ssl_ctx_cache_node; 
     
    7374 
    7475#define ssl_ctx ssl_ctx_cn->internal_ssl_ctx 
     76#define ssl_ctx_crl_loaded ssl_ctx_cn->crl_loaded 
    7577 
    7678/* Static function prototypes */ 
     
    402404  X509_STORE *store; 
    403405  X509_LOOKUP *lookup; 
     406  if(ctx->ssl_ctx_crl_loaded) return 1; 
    404407  store = SSL_CTX_get_cert_store(ctx->ssl_ctx); 
    405408  lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file()); 
     
    407410  X509_STORE_set_flags(store, X509_V_FLAG_CRL_CHECK | 
    408411                              X509_V_FLAG_CRL_CHECK_ALL); 
     412  if(!ret) eventer_ssl_error(); 
     413  else ctx->ssl_ctx_crl_loaded = 1; 
    409414  return ret; 
    410415}