merge from SslServerCertValidator r12332

diff --cc src/AclRegs.cc
Simple merge

diff --cc src/acl/Certificate.cc
Simple merge

diff --cc src/acl/Certificate.h
Simple merge

diff --cc src/acl/CertificateData.cc
index 4651e2480a8267e2d8fac70ec47382067a02ad87,9c069ecc6d78dc0cbfbe038ec522817e856567de..bf0995f62c6dec6dcfcc7af5b5ea6e745003246e
--- 1/src/acl/CertificateData.cc
--- 2/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@@ -38,22 -36,10 +36,21 @@@
  #include "acl/CertificateData.h"
  #include "acl/Checklist.h"
  #include "cache_cf.h"
- #include "protos.h"
  #include "wordlist.h"
  
 -ACLCertificateData::ACLCertificateData(SSLGETATTRIBUTE *sslStrategy) : attribute (NULL), values (), sslAttributeCall (sslStrategy)
 -{}
 +ACLCertificateData::ACLCertificateData(Ssl::GETX509ATTRIBUTE *sslStrategy, const char *attrs, bool optionalAttr) : validAttributesStr(attrs), attributeIsOptional(optionalAttr), attribute (NULL), values (), sslAttributeCall (sslStrategy)
 +{
 +    if (attrs) {
 +        size_t current;
 +        size_t next = -1;
 +        std::string valid(attrs);
 +        do {
 +            current = next + 1;
 +            next = valid.find_first_of( "|", current);
 +            validAttributes.push_back(valid.substr( current, next - current ));
 +        } while (next != std::string::npos);
 +    }
 +}
  
  ACLCertificateData::ACLCertificateData(ACLCertificateData const &old) : attribute (NULL), values (old.values), sslAttributeCall (old.sslAttributeCall)
  {

diff --cc src/acl/CertificateData.h
Simple merge

diff --cc src/acl/FilledChecklist.h
Simple merge

diff --cc src/acl/Makefile.am
Simple merge

diff --cc src/acl/StringData.cc
Simple merge

diff --cc src/acl/StringData.h
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/ssl/support.cc
Simple merge

diff --cc src/ssl/support.h
Simple merge