diff options
Diffstat (limited to 'cpp')
56 files changed, 1292 insertions, 1051 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 0b1422b3e7b..4f42559437a 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Aug 15 11:14:41 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Aug 18 23:51:46 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1038,6 +1038,8 @@ const IceInternal::Property IceSSLPropsData[] = IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0), IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0), IceInternal::Property("IceSSL.Random", false, 0), + IceInternal::Property("IceSSL.SecureTransport.FindCert", false, 0), + IceInternal::Property("IceSSL.SChannel.FindCert.*", false, 0), IceInternal::Property("IceSSL.Trace.Security", false, 0), IceInternal::Property("IceSSL.TrustOnly", false, 0), IceInternal::Property("IceSSL.TrustOnly.Client", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 8db1b8abf12..57fec2eff3c 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Aug 15 11:14:41 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Aug 18 23:51:46 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 4f8a8d061b4..e0aa2bc216e 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -76,7 +76,7 @@ addCertificateToStore(const string& file, HCERTSTORE store, PCCERT_CONTEXT* cert } if(!CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &outBuffer[0], - outLength, CERT_STORE_ADD_NEW, cert)) + outLength, CERT_STORE_ADD_NEW, cert)) { if(GetLastError() != static_cast<DWORD>(CRYPT_E_EXISTS)) { @@ -157,310 +157,6 @@ algorithmId(const string& name) return 0; } -// -// Parse a string of the form "location.name" into two parts. -// -void -parseStore(const string& prop, const string& store, DWORD& loc, string& sname) -{ - size_t pos = store.find('.'); - if(pos == string::npos) - { - throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: property `" + prop + "' has invalid format"); - } - - const string sloc = toUpper(store.substr(0, pos)); - if(sloc == "CURRENTUSER") - { - loc = CERT_SYSTEM_STORE_CURRENT_USER; - } - else if(sloc == "LOCALMACHINE") - { - loc = CERT_SYSTEM_STORE_LOCAL_MACHINE; - } - else - { - throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unknown store location `" + sloc + "' in " + prop); - } - - sname = store.substr(pos + 1); - if(sname.empty()) - { - throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: invalid store name in " + prop); - } -} - - -bool -parseBytes(const string& arg, vector<BYTE>& buffer) -{ - string v = toUpper(arg); - - // - // Check for any invalid characters. - // - size_t pos = v.find_first_not_of(" :0123456789ABCDEF"); - if(pos != string::npos) - { - return false; - } - - // - // Remove any separator characters. - // - ostringstream s; - for(string::const_iterator i = v.begin(); i != v.end(); ++i) - { - if(*i == ' ' || *i == ':') - { - continue; - } - s << *i; - } - v = s.str(); - - // - // Convert the bytes. - // - for(size_t i = 0, length = v.size(); i + 2 <= length;) - { - buffer.push_back(static_cast<BYTE>(strtol(v.substr(i, 2).c_str(), 0, 16))); - i += 2; - } - return true; -} - -void -addMatchingCertificates(HCERTSTORE source, HCERTSTORE target, DWORD findType, const void* findParam) -{ - PCCERT_CONTEXT next = 0; - do - { - if((next = CertFindCertificateInStore(source, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, - findType, findParam, next))) - { - if(!CertAddCertificateContextToStore(target, next, CERT_STORE_ADD_ALWAYS, 0)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: error adding certificate to store:\n" + lastErrorToString()); - } - } - } - while(next); -} - -vector<PCCERT_CONTEXT> -findCertificates(const string& prop, const string& storeSpec, const string& value, vector<HCERTSTORE>& stores) -{ - DWORD storeLoc = 0; - string storeName; - parseStore(prop, storeSpec, storeLoc, storeName); - - HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, stringToWstring(storeName).c_str()); - if(!store) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: failure while opening store specified by " + prop + ":\n" + lastErrorToString()); - } - - // - // Start with all of the certificates in the collection and filter as necessary. - // - // - If the value is "*", return all certificates. - // - Otherwise, search using key:value pairs. The following keys are supported: - // - // Issuer - // IssuerDN - // Serial - // Subject - // SubjectDN - // SubjectKeyId - // Thumbprint - // - // A value must be enclosed in single or double quotes if it contains whitespace. - // - - HCERTSTORE tmpStore = 0; - try - { - if(value != "*") - { - size_t start = 0; - size_t pos; - while((pos = value.find(':', start)) != string::npos) - { - string field = toUpper(trim(value.substr(start, pos - start))); - if(field != "SUBJECT" && field != "SUBJECTDN" && field != "ISSUER" && field != "ISSUERDN" && - field != "THUMBPRINT" && field != "SUBJECTKEYID" && field != "SERIAL") - { - throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unknown key in `" + value + "'"); - } - - start = pos + 1; - while(start < value.size() && (value[start] == ' ' || value[start] == '\t')) - { - ++start; - } - - if(start == value.size()) - { - throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: missing argument in `" + value + "'"); - } - - string arg; - if(value[start] == '"' || value[start] == '\'') - { - size_t end = start; - ++end; - while(end < value.size()) - { - if(value[end] == value[start] && value[end - 1] != '\\') - { - break; - } - ++end; - } - if(end == value.size() || value[end] != value[start]) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: unmatched quote in `" + value + "'"); - } - ++start; - arg = value.substr(start, end - start); - start = end + 1; - } - else - { - size_t end = value.find_first_of(" \t", start); - if(end == string::npos) - { - arg = value.substr(start); - start = value.size(); - } - else - { - arg = value.substr(start, end - start); - start = end + 1; - } - } - - tmpStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, 0, 0); - if(!tmpStore) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: error adding certificate to store:\n" + lastErrorToString()); - } - - if(field == "SUBJECT" || field == "ISSUER") - { - const wstring argW = stringToWstring(arg); - DWORD findType = field == "SUBJECT" ? CERT_FIND_SUBJECT_STR : CERT_FIND_ISSUER_STR; - addMatchingCertificates(store, tmpStore, findType, argW.c_str()); - } - else if(field == "SUBJECTDN" || field == "ISSUERDN") - { - const wstring argW = stringToWstring(arg); - DWORD length = 0; - if(!CertStrToNameW(X509_ASN_ENCODING, argW.c_str(), CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG, - 0, 0, &length, 0)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: invalid value `" + value + "' for property `" + prop + "'\n" + - lastErrorToString()); - } - - vector<BYTE> buffer(length); - if(!CertStrToNameW(X509_ASN_ENCODING, argW.c_str(), CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG, - 0, &buffer[0], &length, 0)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: invalid value `" + value + "' for property `" + prop + "'\n" + - lastErrorToString()); - } - - CERT_NAME_BLOB name = { length, &buffer[0] }; - DWORD findType = field == "SUBJECTDN" ? CERT_FIND_SUBJECT_NAME : CERT_FIND_ISSUER_NAME; - addMatchingCertificates(store, tmpStore, findType, &name); - } - else if(field == "THUMBPRINT" || field == "SUBJECTKEYID") - { - vector<BYTE> buffer; - if(!parseBytes(arg, buffer)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: invalid value `" + value + "' for property `" + prop + "'"); - } - - CRYPT_HASH_BLOB hash = { static_cast<DWORD>(buffer.size()), &buffer[0] }; - DWORD findType = field == "THUMBPRINT" ? CERT_FIND_HASH : CERT_FIND_KEY_IDENTIFIER; - addMatchingCertificates(store, tmpStore, findType, &hash); - } - else if(field == "SERIAL") - { - vector<BYTE> buffer; - if(!parseBytes(arg, buffer)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: invalid value `" + value + "' for property `" + prop + "'"); - } - - CRYPT_INTEGER_BLOB serial = { static_cast<DWORD>(buffer.size()), &buffer[0] }; - PCCERT_CONTEXT next = 0; - do - { - if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, - CERT_FIND_ANY, 0, next))) - { - if(CertCompareIntegerBlob(&serial, &next->pCertInfo->SerialNumber)) - { - if(!CertAddCertificateContextToStore(tmpStore, next, CERT_STORE_ADD_ALWAYS, 0)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: error adding certificate to store:\n" + lastErrorToString()); - } - } - } - } - while(next); - } - CertCloseStore(store, 0); - store = tmpStore; - } - } - } - catch(...) - { - if(store && store != tmpStore) - { - CertCloseStore(store, 0); - } - - if(tmpStore) - { - CertCloseStore(tmpStore, 0); - tmpStore = 0; - } - throw; - } - - vector<PCCERT_CONTEXT> certs; - if(store) - { - PCCERT_CONTEXT next = 0; - do - { - if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_ANY, 0, - next))) - { - certs.push_back(next); - } - } - while(next); - stores.push_back(store); - } - return certs; -} - } SChannelEngine::SChannelEngine(const CommunicatorPtr& communicator) : @@ -834,7 +530,7 @@ SChannelEngine::initialize() _allCerts.insert(_allCerts.end(), _certs.begin(), _certs.end()); } - const string findPrefix = prefix + "FindCert."; + const string findPrefix = prefix + "SChannel.FindCert."; map<string, string> certProps = properties->getPropertiesForPrefix(findPrefix); if(!certProps.empty()) { diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 37ae0a2dceb..00d4611a017 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1032,6 +1032,19 @@ IceSSL::SecureTransportEngine::initialize() } } } + + if(!cert) + { + const string prop = propPrefix + "SecureTransport.FindCert"; + string val = properties->getProperty(prop); + if(!val.empty()) + { + if(!(cert = findCertificates(keychain, prop, val))) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: no certificates found"); + } + } + } if(cert) { diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 37a4888e11f..f1c4da46c80 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -50,6 +50,48 @@ IceSSL::readFile(const string& file, vector<char>& buffer) } } +namespace +{ +bool +parseBytes(const string& arg, vector<unsigned char>& buffer) +{ + string v = IceUtilInternal::toUpper(arg); + + // + // Check for any invalid characters. + // + size_t pos = v.find_first_not_of(" :0123456789ABCDEF"); + if(pos != string::npos) + { + return false; + } + + // + // Remove any separator characters. + // + ostringstream s; + for(string::const_iterator i = v.begin(); i != v.end(); ++i) + { + if(*i == ' ' || *i == ':') + { + continue; + } + s << *i; + } + v = s.str(); + + // + // Convert the bytes. + // + for(size_t i = 0, length = v.size(); i + 2 <= length;) + { + buffer.push_back(static_cast<unsigned char>(strtol(v.substr(i, 2).c_str(), 0, 16))); + i += 2; + } + return true; +} +} + #ifdef ICE_USE_OPENSSL namespace { @@ -951,6 +993,397 @@ IceSSL::loadCACertificates(const string& file, const string& passphrase, const P } return certificateAuthorities; } + +SecCertificateRef +IceSSL::findCertificates(SecKeychainRef keychain, const string& prop, const string& value) +{ + // + // Search the keychain using key:value pairs. The following keys are supported: + // + // Label + // Serial + // Subject + // SubjectKeyId + // + // A value must be enclosed in single or double quotes if it contains whitespace. + // + CFMutableDictionaryRef query = + CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); + + const void* values[] = { keychain }; + CFArrayRef searchList = CFArrayCreate(kCFAllocatorDefault, values, 1, &kCFTypeArrayCallBacks); + + CFDictionarySetValue(query, kSecMatchLimit, kSecMatchLimitOne); + CFDictionarySetValue(query, kSecMatchSearchList, searchList); + CFDictionarySetValue(query, kSecClass, kSecClassCertificate); + CFDictionarySetValue(query, kSecReturnRef, kCFBooleanTrue); + CFDictionarySetValue(query, kSecMatchCaseInsensitive, kCFBooleanTrue); + + size_t start = 0; + size_t pos; + while((pos = value.find(':', start)) != string::npos) + { + string field = IceUtilInternal::toUpper(IceUtilInternal::trim(value.substr(start, pos - start))); + string arg; + try + { + if(field != "LABEL" && field != "SERIAL" && field != "SUBJECT" && field != "SUBJECTKEYID") + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unknown key in `" + value + "'"); + } + + start = pos + 1; + while(start < value.size() && (value[start] == ' ' || value[start] == '\t')) + { + ++start; + } + + if(start == value.size()) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: missing argument in `" + value + "'"); + } + + if(value[start] == '"' || value[start] == '\'') + { + size_t end = start; + ++end; + while(end < value.size()) + { + if(value[end] == value[start] && value[end - 1] != '\\') + { + break; + } + ++end; + } + if(end == value.size() || value[end] != value[start]) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: unmatched quote in `" + value + "'"); + } + ++start; + arg = value.substr(start, end - start); + start = end + 1; + } + else + { + size_t end = value.find_first_of(" \t", start); + if(end == string::npos) + { + arg = value.substr(start); + start = value.size(); + } + else + { + arg = value.substr(start, end - start); + start = end + 1; + } + } + } + catch(...) + { + CFRelease(searchList); + CFRelease(query); + throw; + } + + if(field == "SUBJECT" || field == "LABEL") + { + CFDictionarySetValue(query, field == "LABEL" ? kSecAttrLabel : kSecMatchSubjectContains, toCFString(arg)); + } + else if(field == "SUBJECTKEYID" || field == "SERIAL") + { + vector<unsigned char> buffer; + if(!parseBytes(arg, buffer)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value `" + value + "' for property `" + prop + "'"); + } + CFDataRef data = CFDataCreate(kCFAllocatorDefault, &buffer[0], buffer.size()); + CFDictionarySetValue(query, field == "SUBJECTKEYID" ? kSecAttrSubjectKeyID : kSecAttrSerialNumber, data); + } + } + + SecKeychainItemRef item = 0; + OSStatus err = SecItemCopyMatching(query, (CFTypeRef*)&item); + CFRelease(searchList); + CFRelease(query); + if(err != noErr && err != errSecItemNotFound) + { + throw PluginInitializationException(__FILE__, __LINE__, + "Error searching for keychain items\n" + errorToString(err)); + } + return (SecCertificateRef)item; +} +#elif defined(ICE_USE_SCHANNEL) + +namespace +{ +// +// Parse a string of the form "location.name" into two parts. +// +void +parseStore(const string& prop, const string& store, DWORD& loc, string& sname) +{ + size_t pos = store.find('.'); + if(pos == string::npos) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: property `" + prop + "' has invalid format"); + } + + const string sloc = IceUtilInternal::toUpper(store.substr(0, pos)); + if(sloc == "CURRENTUSER") + { + loc = CERT_SYSTEM_STORE_CURRENT_USER; + } + else if(sloc == "LOCALMACHINE") + { + loc = CERT_SYSTEM_STORE_LOCAL_MACHINE; + } + else + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: unknown store location `" + sloc + "' in " + prop); + } + + sname = store.substr(pos + 1); + if(sname.empty()) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: invalid store name in " + prop); + } +} + +void +addMatchingCertificates(HCERTSTORE source, HCERTSTORE target, DWORD findType, const void* findParam) +{ + PCCERT_CONTEXT next = 0; + do + { + if((next = CertFindCertificateInStore(source, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, + findType, findParam, next))) + { + if(!CertAddCertificateContextToStore(target, next, CERT_STORE_ADD_ALWAYS, 0)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: error adding certificate to store:\n" + IceUtilInternal::lastErrorToString()); + } + } + } + while(next); +} + +} + +vector<PCCERT_CONTEXT> +IceSSL::findCertificates(const string& prop, const string& storeSpec, const string& value, vector<HCERTSTORE>& stores) +{ + DWORD storeLoc = 0; + string storeName; + parseStore(prop, storeSpec, storeLoc, storeName); + + HCERTSTORE store = CertOpenStore(CERT_STORE_PROV_SYSTEM, 0, 0, storeLoc, stringToWstring(storeName).c_str()); + if(!store) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: failure while opening store specified by " + prop + ":\n" + IceUtilInternal::lastErrorToString()); + } + + // + // Start with all of the certificates in the collection and filter as necessary. + // + // - If the value is "*", return all certificates. + // - Otherwise, search using key:value pairs. The following keys are supported: + // + // Issuer + // IssuerDN + // Serial + // Subject + // SubjectDN + // SubjectKeyId + // Thumbprint + // + // A value must be enclosed in single or double quotes if it contains whitespace. + // + HCERTSTORE tmpStore = 0; + try + { + if(value != "*") + { + size_t start = 0; + size_t pos; + while((pos = value.find(':', start)) != string::npos) + { + string field = IceUtilInternal::toUpper(IceUtilInternal::trim(value.substr(start, pos - start))); + if(field != "SUBJECT" && field != "SUBJECTDN" && field != "ISSUER" && field != "ISSUERDN" && + field != "THUMBPRINT" && field != "SUBJECTKEYID" && field != "SERIAL") + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unknown key in `" + value + "'"); + } + + start = pos + 1; + while(start < value.size() && (value[start] == ' ' || value[start] == '\t')) + { + ++start; + } + + if(start == value.size()) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: missing argument in `" + value + "'"); + } + + string arg; + if(value[start] == '"' || value[start] == '\'') + { + size_t end = start; + ++end; + while(end < value.size()) + { + if(value[end] == value[start] && value[end - 1] != '\\') + { + break; + } + ++end; + } + if(end == value.size() || value[end] != value[start]) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: unmatched quote in `" + value + "'"); + } + ++start; + arg = value.substr(start, end - start); + start = end + 1; + } + else + { + size_t end = value.find_first_of(" \t", start); + if(end == string::npos) + { + arg = value.substr(start); + start = value.size(); + } + else + { + arg = value.substr(start, end - start); + start = end + 1; + } + } + + tmpStore = CertOpenStore(CERT_STORE_PROV_MEMORY, 0, 0, 0, 0); + if(!tmpStore) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: error adding certificate to store:\n" + IceUtilInternal::lastErrorToString()); + } + + if(field == "SUBJECT" || field == "ISSUER") + { + const wstring argW = stringToWstring(arg); + DWORD findType = field == "SUBJECT" ? CERT_FIND_SUBJECT_STR : CERT_FIND_ISSUER_STR; + addMatchingCertificates(store, tmpStore, findType, argW.c_str()); + } + else if(field == "SUBJECTDN" || field == "ISSUERDN") + { + const wstring argW = stringToWstring(arg); + DWORD length = 0; + if(!CertStrToNameW(X509_ASN_ENCODING, argW.c_str(), CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG, + 0, 0, &length, 0)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value `" + value + "' for property `" + prop + "'\n" + + IceUtilInternal::lastErrorToString()); + } + + vector<BYTE> buffer(length); + if(!CertStrToNameW(X509_ASN_ENCODING, argW.c_str(), CERT_OID_NAME_STR | CERT_NAME_STR_REVERSE_FLAG, + 0, &buffer[0], &length, 0)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value `" + value + "' for property `" + prop + "'\n" + + IceUtilInternal::lastErrorToString()); + } + + CERT_NAME_BLOB name = { length, &buffer[0] }; + DWORD findType = field == "SUBJECTDN" ? CERT_FIND_SUBJECT_NAME : CERT_FIND_ISSUER_NAME; + addMatchingCertificates(store, tmpStore, findType, &name); + } + else if(field == "THUMBPRINT" || field == "SUBJECTKEYID") + { + vector<BYTE> buffer; + if(!parseBytes(arg, buffer)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value `" + value + "' for property `" + prop + "'"); + } + + CRYPT_HASH_BLOB hash = { static_cast<DWORD>(buffer.size()), &buffer[0] }; + DWORD findType = field == "THUMBPRINT" ? CERT_FIND_HASH : CERT_FIND_KEY_IDENTIFIER; + addMatchingCertificates(store, tmpStore, findType, &hash); + } + else if(field == "SERIAL") + { + vector<BYTE> buffer; + if(!parseBytes(arg, buffer)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value `" + value + "' for property `" + prop + "'"); + } + + CRYPT_INTEGER_BLOB serial = { static_cast<DWORD>(buffer.size()), &buffer[0] }; + PCCERT_CONTEXT next = 0; + do + { + if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, + CERT_FIND_ANY, 0, next))) + { + if(CertCompareIntegerBlob(&serial, &next->pCertInfo->SerialNumber)) + { + if(!CertAddCertificateContextToStore(tmpStore, next, CERT_STORE_ADD_ALWAYS, 0)) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: error adding certificate to store:\n" + + IceUtilInternal::lastErrorToString()); + } + } + } + } + while(next); + } + CertCloseStore(store, 0); + store = tmpStore; + } + } + } + catch(...) + { + if(store && store != tmpStore) + { + CertCloseStore(store, 0); + } + + if(tmpStore) + { + CertCloseStore(tmpStore, 0); + tmpStore = 0; + } + throw; + } + + vector<PCCERT_CONTEXT> certs; + if(store) + { + PCCERT_CONTEXT next = 0; + do + { + if((next = CertFindCertificateInStore(store, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, CERT_FIND_ANY, 0, + next))) + { + certs.push_back(next); + } + } + while(next); + stores.push_back(store); + } + return certs; +} #endif bool diff --git a/cpp/src/IceSSL/Util.h b/cpp/src/IceSSL/Util.h index 6204dedbb4d..73641441047 100644 --- a/cpp/src/IceSSL/Util.h +++ b/cpp/src/IceSSL/Util.h @@ -114,7 +114,10 @@ void loadCertificate(SecCertificateRef*, CFDataRef*, SecKeyRef*, SecKeychainRef, const std::string& = "", const PasswordPromptPtr& = 0, int = 0); CFArrayRef loadCACertificates(const std::string&, const std::string& = "", const PasswordPromptPtr& = 0, int = 0); - +SecCertificateRef findCertificates(SecKeychainRef, const std::string&, const std::string&); +#elif defined(ICE_USE_SCHANNEL) +std::vector<PCCERT_CONTEXT> +findCertificates(const std::string&, const std::string&, const std::string&, std::vector<HCERTSTORE>&); #endif // diff --git a/cpp/test/IceSSL/certs/3bb63662.0 b/cpp/test/IceSSL/certs/3bb63662.0 index 770241b9d74..fc30d9970b7 100644 --- a/cpp/test/IceSSL/certs/3bb63662.0 +++ b/cpp/test/IceSSL/certs/3bb63662.0 @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/86907d1c.0 b/cpp/test/IceSSL/certs/86907d1c.0 index 770241b9d74..fc30d9970b7 100644 --- a/cpp/test/IceSSL/certs/86907d1c.0 +++ b/cpp/test/IceSSL/certs/86907d1c.0 @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/Find.keychain b/cpp/test/IceSSL/certs/Find.keychain Binary files differnew file mode 100644 index 00000000000..7d4ba5745a2 --- /dev/null +++ b/cpp/test/IceSSL/certs/Find.keychain diff --git a/cpp/test/IceSSL/certs/c_dsa_ca1.pfx b/cpp/test/IceSSL/certs/c_dsa_ca1.pfx Binary files differindex 21b62620c2e..1d4d945886f 100644 --- a/cpp/test/IceSSL/certs/c_dsa_ca1.pfx +++ b/cpp/test/IceSSL/certs/c_dsa_ca1.pfx diff --git a/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_priv.pem b/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_priv.pem index 13ae5e8ac41..d14bed87240 100644 --- a/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_priv.pem @@ -1,9 +1,9 @@ -----BEGIN PRIVATE KEY----- -MIIBSgIBADCCASsGByqGSM44BAEwggEeAoGBAKAeWKhMAYp5sWH5rsmokCackilB -9lCSqGZ8UoBX5YhFZovv/QWqr1MhcnBbLgAFvg1tS6RXuJcl2xnddUhQ7DcgVxpo -3Pn2Mh9H0o4GLLJRDfqGOegyD2kWlFx8wNxEn/9rLg15zGv/wY218S3spaSqFeNV -k46daWFAo/SwNalxAhUAsBYQGKVHx/hqE7DhOwgRkiGwMOkCgYAN6C5PuxXOQ5yj -0UdNeOFDuHVLip2H1nnuMQImSCECMp+eiidSsWcg4K0otPwvNt31i2WBWEGv0WLw -1+ECNbHi8t1uo+oseMvdKk/l4uvWAja7diiFH4PUmOlfV/pfcYI3vkQxtv5DnpOR -KvkSwO3BDcEUe9tTUvp6AOMHByqz/QQWAhQ9Cy4VqKZybc57V7Ous51rRB6wbQ== +MIIBSgIBADCCASsGByqGSM44BAEwggEeAoGBAKakdvo05Q7khViJBa5tNLaS7s1u +lPGOLPwE9E3OQAk7f9JeCZbnCQXGQUqUE5LfTGbsvRkOswQm5c950p209NoUMszN +5W7L+MdvwOmQkZoL7ILqm5C3cFDnFzmBwA6Hw0bxRAqMQlRSiTc2oQ4hYeUxXFuj +JHdwshMYqzxacQBfAhUAnSIQhU6IP6lk0BBxrX1+JTo4I1UCgYAc7RwDLasCX0kK +NbJxNbjQuHPeyzr1mSBhba6ohyvrhfilbuXJtjGDDK0DCxUjk5C+hI2Pzh0wAGQ2 +gOg+V63q/NkQJvxRyNh+lhd/6AQk/yCCXLbzkEem1kmgllFkYouEA/gufQ7QYO76 +tiIQB+DgFUWCL7NdVrZf92RS1AHE5gQWAhQeZjFajbCKpLRAakeTfTMrm5s9Jw== -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_pub.pem b/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_pub.pem index 04302f8e292..f1fb8135666 100644 --- a/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/c_dsa_nopass_ca1_pub.pem @@ -5,90 +5,90 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:38 2014 GMT + Not After : Aug 16 14:40:38 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client Subject Public Key Info: Public Key Algorithm: dsaEncryption pub: - 3c:0a:93:23:46:4f:28:62:e2:88:0f:9c:c7:7a:1d: - bd:7a:3e:3f:6f:f7:ff:7b:21:0a:ea:bd:c1:bd:d7: - e4:86:6e:53:f8:4f:84:90:63:ad:71:f7:8a:0c:a8: - c5:e8:0b:ed:25:68:8e:f6:3b:3b:35:c2:0e:bb:e2: - 28:dc:6b:32:0e:ce:9a:e1:d5:a7:c0:48:b3:47:96: - 30:8b:5d:53:c8:1d:52:02:8f:3f:22:76:b4:e2:e6: - c3:c9:02:8c:77:c0:b4:35:e6:8b:eb:27:a8:3c:68: - 43:8c:6a:42:7b:44:fb:e8:44:4d:5e:10:07:e2:da: - 55:43:cb:a4:d0:cf:03:e5 + 59:87:fd:95:4d:f0:35:26:2a:39:f6:de:56:30:0b: + ec:d5:53:7b:04:df:dc:41:a0:8c:7a:47:0c:36:1f: + 51:ff:5a:86:c5:19:56:b8:d5:c1:a4:dc:b6:be:de: + d6:b4:87:a3:72:05:0f:f0:6e:76:07:51:86:f6:d7: + a9:7c:e8:42:fe:18:86:da:bc:c2:74:07:86:7e:58: + d2:1b:3b:d4:21:2b:77:58:71:27:cb:db:52:80:ae: + c9:2f:17:b4:eb:94:79:76:e6:f1:74:6b:e4:90:d7: + ad:2c:13:ed:48:1b:2a:0b:72:7f:01:77:b0:fa:f6: + f4:f0:66:99:f4:ff:20:62 P: - 00:a0:1e:58:a8:4c:01:8a:79:b1:61:f9:ae:c9:a8: - 90:26:9c:92:29:41:f6:50:92:a8:66:7c:52:80:57: - e5:88:45:66:8b:ef:fd:05:aa:af:53:21:72:70:5b: - 2e:00:05:be:0d:6d:4b:a4:57:b8:97:25:db:19:dd: - 75:48:50:ec:37:20:57:1a:68:dc:f9:f6:32:1f:47: - d2:8e:06:2c:b2:51:0d:fa:86:39:e8:32:0f:69:16: - 94:5c:7c:c0:dc:44:9f:ff:6b:2e:0d:79:cc:6b:ff: - c1:8d:b5:f1:2d:ec:a5:a4:aa:15:e3:55:93:8e:9d: - 69:61:40:a3:f4:b0:35:a9:71 + 00:a6:a4:76:fa:34:e5:0e:e4:85:58:89:05:ae:6d: + 34:b6:92:ee:cd:6e:94:f1:8e:2c:fc:04:f4:4d:ce: + 40:09:3b:7f:d2:5e:09:96:e7:09:05:c6:41:4a:94: + 13:92:df:4c:66:ec:bd:19:0e:b3:04:26:e5:cf:79: + d2:9d:b4:f4:da:14:32:cc:cd:e5:6e:cb:f8:c7:6f: + c0:e9:90:91:9a:0b:ec:82:ea:9b:90:b7:70:50:e7: + 17:39:81:c0:0e:87:c3:46:f1:44:0a:8c:42:54:52: + 89:37:36:a1:0e:21:61:e5:31:5c:5b:a3:24:77:70: + b2:13:18:ab:3c:5a:71:00:5f Q: - 00:b0:16:10:18:a5:47:c7:f8:6a:13:b0:e1:3b:08: - 11:92:21:b0:30:e9 + 00:9d:22:10:85:4e:88:3f:a9:64:d0:10:71:ad:7d: + 7e:25:3a:38:23:55 G: - 0d:e8:2e:4f:bb:15:ce:43:9c:a3:d1:47:4d:78:e1: - 43:b8:75:4b:8a:9d:87:d6:79:ee:31:02:26:48:21: - 02:32:9f:9e:8a:27:52:b1:67:20:e0:ad:28:b4:fc: - 2f:36:dd:f5:8b:65:81:58:41:af:d1:62:f0:d7:e1: - 02:35:b1:e2:f2:dd:6e:a3:ea:2c:78:cb:dd:2a:4f: - e5:e2:eb:d6:02:36:bb:76:28:85:1f:83:d4:98:e9: - 5f:57:fa:5f:71:82:37:be:44:31:b6:fe:43:9e:93: - 91:2a:f9:12:c0:ed:c1:0d:c1:14:7b:db:53:52:fa: - 7a:00:e3:07:07:2a:b3:fd + 1c:ed:1c:03:2d:ab:02:5f:49:0a:35:b2:71:35:b8: + d0:b8:73:de:cb:3a:f5:99:20:61:6d:ae:a8:87:2b: + eb:85:f8:a5:6e:e5:c9:b6:31:83:0c:ad:03:0b:15: + 23:93:90:be:84:8d:8f:ce:1d:30:00:64:36:80:e8: + 3e:57:ad:ea:fc:d9:10:26:fc:51:c8:d8:7e:96:17: + 7f:e8:04:24:ff:20:82:5c:b6:f3:90:47:a6:d6:49: + a0:96:51:64:62:8b:84:03:f8:2e:7d:0e:d0:60:ee: + fa:b6:22:10:07:e0:e0:15:45:82:2f:b3:5d:56:b6: + 5f:f7:64:52:d4:01:c4:e6 X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 9D:B6:A2:C0:C5:1F:A9:79:9E:6F:3D:D4:4F:07:A9:BC:3C:A2:19:6F + 81:FA:7B:91:DB:47:03:86:E4:F0:7D:12:1D:BF:44:A4:19:6E:DB:15 X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:client, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 1b:ca:b4:aa:da:31:3e:66:73:78:e4:4b:91:2b:73:5e:b1:41: - 93:69:d9:e8:bb:4a:d0:3d:af:7e:92:ac:55:07:46:1c:4a:0a: - 98:be:5c:16:d5:8e:3b:ef:e0:fd:60:48:91:0d:02:83:e5:ad: - 40:7d:3e:d0:7c:f5:3a:7e:af:ee:4e:1e:7f:56:8e:45:4c:29: - 25:05:26:ba:64:84:5b:aa:5c:a8:45:75:99:3d:a1:fb:07:8f: - 1a:1d:ea:12:ca:bd:c2:1a:1a:6a:3e:18:b6:17:13:cf:6c:3b: - 6d:78:d9:45:25:e9:5f:aa:66:68:90:01:86:4b:a2:61:12:a9: - 3e:2f + 81:45:a3:9d:bf:36:0e:74:46:28:cc:3b:b3:72:78:8f:11:36: + 82:2a:cc:c9:44:fb:9a:3b:b2:c7:49:62:c6:98:3c:f6:71:94: + c2:89:a4:fb:c1:ba:10:2d:d6:9a:be:3c:d3:29:3a:c0:b4:9b: + 71:01:91:19:95:36:04:7b:d4:8e:8e:59:86:cb:ae:2b:82:62: + 90:58:f6:0f:f9:b4:ba:a0:f4:f5:3e:2e:73:3c:8e:0a:b3:cc: + 8f:b2:c7:f5:57:4e:b5:73:59:a4:c2:ac:46:dd:92:b2:70:64: + 82:ba:78:95:47:f7:c1:08:cb:ac:70:70:2b:5c:ab:ab:1f:bd: + 44:63 -----BEGIN CERTIFICATE----- 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 -AYZLomESqT4v +CQEWDmluZm9AemVyb2MuY29tggkAzopn7ZZvfrYwFwYDVR0RBBAwDoIGY2xpZW50 +hwR/AAABMA0GCSqGSIb3DQEBCwUAA4GBAIFFo52/Ng50RijMO7NyeI8RNoIqzMlE ++5o7ssdJYsaYPPZxlMKJpPvBuhAt1pq+PNMpOsC0m3EBkRmVNgR71I6OWYbLriuC +YpBY9g/5tLqg9PU+LnM8jgqzzI+yx/VXTrVzWaTCrEbdkrJwZIK6eJVH98EIy6xw +cCtcq6sfvURj -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1.pfx b/cpp/test/IceSSL/certs/c_rsa_ca1.pfx Binary files differindex 9d0ae244be9..18ac8cfbb60 100644 --- a/cpp/test/IceSSL/certs/c_rsa_ca1.pfx +++ b/cpp/test/IceSSL/certs/c_rsa_ca1.pfx diff --git a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.pfx b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.pfx Binary files differindex dfacc00e1c9..4c29f8563f8 100644 --- a/cpp/test/IceSSL/certs/c_rsa_ca1_exp.pfx +++ b/cpp/test/IceSSL/certs/c_rsa_ca1_exp.pfx diff --git a/cpp/test/IceSSL/certs/c_rsa_ca2.pfx b/cpp/test/IceSSL/certs/c_rsa_ca2.pfx Binary files differindex 437192906f5..f76bcb32477 100644 --- a/cpp/test/IceSSL/certs/c_rsa_ca2.pfx +++ b/cpp/test/IceSSL/certs/c_rsa_ca2.pfx diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_priv.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_priv.pem index e25492477cb..e27bbe280a7 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_priv.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMWv/FTXQHPGCGPS -dYwYKOSE8pRAPU9aI5NjMrbDGgR9DXw7YDWCQyQDbitnSZcxqt9VaakpyXUAM8XM -DhcMnbr+Ha88RWHURl7sW4lOyfNoM4izlY8LXQi3RW2BpPgAp/IsE4cc4NlBKlfD -I9oGQqL3Z2ErWBA+S3j0QB3NktjrAgMBAAECgYBPzK2INefflCYY3YDzz2DadkxR -yei12oYX3eg/3FvpSe2io3k/wFiH9haH0MblEHiQdLMVRTf8UduUUb2yUjZs6cQL -FaBc3SfX6CtLIJl3Yjn0edb3/NEF13Y6O3YYfeKSgKaVmimpJrvhUzKitJ+y0b6I -b3AlruP+WxN9bWibcQJBAPmLOO8k4Jj/LcC1APD1OYsz++cCGootNFi38rtNl9vP -E1+/08t+Tvk2qy8vkwyFEqAsAMNHj0Sg7WLJCAbrLskCQQDKzU7pAaGMDaJA6w+c -U+YZVHKROUxFQhzEPGQQ+bHf3E1ENkzD+aP4G7JkmKYCTPDaW+YLJGD5Q00JN5mu -e2ATAkBBTy6XaA9f+2j+BmE4rvVgeTp0Oxi3ER2iGoJsguI7pPZtGMdVerkwgB5N -OyZBIJK/WMTaVuAoFfYK5JI1PVgBAkA6iO/RySq7pePDIRWsZXrwrLM0v3kINIDh -Ex0+2RNCLfAPVCzsE84D+tqOtpCT8WlDXWsUpDdpOsetdWLiPbIJAkEA1hoMNZDd -ngOunRuUYbuTt2IzylzhW4W+BxCHRaj85zK5W0NzzOlXGf53A4yB8Db7Qxx2AHnT -waOVv/S24Tleag== +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMdopubyP4BTneW+ +jFZ9lku/zcCp7Bmm9mIeM6RoNlfchKYc8GNgvC4w7bNx27Wbx7KrlfwQGqXCGRqR +Bl3pvteaP8LyO61RFojlt9yjLTSUQoDCZoRsUlnaE6OzFugSebIF7oGbqEz9WnT2 +d44DoO5jDaH6t3nLAfKeoHh+soyRAgMBAAECgYBvGQZMC1GHzI5fLs9/bI7s+xrG +KaWqERSaS9tX0NveDbU120+u/nk5fvcgD+JqBzW2fNSeT9aY3VAhNgWHEzDIb+ys +qbc3JfcoNTzSzuMqLOujl6LDjfbcMMz/yFHi5I01DE3SacmXZJ4bEf38ohtK2hly +NMAsjqoPFtdUF0yJtQJBAPM6O4IXZGa0UkHzGczdLbutzCYiFGf2X7LzsmoWp74w +YCEIuPKZjgkM1+O9uvO6lipoqQSyqnU1eIBtjV1ZXAsCQQDR4VqpasbCIyAcJpS/ +X0TGfke0GI2ZZLuqFCN54qmbO2fM8PRkWQkMFrQ6/3D5iNm8h7ELtXKtHnJbdbjA +GT9TAkEAzRJUCiNe65ktoZ0uK6RwYsTuU1h4jA8WMPN3gisH0ztGUZPhG+qL7uV9 +QO8/KTAwXCFSIDvjrF8g8mdrwUEOcQJAGnfqIB2ILWmSnho7fhr8qG+6iTrjeKnc +hOl/Q9rS+vG1+IGWwKT94Blo51vZmo6orv8J0+kxKiYB1Aj3oLpOYwJBAOUt5cfm +NRMOozadbRELW8LaOCQXANL6WkcpwOonnp33JZxBVpJw/TbM5cfidMd/kV105WKd +FP+GAB33t2lElxE= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_pub.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_pub.pem index 11a6e3c6c5a..51c1d79a21a 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_pub.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_exp_pub.pem @@ -5,63 +5,63 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT + Not Before: Aug 19 14:40:37 2014 GMT Not After : Dec 31 00:00:00 2005 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:c5:af:fc:54:d7:40:73:c6:08:63:d2:75:8c:18: - 28:e4:84:f2:94:40:3d:4f:5a:23:93:63:32:b6:c3: - 1a:04:7d:0d:7c:3b:60:35:82:43:24:03:6e:2b:67: - 49:97:31:aa:df:55:69:a9:29:c9:75:00:33:c5:cc: - 0e:17:0c:9d:ba:fe:1d:af:3c:45:61:d4:46:5e:ec: - 5b:89:4e:c9:f3:68:33:88:b3:95:8f:0b:5d:08:b7: - 45:6d:81:a4:f8:00:a7:f2:2c:13:87:1c:e0:d9:41: - 2a:57:c3:23:da:06:42:a2:f7:67:61:2b:58:10:3e: - 4b:78:f4:40:1d:cd:92:d8:eb + 00:c7:68:a6:e6:f2:3f:80:53:9d:e5:be:8c:56:7d: + 96:4b:bf:cd:c0:a9:ec:19:a6:f6:62:1e:33:a4:68: + 36:57:dc:84:a6:1c:f0:63:60:bc:2e:30:ed:b3:71: + db:b5:9b:c7:b2:ab:95:fc:10:1a:a5:c2:19:1a:91: + 06:5d:e9:be:d7:9a:3f:c2:f2:3b:ad:51:16:88:e5: + b7:dc:a3:2d:34:94:42:80:c2:66:84:6c:52:59:da: + 13:a3:b3:16:e8:12:79:b2:05:ee:81:9b:a8:4c:fd: + 5a:74:f6:77:8e:03:a0:ee:63:0d:a1:fa:b7:79:cb: + 01:f2:9e:a0:78:7e:b2:8c:91 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - F4:C8:94:EC:B9:E2:64:15:3D:8F:A6:70:BC:49:11:16:B1:0F:7C:54 + 05:71:B7:04:AE:5F:95:4E:DD:C2:0B:F7:C6:58:91:3E:37:45:2B:BD X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:client, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 06:58:45:a0:7f:77:29:e7:29:57:71:8a:ad:27:d9:2a:1c:31: - 9a:33:b1:0e:f2:47:7b:6e:a0:92:61:7c:77:f1:c5:98:65:3e: - cc:fd:3a:aa:33:a2:4b:3c:76:d2:c9:94:da:86:48:39:bf:4e: - 70:ea:3a:66:01:5d:93:99:21:85:68:48:93:9c:41:9d:f8:72: - d9:57:6e:f7:a1:cb:4d:c5:0d:bc:18:24:23:dc:1d:f8:69:7d: - 92:86:c7:38:46:bc:0c:6c:81:9b:db:7f:62:8d:d8:e1:9c:77: - 8a:58:00:8c:43:9c:3e:97:8f:3e:e8:6d:bb:b1:e3:83:17:26: - 38:e9 + 06:39:cd:bb:61:99:4c:bd:af:26:77:cb:d1:7a:23:72:6d:bc: + 38:9d:06:65:2a:90:bf:69:76:2c:72:89:c4:e4:b2:b9:3b:5c: + 7c:4f:09:e3:38:76:cb:71:de:4f:48:59:fd:91:26:32:b1:4c: + cb:17:d0:ea:91:76:1e:6c:7c:df:ea:ff:db:75:77:84:0f:4c: + 04:9e:00:45:09:c4:fd:b0:85:46:14:c3:ee:41:9d:87:86:57: + 34:3c:6b:78:3d:5a:3a:7e:77:8f:7f:5b:f7:d3:8d:e3:99:71: + 82:55:9e:c8:7a:eb:c8:46:15:a0:4d:96:61:bc:c4:eb:31:3c: + a3:5a -----BEGIN CERTIFICATE----- MIIDnTCCAwagAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0wNTEyMzEwMDAwMDBaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0wNTEyMzEwMDAwMDBaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGQ2xpZW50 -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDFr/xU10Bzxghj0nWMGCjkhPKU -QD1PWiOTYzK2wxoEfQ18O2A1gkMkA24rZ0mXMarfVWmpKcl1ADPFzA4XDJ26/h2v -PEVh1EZe7FuJTsnzaDOIs5WPC10It0VtgaT4AKfyLBOHHODZQSpXwyPaBkKi92dh -K1gQPkt49EAdzZLY6wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -9MiU7LniZBU9j6ZwvEkRFrEPfFQwgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHaKbm8j+AU53lvoxWfZZLv83A +qewZpvZiHjOkaDZX3ISmHPBjYLwuMO2zcdu1m8eyq5X8EBqlwhkakQZd6b7Xmj/C +8jutURaI5bfcoy00lEKAwmaEbFJZ2hOjsxboEnmyBe6Bm6hM/Vp09neOA6DuYw2h ++rd5ywHynqB4frKMkQIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +BXG3BK5flU7dwgv3xliRPjdFK70wgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO -ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEABlhFoH93KecpV3GKrSfZ -KhwxmjOxDvJHe26gkmF8d/HFmGU+zP06qjOiSzx20smU2oZIOb9OcOo6ZgFdk5kh -hWhIk5xBnfhy2Vdu96HLTcUNvBgkI9wd+Gl9kobHOEa8DGyBm9t/Yo3Y4Zx3ilgA -jEOcPpePPuhtu7HjgxcmOOk= +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO +ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEABjnNu2GZTL2vJnfL0Xoj +cm28OJ0GZSqQv2l2LHKJxOSyuTtcfE8J4zh2y3HeT0hZ/ZEmMrFMyxfQ6pF2Hmx8 +3+r/23V3hA9MBJ4ARQnE/bCFRhTD7kGdh4ZXNDxreD1aOn53j39b99ON45lxglWe +yHrryEYVoE2WYbzE6zE8o1o= -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_priv.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_priv.pem index 1ed66f4b472..f68cd5d30bc 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALNWoAgElLfLZ9Ck -JkB9nUdN2i0canIr62eA8/Qxung45i+PE8QShgXMt27ArPVdaTwDBnbuW5zv8FHq -r7ljoC1Yb8Bi8qXFl6KE/O5YsuhvDANPY075+92Y4bLwOSY7s3vV84CuOAgsahNk -jTYLpNHl6mQx6KwtO9X9Sw0SPBBnAgMBAAECgYBBTiUeZlSljStzvaK0T0nLolz1 -mmhkxPuHCF1NqiImD0o7PVXMS5aEXCTb7svM2cQtd0iOXIP95R3VJqnwz4eO/0LM -C7bbmWmVHW/hZUFNbRUmP8uTeXSD3cBm1SRVGqR4yEYihQquyhMsHsnFVhYkaf9Y -lO+bk/pJHaaNFO6pAQJBAOUqk4RqtiaQz+ZEo7imXmlrNcZZ3V47ieORJTxEI7js -Y83Nk47fMtqc5Sbb+mC7SCBVy9HX/AIv8AwYg/F42ecCQQDIVmvHFTJUXV+P2jDN -yAz2YP69nKBKwHPHdj3xHCZnV7M43wBi4c7oSoNLvDHanDDrI2XLXYqpBqFX+fbc -LUWBAkBhkr88ojLsOLxMTu1msW+BcyRyT9DxTmhnfGVeQ6TyF7Rm7CDntCDy89qd -sQvqI9OR8PXXYx7pz39lpwqGxe4BAkEAgRBT/Pzl4L4K65UIrfn8h9mzI5q9FYto -y46clzGoeBli5/eauxl4f+RJM8h5YboQNdwnH14TD5Oq7A+ofu5XgQJBAMe3ggKk -+fixBXkZrHwFPTWNYnKcjzAQ2FJKUjggo0KQnuMAYSPO5amkp+ddt2Hk8CxeI/gs -w52OD7b/P8EKkUo= +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANRKkWViJ31ByGf5 +OOgdHOHVHUOgY/Kec8u91JUHSyYSiL0/hJEyXd/cgLvQbt6pgZsXOQYrhzOaTunl +41HkSUcwbDVLioCEERRsyFcdaC/ot2iRJHVRQKL5uDPEBugr7gn1cW2wnKUyFTwg +C0MGsVu0DCPLzW8wTSMfsZ5jfZ7/AgMBAAECgYBINaUHKz/rZzjXxPoKWfy9BFST +8DaPDD6vCr8IghaZuKwyUyywhsVPpB1VxSwxKM8hBeErrBqs/svg24VbEZ+qrGqG +RfRmxQ86SwYAfGAVBaNMXvHTr+a7sE9aN+tOYe6OyqWQFFd99iib91NUpA+VKnHC +iYFBE82UG9sbNeJ8AQJBAPjvKkoTGa/wuvlsIZpTioM0iSzOdElPjjYPvfI/zCEd +OfcZYBhw9Zu9msmYqO1Amw0r6E6EtGyQRsKCBY2ClX8CQQDaUSS5aI5czumpvqeu +WHomtp6BQA/8edYqMpsgrYr2gFMgVRT33BlEOb9hY3GLitR5C1rTdkSm0ErqN70F +mLaBAkEApOcaJpPcklZwJcZhxC/PM/dbX5ksI1xWIq3u8Eke2ljYCz5+D/LUYOUL +YryEOxZvIByT+V+jfb9dgIBNWV7F1QJAVUkRsaSYyMTEH12tn7xMq8b3kMJ3/EeU +VJPEajWhbb6fuqfCMzm2XSK6Es+IUd0AN/EpoCY5l3kTawAvRXptAQJAEAMHWx17 +W5UOYmm5SKrNfY5VTKVXfMOB+kWIPiTEs8hQXJxF2IuAfrFgz7IB8aAmo8R/AGuI +GDWRczY7frR9Bg== -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_pub.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_pub.pem index abe7f382f74..59e2957dfe9 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca1_pub.pem @@ -1,67 +1,67 @@ Certificate: Data: Version: 3 (0x2) - Serial Number: 1 (0x1) + Serial Number: 2 (0x2) Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:b3:56:a0:08:04:94:b7:cb:67:d0:a4:26:40:7d: - 9d:47:4d:da:2d:1c:6a:72:2b:eb:67:80:f3:f4:31: - ba:78:38:e6:2f:8f:13:c4:12:86:05:cc:b7:6e:c0: - ac:f5:5d:69:3c:03:06:76:ee:5b:9c:ef:f0:51:ea: - af:b9:63:a0:2d:58:6f:c0:62:f2:a5:c5:97:a2:84: - fc:ee:58:b2:e8:6f:0c:03:4f:63:4e:f9:fb:dd:98: - e1:b2:f0:39:26:3b:b3:7b:d5:f3:80:ae:38:08:2c: - 6a:13:64:8d:36:0b:a4:d1:e5:ea:64:31:e8:ac:2d: - 3b:d5:fd:4b:0d:12:3c:10:67 + 00:d4:4a:91:65:62:27:7d:41:c8:67:f9:38:e8:1d: + 1c:e1:d5:1d:43:a0:63:f2:9e:73:cb:bd:d4:95:07: + 4b:26:12:88:bd:3f:84:91:32:5d:df:dc:80:bb:d0: + 6e:de:a9:81:9b:17:39:06:2b:87:33:9a:4e:e9:e5: + e3:51:e4:49:47:30:6c:35:4b:8a:80:84:11:14:6c: + c8:57:1d:68:2f:e8:b7:68:91:24:75:51:40:a2:f9: + b8:33:c4:06:e8:2b:ee:09:f5:71:6d:b0:9c:a5:32: + 15:3c:20:0b:43:06:b1:5b:b4:0c:23:cb:cd:6f:30: + 4d:23:1f:b1:9e:63:7d:9e:ff Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 54:72:19:52:20:4A:A8:AA:B7:37:6A:BF:DA:B9:87:E2:47:51:03:4B + 58:77:81:07:55:2A:0C:10:19:88:13:47:6F:27:6E:21:75:5F:85:CA X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:client, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 2c:7d:9b:27:57:91:85:3f:67:f4:a4:6f:57:19:70:bd:b6:a4: - 9f:25:72:36:18:ba:a0:14:60:99:36:e7:98:95:0a:ed:fb:5c: - 93:e7:f5:3b:fa:ac:dd:3c:07:ec:a1:2d:40:65:84:a1:f4:aa: - 96:30:62:bc:a1:99:4a:5b:aa:e4:8d:42:af:c8:01:89:6e:33: - 61:54:2d:14:1a:25:46:29:c0:28:b6:3d:bc:67:9e:ef:d5:9f: - cd:1f:d9:bd:08:95:76:19:77:a7:25:78:66:44:50:ff:69:84: - 31:59:ec:1b:e5:53:fe:4f:66:b2:73:1e:69:3a:a9:31:68:f8: - 2a:91 + 74:35:66:b0:fb:07:aa:40:f4:1a:6f:2e:02:fb:08:59:9b:5e: + af:ec:2a:05:c9:ec:ae:ed:ae:d6:a0:b9:8b:fb:72:58:d6:85: + a6:f4:28:de:9f:dc:d5:45:0b:65:ce:28:55:f9:45:65:11:58: + 33:81:22:4c:ff:80:45:b7:47:cd:45:27:77:62:99:51:b8:d4: + fa:39:1e:ac:4d:90:2e:5c:ef:a9:02:df:9d:d7:cd:4f:3f:86: + 05:05:84:36:ed:70:c0:96:58:71:87:7d:f9:f5:4a:91:d0:69: + e1:da:22:24:6b:ed:9c:52:df:ba:81:c2:64:cd:cc:58:8f:9e: + f0:3c -----BEGIN CERTIFICATE----- -MIIDnTCCAwagAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx +MIIDnTCCAwagAwIBAgIBAjANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGQ2xpZW50 -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCzVqAIBJS3y2fQpCZAfZ1HTdot -HGpyK+tngPP0Mbp4OOYvjxPEEoYFzLduwKz1XWk8AwZ27luc7/BR6q+5Y6AtWG/A -YvKlxZeihPzuWLLobwwDT2NO+fvdmOGy8DkmO7N71fOArjgILGoTZI02C6TR5epk -MeisLTvV/UsNEjwQZwIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -VHIZUiBKqKq3N2q/2rmH4kdRA0swgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDUSpFlYid9Qchn+TjoHRzh1R1D +oGPynnPLvdSVB0smEoi9P4SRMl3f3IC70G7eqYGbFzkGK4czmk7p5eNR5ElHMGw1 +S4qAhBEUbMhXHWgv6LdokSR1UUCi+bgzxAboK+4J9XFtsJylMhU8IAtDBrFbtAwj +y81vME0jH7GeY32e/wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +WHeBB1UqDBAZiBNHbyduIXVfhcowgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO -ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEALH2bJ1eRhT9n9KRvVxlw -vbaknyVyNhi6oBRgmTbnmJUK7ftck+f1O/qs3TwH7KEtQGWEofSqljBivKGZSluq -5I1Cr8gBiW4zYVQtFBolRinAKLY9vGee79WfzR/ZvQiVdhl3pyV4ZkRQ/2mEMVns -G+VT/k9msnMeaTqpMWj4KpE= +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO +ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAdDVmsPsHqkD0Gm8uAvsI +WZter+wqBcnsru2u1qC5i/tyWNaFpvQo3p/c1UULZc4oVflFZRFYM4EiTP+ARbdH +zUUnd2KZUbjU+jkerE2QLlzvqQLfndfNTz+GBQWENu1wwJZYcYd9+fVKkdBp4doi +JGvtnFLfuoHCZM3MWI+e8Dw= -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_priv.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_priv.pem index 0b4950514c0..75f8717c910 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_priv.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAPtzYUipfz5maazs -gt9JamKhg6QQzau6Vt9YHFx0oGV/qqPaCEbBGmxIEQO5XgpvN7tYZveUYuuJdZ+i -OT5v6fATqMBp20MN5d8CNeE699dotH6H77Gt/Z/BEeW5ftCgnFvKkzQu2DgMMAWt -3GhYsrz2OgJSuCW8CwDlhjJI+boZAgMBAAECgYEAn18379gOYDyFCic1o9Ria3U3 -fItx8EBAw3qTLz50UyChxQxyZnYKC0t6DUQ2CKMJTeLwEEeqkuMi/DTT13ETcedE -qFWG1FszAMkqq8H3g+Li8qdi18VGDXjiN8PQKPA0jKti4seGrSkl1kAgd4BhvHXy -EmCOpRaa1ze5qbzEqUkCQQD+z2AxA6eCBsR/jOc+zyxsWEZu+rBoPWV4GBsUy/m+ -C+qUO0F+6cYM9suXxz1XjO3HVnDpZfKZh/MLsOCDNvZ7AkEA/J/8+LCx59o/Rype -rDREhElzCeXP5+a99WguBzilgSq1uI8OiqYANC63avrtlz8yIF2U66Nkye/xkkmR -4LDXewJAIKfVDRMJ0akqX6pgLHWCnPQHOsvX9dQAgA6e0eB+RjPiwVKCx1AQeLLc -TrxTCThfdM+IMvFE0RZSOKpXa5mMpwJAZ1QxLq9nNURJmZw0+Q6v78PzL9s1/M6e -aCBio0WCPKDxjznEYuWfM7jgAPv97l1E7YQZg4Bjm01va7x31IXAvQJAWptK3chY -I6AEMnLFx4BgWUDhzaG0en8jVlW+hgHxFCCNCBRPeptnUSUFXekml6ZIQaBurpiJ -zId6YcIqUy/uFw== +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAMWNVzcGbWLzdExF +pNDrcPh873lW0m1m+4C2Eg6LcwDhQO3UnQGW8bJBRJqRpQwltFWzEz1qoVUn2beF +Fv9eTpKXNrkOq/G1j5j8aoNQ6+pepZPhreg+UaejnyJQSiibPYAMv1u6kNYHOXjP +8JlKXGm8nHRjCbBBOP58QMDdJtP/AgMBAAECgYBkiPGBhzvTx6G/zxF5YNg1HR+h +2JVuJ6KGdiHqVP1JzViFsFXWoUKPPLf1EXm1HNsRYfjAoKtJ8uXRh2GUxCGngnkU +HndAcs+eKQcu+/cVqqb4+YTt1maRQa9FrgYkm+vZlVQf2WA/gQi/5R10K7TjdHLG +eXfVHh+BNrBEchW7QQJBAPbe6ab6Z1hzQmAp18cdtjgbr3NVKAnLG8ptRMcPBPUR +/pnXX3Iu5dtoC7hrwwdfXRE6VID8dPeO04cA0v0pvEMCQQDM24k40K50Uk5wPsQy +/iYjAL7oj1hndVr3tZXVxkOgJg9JaeFIkOgd//bnB2Abvf4Lb21YJc4AX1HHvJ60 +fyuVAkBJ2ZNB/URvJEOl6r5+9Tduf3Gz6bSJgXX1z0w01Bxih5iHQvNtf/QI944S +BEKacP+xSKbA00TWTaafizKSwyprAkEAmn9PZCvuBgg04+5SZerKtEdRs264S350 +VrD6Cbl3MwbBLKrPnry6cjWi7eXgE8wcFl+45WvNivZYZPzZ7GKkaQJAQiN17pNy +9Q7Kvbv6G4FeciQ2jhpcv+1rqHwtRUfPYbZLwmXaaa0EEHALmnpVHs4dD+frNOcP +ysfKrTUIfl7QIw== -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_pub.pem b/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_pub.pem index edf84039200..4ab27d57840 100644 --- a/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_pub.pem +++ b/cpp/test/IceSSL/certs/c_rsa_nopass_ca2_pub.pem @@ -5,63 +5,63 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 2/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:38 2014 GMT + Not After : Aug 16 14:40:38 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:fb:73:61:48:a9:7f:3e:66:69:ac:ec:82:df:49: - 6a:62:a1:83:a4:10:cd:ab:ba:56:df:58:1c:5c:74: - a0:65:7f:aa:a3:da:08:46:c1:1a:6c:48:11:03:b9: - 5e:0a:6f:37:bb:58:66:f7:94:62:eb:89:75:9f:a2: - 39:3e:6f:e9:f0:13:a8:c0:69:db:43:0d:e5:df:02: - 35:e1:3a:f7:d7:68:b4:7e:87:ef:b1:ad:fd:9f:c1: - 11:e5:b9:7e:d0:a0:9c:5b:ca:93:34:2e:d8:38:0c: - 30:05:ad:dc:68:58:b2:bc:f6:3a:02:52:b8:25:bc: - 0b:00:e5:86:32:48:f9:ba:19 + 00:c5:8d:57:37:06:6d:62:f3:74:4c:45:a4:d0:eb: + 70:f8:7c:ef:79:56:d2:6d:66:fb:80:b6:12:0e:8b: + 73:00:e1:40:ed:d4:9d:01:96:f1:b2:41:44:9a:91: + a5:0c:25:b4:55:b3:13:3d:6a:a1:55:27:d9:b7:85: + 16:ff:5e:4e:92:97:36:b9:0e:ab:f1:b5:8f:98:fc: + 6a:83:50:eb:ea:5e:a5:93:e1:ad:e8:3e:51:a7:a3: + 9f:22:50:4a:28:9b:3d:80:0c:bf:5b:ba:90:d6:07: + 39:78:cf:f0:99:4a:5c:69:bc:9c:74:63:09:b0:41: + 38:fe:7c:40:c0:dd:26:d3:ff Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - DF:14:07:62:70:8B:BA:BB:36:CE:09:FE:50:8B:AE:9E:68:27:0E:66 + B9:8F:A5:17:78:5A:66:9B:E1:27:01:4D:48:B9:01:CD:0B:FA:9A:22 X509v3 Authority Key Identifier: - keyid:E6:A2:63:95:8F:8C:4D:7F:7A:3C:62:1A:C3:2A:BA:53:BB:C2:BF:B1 + keyid:71:61:73:01:D1:B6:AA:21:F5:90:E7:DA:55:93:FA:1B:1F:DD:AD:66 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 2/emailAddress=info@zeroc.com - serial:E3:A0:C8:CA:39:6A:77:CF + serial:C9:6F:11:B4:99:58:DA:C3 X509v3 Subject Alternative Name: DNS:client, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 24:7b:f6:3a:82:8a:27:9e:8c:c4:e8:27:2e:64:eb:2e:a4:59: - 08:95:9a:d5:41:d4:62:32:21:33:7b:11:26:ef:33:08:97:98: - e2:40:fa:c2:8a:3f:87:f2:c7:17:42:79:b0:34:88:c6:74:3f: - 5d:fe:28:3d:32:c3:2a:8a:cf:8e:ae:29:21:5d:52:df:cf:5c: - ee:10:ff:32:70:ba:ae:c2:c7:14:89:f6:38:5b:fb:6c:e3:e3: - eb:50:40:ad:c7:0b:46:d4:38:78:c4:b4:22:32:7a:72:13:16: - e3:de:f6:26:de:28:34:44:19:1f:9e:ae:c5:61:13:23:73:6a: - 9b:d7 + 14:ff:32:41:21:67:3e:3a:71:78:ad:6e:b4:08:f8:25:c5:b2: + 26:28:c1:3a:0c:2b:e8:67:59:a1:0b:33:e8:38:29:bb:65:8e: + 53:79:f5:b5:6e:ec:65:65:3c:7a:2f:00:52:f4:d0:64:98:7c: + cf:a1:f4:ac:32:fa:88:6d:3f:eb:22:d3:9c:56:2d:cf:0d:a9: + 26:3c:42:cd:fb:aa:e8:23:0c:1e:7e:72:cf:7c:b3:c7:f3:37: + 7d:1f:b0:d8:3e:e4:82:29:a3:2e:5f:51:88:46:bb:99:15:0b: + c8:75:1b:a7:bb:2f:45:b4:97:da:91:3d:a5:80:ae:d7:6e:80: + a4:1c -----BEGIN CERTIFICATE----- MIIDnTCCAwagAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAyMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzhaFw0yNDA4MTYxNDQwMzhaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGQ2xpZW50 -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQD7c2FIqX8+Zmms7ILfSWpioYOk -EM2rulbfWBxcdKBlf6qj2ghGwRpsSBEDuV4Kbze7WGb3lGLriXWfojk+b+nwE6jA -adtDDeXfAjXhOvfXaLR+h++xrf2fwRHluX7QoJxbypM0Ltg4DDAFrdxoWLK89joC -UrglvAsA5YYySPm6GQIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -3xQHYnCLurs2zgn+UIuunmgnDmYwgc4GA1UdIwSBxjCBw4AU5qJjlY+MTX96PGIa -wyq6U7vCv7GhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDFjVc3Bm1i83RMRaTQ63D4fO95 +VtJtZvuAthIOi3MA4UDt1J0BlvGyQUSakaUMJbRVsxM9aqFVJ9m3hRb/Xk6Slza5 +DqvxtY+Y/GqDUOvqXqWT4a3oPlGno58iUEoomz2ADL9bupDWBzl4z/CZSlxpvJx0 +YwmwQTj+fEDA3SbT/wIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +uY+lF3haZpvhJwFNSLkBzQv6miIwgc4GA1UdIwSBxjCBw4AUcWFzAdG2qiH1kOfa +VZP6Gx/drWahgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMjEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDjoMjKOWp3zzAXBgNVHREEEDAO -ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAJHv2OoKKJ56MxOgnLmTr -LqRZCJWa1UHUYjIhM3sRJu8zCJeY4kD6woo/h/LHF0J5sDSIxnQ/Xf4oPTLDKorP -jq4pIV1S389c7hD/MnC6rsLHFIn2OFv7bOPj61BArccLRtQ4eMS0IjJ6chMW4972 -Jt4oNEQZH56uxWETI3Nqm9c= +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDJbxG0mVjawzAXBgNVHREEEDAO +ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAFP8yQSFnPjpxeK1utAj4 +JcWyJijBOgwr6GdZoQsz6Dgpu2WOU3n1tW7sZWU8ei8AUvTQZJh8z6H0rDL6iG0/ +6yLTnFYtzw2pJjxCzfuq6CMMHn5yz3yzx/M3fR+w2D7kgimjLl9RiEa7mRULyHUb +p7svRbSX2pE9pYCu126ApBw= -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.pfx b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.pfx Binary files differindex 53bf5d70d8d..698d594da37 100644 --- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1.pfx +++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1.pfx diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem index c8225432714..9805b8ca186 100644 --- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_priv.pem @@ -1,17 +1,17 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIRlDVaMQMJqoCAggA -MBQGCCqGSIb3DQMHBAgOv0empB42jQSCAoBlHTQpqkNQyZ3/m1xKyYOMaqQQUP3f -o4VxnJ4H29UL2mY2hobv+g8BVKaGpilBRAVm3pHRFvUBiI2lmn2IWe3ExbpXecF0 -iG0g/tOJ1yjirvuD0JFrPNRuqp18Lsj0QYE0rgUaVqlHH04UtbnaOxFtJLp+CcyL -qjaEeh6v1X6BTr6m2K5bmTXs58Dc2JRgWDpSZdE7X80XCOAer0G/4qn6+MNxbPAc -1oZJqEQ4oIJdbyIVKLGDNuOjzFbzXq+Nfpiajx3E/A3r8O4HWXQsW9cGQvvXOb/j -nbY5wvPrpfQ+v+zJz3iJlXPMaEts7Zkqq0mDr2G0Wzh5mT/4i6e05iTQymGf7N/3 -ApQCp0BYrUNCZMwry2cduLO9aREyMewhzQZeo9aBKZxCTyjD16cdbkfTT5u/ZbQt -Z1MEZqJ4lLmfylrj4qe0PV+7z3Zf4XlS1kE7MrluvpGrE19KH7meiqBLoHW4Lt2B -oEAlXm3Z77wQWwUgBZigFirMkURqrBfdDarcy7pVQEuO0EHOBufVo/sAcplMcUJa -towPFx9zMlQ2fQATdN4tq2t6yYkQmjD1Mtn06xCikpCPydh48yRjys9V3iKIrGRE -/vGTmzdwUM4o+dUEtlaq2kQRojtjoMAhuHjvDksucUbHZ8tIrQJhn9GZ/ILwvgCA -JdZ6FOB5v92vQYlrU5oiyvFc/uYGRdcmXVxvD2mjcq/PbuvcemG/XskGX3ufKIsU -49vHg1iIyDPwrROkQQ4utk853sXlJwMISbEngHSbOANe4PhdCiHE09cmZH/gQxP0 -q95y13L4dlz2RUdCgBN6REqAEkoH0o6T4B6yZdSgbibnhd6Ta+DWMmbk +MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIvpgmgpvIT/ACAggA +MBQGCCqGSIb3DQMHBAjxD+q3N9zlYQSCAoCsp5hQpXs0m01uyBGdv3oE5De4/ZMk +HSvQMy4v7ZGJsRULzyZbjNDalLiwXewOqGdIK1t2dtDu1r7eLdDGMt3wfDmpZlth +BLeuFoCZ/O/bfPeK2tLSEVJs5TwV8gsZyfBpTp2LWGcQK9ZiL+dIa+j4lv0W8CL4 +ZdTlfqtXu967ySxKIe//9pfgW8WYdUUfa5MussxrgEYmK8LLnMo/hhABxfLDLb3j +Sju0PtteaeI35Sy2mw/c2wraTLZzLs2xHpptLR68MhW2NpidcOEBOw9CqVaIV6+5 +cy6Wm6BYCXtZ99yd7ajjhM3znX/UGCQaC4qXq2mCO23aNqAZb3m85urKm+J6UCUr +z9KW5u0BTSq4r8ofbao2iyg5LV26N/rHcx1b6KCwglDNK1doIxqWEjLMLYeFTS+w +kKv5sVuntm1Yj0xVRTj52V+h4YLTKcCJzkjDAhTN2lc6ED5A/WDvSVlD2yvzlHCv +nqhk+XVZJRgivbiWCWURru0+BFOXnY1BItVZxKbfmdm0YcbZa3n20sgkFr2OlRfz ++RjdaQcGU97iqnitN+34BiHz8IMT+Bmdt4YWOUol8ndjuY2hZNFN88x59OUk8OAB +kaDaQl9ndq1WkCZwZMBuuUfi9bfxkKqO9rKflND36ubMNR+lKvSm3c7ze5e33+kp +ED81cWcpLdLYJH4BdDr13O774jMldICae05GTt4ya2MdRikIQpuJoWTuMDWw1YwX +mfLOL4TUWLUaIoZUTczk7YRga2Xy0BldJShVQg1pWrCaQBKMs5C0C2NGFoE5JrEX +9pdvSc5efFzi87qTW6FURD5XxIbkhbsIKwnow0Jz5R7lKbRILqq6Jn9G -----END ENCRYPTED PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem index af1a5572659..319dfc6ad05 100644 --- a/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/c_rsa_pass_ca1_pub.pem @@ -5,63 +5,63 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Client Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:94:71:42:6e:d1:2a:5d:a0:9d:b6:13:05:5a:40: - 0f:42:85:28:a7:cb:da:28:93:63:f3:03:52:78:88: - e3:6e:b6:64:f3:32:8f:88:f5:0c:53:be:0e:4e:20: - 5a:2c:f5:f3:d2:a0:8f:9f:26:d6:1c:af:81:56:5e: - 0f:9e:c6:a0:a8:b8:21:1e:61:27:81:3e:ad:91:b7: - 44:a6:ee:29:bc:32:56:2b:2f:07:d3:57:79:00:98: - 8d:f3:af:6f:0c:8f:a9:27:04:52:1e:00:76:a6:9d: - 22:ca:ec:e2:4a:06:1f:df:4a:9a:9e:52:9e:60:29: - 46:08:95:9c:3e:28:b1:d7:7b + 00:af:a2:1d:e1:af:c9:a0:4b:2a:56:42:73:4b:40: + 2c:00:5c:f3:3e:67:6e:be:44:b6:1b:43:7e:3e:6b: + 44:a5:3f:f5:10:e9:9b:b5:3b:e0:56:c2:a1:70:a8: + a6:2d:c1:51:e1:af:f4:09:73:7d:6c:21:56:0c:fc: + 1d:42:a5:1b:eb:1d:a9:36:ad:ad:3c:67:64:11:6a: + 2d:5c:f9:05:cc:61:56:2f:80:75:a7:7c:9b:d7:2a: + c1:0e:30:79:a3:19:05:3b:28:57:ab:01:10:10:df: + 8a:63:fa:41:20:e6:f9:84:d3:45:88:6d:8a:e3:c3: + 77:bf:5b:51:14:9a:1e:b8:6f Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - CC:7B:FA:66:DA:CC:EC:93:5E:BE:65:E3:DA:A9:8E:3D:4E:16:1C:6B + B9:FA:9A:3B:C9:83:14:58:36:E1:C9:4D:B3:B7:E3:F8:9E:80:83:6C X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:client, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 92:75:e4:28:91:3b:20:48:67:33:0d:60:5b:6d:14:a2:b2:af: - 47:89:93:50:e2:d0:85:0c:3c:2d:85:af:f8:bb:42:6d:41:1c: - fb:7a:8f:9c:43:08:51:76:ef:6f:36:a1:73:7b:58:4e:fa:50: - 2e:91:00:0d:cb:5c:0c:68:8f:92:05:61:8d:4f:79:c9:77:f8: - b8:78:5a:11:7b:55:80:3c:41:c8:d5:ff:39:e9:30:2a:ca:ce: - 2f:98:78:d6:9e:2c:f1:e0:6d:97:85:19:9a:fc:67:cc:7c:09: - e4:c4:63:50:ca:60:52:42:24:61:2e:ee:69:b8:19:f2:f2:e7: - 30:08 + a9:1e:1f:82:a3:8e:4c:2c:db:f9:ba:52:51:e2:d1:44:62:15: + f8:17:0d:c4:d3:51:40:2f:b1:c5:03:52:e3:c6:22:b9:eb:38: + 79:20:d3:9a:15:35:b6:ea:15:08:ac:30:5e:43:9c:8b:54:07: + e5:30:29:c1:94:9e:82:9a:64:2a:d4:4e:aa:9d:4b:0f:74:71: + eb:fd:59:1f:b3:a1:7a:68:7f:2c:22:fc:7a:74:73:ec:86:34: + 91:ad:40:f8:be:5d:dc:ca:5c:a7:f3:a2:d7:85:b7:e7:9e:20: + 83:39:2b:43:3a:67:e0:96:3d:e5:d7:46:0c:63:ba:4e:99:74: + e4:74 -----BEGIN CERTIFICATE----- MIIDnTCCAwagAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGQ2xpZW50 -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCUcUJu0SpdoJ22EwVaQA9ChSin -y9ook2PzA1J4iONutmTzMo+I9QxTvg5OIFos9fPSoI+fJtYcr4FWXg+exqCouCEe -YSeBPq2Rt0Sm7im8MlYrLwfTV3kAmI3zr28Mj6knBFIeAHamnSLK7OJKBh/fSpqe -Up5gKUYIlZw+KLHXewIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -zHv6ZtrM7JNevmXj2qmOPU4WHGswgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvoh3hr8mgSypWQnNLQCwAXPM+ +Z26+RLYbQ34+a0SlP/UQ6Zu1O+BWwqFwqKYtwVHhr/QJc31sIVYM/B1CpRvrHak2 +ra08Z2QRai1c+QXMYVYvgHWnfJvXKsEOMHmjGQU7KFerARAQ34pj+kEg5vmE00WI +bYrjw3e/W1EUmh64bwIDAQABo4IBGDCCARQwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +ufqaO8mDFFg24clNs7fj+J6Ag2wwgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO -ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAknXkKJE7IEhnMw1gW20U -orKvR4mTUOLQhQw8LYWv+LtCbUEc+3qPnEMIUXbvbzahc3tYTvpQLpEADctcDGiP -kgVhjU95yXf4uHhaEXtVgDxByNX/OekwKsrOL5h41p4s8eBtl4UZmvxnzHwJ5MRj -UMpgUkIkYS7uabgZ8vLnMAg= +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO +ggZjbGllbnSHBH8AAAEwDQYJKoZIhvcNAQELBQADgYEAqR4fgqOOTCzb+bpSUeLR +RGIV+BcNxNNRQC+xxQNS48Yiues4eSDTmhU1tuoVCKwwXkOci1QH5TApwZSegppk +KtROqp1LD3Rx6/1ZH7Ohemh/LCL8enRz7IY0ka1A+L5d3Mpcp/Oi14W3554ggzkr +Qzpn4JY95ddGDGO6Tpl05HQ= -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/cacert1.pem b/cpp/test/IceSSL/certs/cacert1.pem index 1920d91f92d..05771c456b1 100644 --- a/cpp/test/IceSSL/certs/cacert1.pem +++ b/cpp/test/IceSSL/certs/cacert1.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/cacert2.pem b/cpp/test/IceSSL/certs/cacert2.pem index 770241b9d74..fc30d9970b7 100644 --- a/cpp/test/IceSSL/certs/cacert2.pem +++ b/cpp/test/IceSSL/certs/cacert2.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/cacert2.pfx b/cpp/test/IceSSL/certs/cacert2.pfx Binary files differindex 1c6ab273b9e..5e4f854f8a1 100644 --- a/cpp/test/IceSSL/certs/cacert2.pfx +++ b/cpp/test/IceSSL/certs/cacert2.pfx diff --git a/cpp/test/IceSSL/certs/cakey1.pem b/cpp/test/IceSSL/certs/cakey1.pem index 4441ddb56e8..aa8b4e9e5d1 100644 --- a/cpp/test/IceSSL/certs/cakey1.pem +++ b/cpp/test/IceSSL/certs/cakey1.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAMvEq209nJQXzzw/ -30CCTdqKopFDDrU+dWz29XLGXwxYq96KgBd0RJ8SooltvTq9lPXJ27T3hMjL8Ezv -elhNfzFbqFlgCVWXgRWwXZ6b8ATzuJNSLHfKcRdxS/gKcZyAgug/iNqf0OYIfVup -bh1bS0YK/i2ER80a/9OBRU7hFrTvAgMBAAECgYAi43CKirMFdDIqWbFK5USZN4Vw -I7Af/iqy1nHeDfL2NTRwLPyTh3e8WL91klGE/jLEBqTUjlCw5KInOhWTiulM5sIn -s+poEVMT8l2ti/ezaDDJV4tQZkAwrYzgmeW7aWCzK5PhKNK+wzvgvntbLyjS0pWf -Gk84e7fDjraeadOYmQJBAPUCOK0K3iQ3WmgRfwJAeGoe8cgZBvQi53+iRS3xEUGR -XF93Ql/SYVJnMKBaQ/ouXwFpclwT1slC0vuT6YaDc8sCQQDU6NOP7QOVEqDxyzlp -ViGEjcFhc48ZUhE95VT8QIrmse1sVI+WWUiM3oY9NMFMZbQbQIHwsDDuSOqQXbW9 -0UbtAkEAyxTmSXiCnN5Mz4oBDqrFpKC1pDgqbV4pKMAmO2hf90s3l+HQYICPLrBd -u+xWAB9DnHX81pmTJQuAugrmPBrldQJBALarsGDLJQiw+/+YsoBrEsTs7t8Sy9MY -s4xciCcJpWM7g44vmyaPIg0jGx/GdJZ8qCO9m/8K3GCFlSMaE8Vxmh0CQEbS9gk1 -te4uEn4rH68xXs0ji2Hv8jFI4Gs9fAkRNADZ2E6fxgDjCJOJWvN9S4aifCq+9VYI -BJE5lTKr5VZvpPM= +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM5Xr7rTd7Y8jiC2 +ofNBRIFwgdzxyH3Q6hg8/RHj1aIbavSHZcsBpJb+VUKmuL7TaSQWsgdvjQeZOhQl +Pe/wy4cC2bqKqZ5pDo8ELoTf99xFyrrGFfRlQSk17gOH/YTkzrj9HZcqYt3jIxCp +iKOLOVb6NVOGHhO7YOZcTEulBnTTAgMBAAECgYB2/0S95qR8OVHx9cFSCwrZ5ytN +YzavsGLAlbOQtKcIdO1qlgcTWyAzX/uFk6apjjxtbpU/Cor3ndtLsOqWTHTinq8z +Ka+PRo4AKfNxwkYHQcqGcNFQNx7IpRSiDshd0vfl9+zs/9frloY0Xh18rl2t6LNT +gpo1oMjMabf3+X7ZaQJBAPn/vJ3v7mXFp1VtMXDXYF5cXB4T6Eu+2WHHvlecazFf +ays+eR8PWr0WDMc7yNpxI+wZ8ZFk9shKMEn6prVFXkcCQQDTS61pCEeE4oOBL79g +aqKpnKhQgtfJLvlFxyMdtX/ZGL9SlICVwR9+4N3zbJ9wIK2jIGZ5amJuU9iv0xes +q/8VAkEAjMZdR/JbpCNw3sHmHUyqj3gixy0emciWUGFR5bPHCL5acrdzLPJQfjl0 +aJxZtegP+luBlAXukUp1drMWPO0a8QJAJ8Wm7o5QaAL7HeYO7+cilyqVxBHc7FGb +OjcxtPXlCshNuw2Y5pdjhk5teNSJbmG4TWxb3Z7YyEugDfh+DFKTwQJBAIOUuyr2 +vQl+45Pv6YQkjPvzljzOS/6CDlikKfbn+Ik5JDnYYT9CHmW5w4QDGgb04YefTcsz +ylq5Sf7KSxjJR1o= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/cakey2.pem b/cpp/test/IceSSL/certs/cakey2.pem index 9e89d31d6fb..1110ae8e50f 100644 --- a/cpp/test/IceSSL/certs/cakey2.pem +++ b/cpp/test/IceSSL/certs/cakey2.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBANsP1iadrxeJEmsi -CP8px+rt6k7ILMsNVfQpStH7LMnLF4vTiqgLp5pWxMySPDwYqt4f0apl7klAL2y+ -GWxlwUgqxs1ygoYPEd09q68T1OxUKqnDrBO5EB10p6LGiphVNhUg2xu2F6RnWYa6 -iUqk44QkyOV/ZGce2rGdaMHHANh/AgMBAAECgYEAp0aEhKBMH3Cv+9bVf+Lrod1i -2h3I9pSMWhFd7NIb9Ut8A23Zp1Ce/x/az0ura0h60XsCo1eKiazViffvefKJj6QU -Gx/LYD7Vu0QZhAOg4bjSgzlk9MA4GfPahP79LHs6lXFancF4SprJhyzrOu0NUzpm -gi8szjm8SQDDraI5eUECQQD1hT3DXwdnN3cISYt4plll43kAkam5TZwcmnSJlXlM -/h9le4r0B7xcsvuRPki9Fx8ZkEWR/q5ftvSDvUEhDueHAkEA5Gl8l/Z/paITvMGD -CPn1kb9sxxJnBqvssBOZ8Tyt9QJyxoZYcjq7pM9/m7RDxWvFkIBxfY6osQILUjPz -iFdVSQJBAJPTJIvUVJ3F3Gpl9Y6wAdWB72HzUhBa9SqXqKEKGV3NB9RPXStu2O+r -aCJcMOmA2V3H6strX0wL2Q7UzTj9Q1MCQQCUVAhsKtBEAJeuqT/t0VzulBAQytuK -0pT21xPOO+h/xmJAl7fSHmACrBkjRRIJn24B49dPgRf9MuWlMUWCEay5AkAmwDMH -OK78L9KGMDsOjNgTjuAtfAaULSrLYewZUjjxi5bXyulYp8qYc4kni0l1hlenBoy6 -m72lAuWnjktFI9uk +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANm0tTVD6XvTBGlg +NstYm0qsVKBPrw+6KTWove1Bt5yA20JpVC7CsNOsMSMYlFtIg42yFnVd4XmB6bMw +iWIhaBgvJ61L/CAN0BQlRR7FTRnsO4suB25WqJz/u1KBMnLhvcymOaVhZRund148 +MAbzsC8yQw1EFeob5XEO1WIi1fBBAgMBAAECgYAkDIxE+a3b1yFP4aKxIUb1onuQ +4CD41balL//jHZKt05h68r4B0DM/ma+5RASs6OD/wZF+dcE0QZLVHSBio2185XCh +ovRNBwQfJMG26/H+EXM9NNOWxHqzRmMfpw5xDDhiD3V0NxDasRHG0+YxWe4sDnkp +Jh++d6JGxVsk36cLkQJBAPZuBrFpfPCOLPlf4MGMmrQtGgizfab1jzav5jEvY99S +UePM4G4gFHqf9okjoKKGkgXjWMnd7ivA6YN4qsdF0Z8CQQDiKRzAvjttoB5B3Hls +L/vJt9nKQFKhgr9AcstIOZi2hS+m+jkwrE+xaCgPl41I9uU/4LRmYcWZ4TGXNNfw +v7IfAkEAoZXhw6E08JN5gAdTW/ZzVqOgR4ZSZRDtWGGcojG93iifU6z6mJtmckXD +pYb8BLYSt9OsW6mvS3dSZwfPi50HZwJBALXR95u9VGm94JVyeuvPZ820UROYwtW2 +F6voniViqLOUP8suP+wxm6A07IAchymx1HyWWnI1CHe94/B8O18BvmECQFWHwCs1 +CuWEFfi+T/VMaMY4atQw8ERJhLmzYNgjYj63rzGvy1i01oRtaLXlRYM9ievyN0Au +fDoKOpXDxLdzZGI= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/dfea7658.0 b/cpp/test/IceSSL/certs/dfea7658.0 index 1920d91f92d..05771c456b1 100644 --- a/cpp/test/IceSSL/certs/dfea7658.0 +++ b/cpp/test/IceSSL/certs/dfea7658.0 @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/dh_params1024.der b/cpp/test/IceSSL/certs/dh_params1024.der Binary files differindex 31d9a4fbab3..f71347ab600 100644 --- a/cpp/test/IceSSL/certs/dh_params1024.der +++ b/cpp/test/IceSSL/certs/dh_params1024.der diff --git a/cpp/test/IceSSL/certs/dh_params512.der b/cpp/test/IceSSL/certs/dh_params512.der Binary files differindex 531fb0a15b0..e66c3f74c0a 100644 --- a/cpp/test/IceSSL/certs/dh_params512.der +++ b/cpp/test/IceSSL/certs/dh_params512.der diff --git a/cpp/test/IceSSL/certs/dsaparam1024.pem b/cpp/test/IceSSL/certs/dsaparam1024.pem index 1c7eb74624c..e7a6d8d91cd 100644 --- a/cpp/test/IceSSL/certs/dsaparam1024.pem +++ b/cpp/test/IceSSL/certs/dsaparam1024.pem @@ -1,9 +1,9 @@ -----BEGIN DSA PARAMETERS----- -MIIBHgKBgQCgHlioTAGKebFh+a7JqJAmnJIpQfZQkqhmfFKAV+WIRWaL7/0Fqq9T -IXJwWy4ABb4NbUukV7iXJdsZ3XVIUOw3IFcaaNz59jIfR9KOBiyyUQ36hjnoMg9p -FpRcfMDcRJ//ay4Necxr/8GNtfEt7KWkqhXjVZOOnWlhQKP0sDWpcQIVALAWEBil -R8f4ahOw4TsIEZIhsDDpAoGADeguT7sVzkOco9FHTXjhQ7h1S4qdh9Z57jECJkgh -AjKfnoonUrFnIOCtKLT8Lzbd9YtlgVhBr9Fi8NfhAjWx4vLdbqPqLHjL3SpP5eLr -1gI2u3YohR+D1JjpX1f6X3GCN75EMbb+Q56TkSr5EsDtwQ3BFHvbU1L6egDjBwcq -s/0= +MIIBHgKBgQCmpHb6NOUO5IVYiQWubTS2ku7NbpTxjiz8BPRNzkAJO3/SXgmW5wkF +xkFKlBOS30xm7L0ZDrMEJuXPedKdtPTaFDLMzeVuy/jHb8DpkJGaC+yC6puQt3BQ +5xc5gcAOh8NG8UQKjEJUUok3NqEOIWHlMVxboyR3cLITGKs8WnEAXwIVAJ0iEIVO +iD+pZNAQca19fiU6OCNVAoGAHO0cAy2rAl9JCjWycTW40Lhz3ss69ZkgYW2uqIcr +64X4pW7lybYxgwytAwsVI5OQvoSNj84dMABkNoDoPlet6vzZECb8UcjYfpYXf+gE +JP8ggly285BHptZJoJZRZGKLhAP4Ln0O0GDu+rYiEAfg4BVFgi+zXVa2X/dkUtQB +xOY= -----END DSA PARAMETERS----- diff --git a/cpp/test/IceSSL/certs/fd61172a.0 b/cpp/test/IceSSL/certs/fd61172a.0 index 1920d91f92d..05771c456b1 100644 --- a/cpp/test/IceSSL/certs/fd61172a.0 +++ b/cpp/test/IceSSL/certs/fd61172a.0 @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/makecerts b/cpp/test/IceSSL/certs/makecerts index 1c6344a9dfb..49c783b8874 100755 --- a/cpp/test/IceSSL/certs/makecerts +++ b/cpp/test/IceSSL/certs/makecerts @@ -145,9 +145,6 @@ if ! [ -f cakey1.pem ]; then # # Create a client certificate and key (no password). # - rm -rf $TMP - mkdir $TMP - echo '01' > $TMP/serial touch $TMP/index.txt openssl req -config client.cnf -newkey rsa:1024 -nodes -keyout c_rsa_nopass_ca1_priv.pem \ -keyform PEM -out $TMP/req.pem diff --git a/cpp/test/IceSSL/certs/s_dsa_ca1.pfx b/cpp/test/IceSSL/certs/s_dsa_ca1.pfx Binary files differindex 5ba0726be1a..2afca1c1bcb 100644 --- a/cpp/test/IceSSL/certs/s_dsa_ca1.pfx +++ b/cpp/test/IceSSL/certs/s_dsa_ca1.pfx diff --git a/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_priv.pem b/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_priv.pem index 4c0f9e2ed55..cb3740907a5 100644 --- a/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_priv.pem @@ -1,9 +1,9 @@ -----BEGIN PRIVATE KEY----- -MIIBSgIBADCCASsGByqGSM44BAEwggEeAoGBAKAeWKhMAYp5sWH5rsmokCackilB -9lCSqGZ8UoBX5YhFZovv/QWqr1MhcnBbLgAFvg1tS6RXuJcl2xnddUhQ7DcgVxpo -3Pn2Mh9H0o4GLLJRDfqGOegyD2kWlFx8wNxEn/9rLg15zGv/wY218S3spaSqFeNV -k46daWFAo/SwNalxAhUAsBYQGKVHx/hqE7DhOwgRkiGwMOkCgYAN6C5PuxXOQ5yj -0UdNeOFDuHVLip2H1nnuMQImSCECMp+eiidSsWcg4K0otPwvNt31i2WBWEGv0WLw -1+ECNbHi8t1uo+oseMvdKk/l4uvWAja7diiFH4PUmOlfV/pfcYI3vkQxtv5DnpOR -KvkSwO3BDcEUe9tTUvp6AOMHByqz/QQWAhRDQEbgqB1i+KcPlBxW8y5NNkXsHA== +MIIBSwIBADCCASsGByqGSM44BAEwggEeAoGBAKakdvo05Q7khViJBa5tNLaS7s1u +lPGOLPwE9E3OQAk7f9JeCZbnCQXGQUqUE5LfTGbsvRkOswQm5c950p209NoUMszN +5W7L+MdvwOmQkZoL7ILqm5C3cFDnFzmBwA6Hw0bxRAqMQlRSiTc2oQ4hYeUxXFuj +JHdwshMYqzxacQBfAhUAnSIQhU6IP6lk0BBxrX1+JTo4I1UCgYAc7RwDLasCX0kK +NbJxNbjQuHPeyzr1mSBhba6ohyvrhfilbuXJtjGDDK0DCxUjk5C+hI2Pzh0wAGQ2 +gOg+V63q/NkQJvxRyNh+lhd/6AQk/yCCXLbzkEem1kmgllFkYouEA/gufQ7QYO76 +tiIQB+DgFUWCL7NdVrZf92RS1AHE5gQXAhUAkUPDwCIVkddmmww0JjlZtzbBgmY= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_pub.pem b/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_pub.pem index e7ee11f584c..070d886ae85 100644 --- a/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/s_dsa_nopass_ca1_pub.pem @@ -5,92 +5,92 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:38 2014 GMT + Not After : Aug 16 14:40:38 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server Subject Public Key Info: Public Key Algorithm: dsaEncryption pub: - 00:84:7d:97:1d:0f:2a:5c:0d:bb:3d:ef:0d:31:1d: - ca:bf:95:0a:dd:1f:47:4c:fc:32:72:4a:8f:78:a5: - e8:31:d2:93:e0:6e:97:61:bf:b8:00:92:a4:e8:73: - 41:3d:cc:9e:1c:b2:cf:c5:ae:9c:a9:ea:3d:4f:90: - d2:7c:bd:0a:11:e9:da:cc:e2:d3:2b:8a:af:5b:1f: - 3f:33:60:5c:70:cd:50:e2:35:ea:71:f7:95:45:48: - 8f:a3:89:2a:ae:12:84:09:a2:ec:b7:52:bb:b2:af: - f3:64:4d:58:f0:58:0e:a5:25:04:c8:c4:48:89:b3: - f9:1a:a8:aa:2a:b2:3b:8f:06 + 00:88:8e:5d:2b:1e:c6:46:18:37:54:c0:7e:85:4c: + 86:a6:82:2f:58:3d:0c:7e:6a:f7:3a:26:be:33:ca: + 30:76:ac:04:82:57:b3:7f:73:df:cf:12:5e:1f:0e: + 14:ae:c1:78:d6:ac:20:d5:52:a7:70:7b:48:18:22: + 3b:d5:47:eb:a7:22:5c:b0:1a:fb:bf:f0:da:eb:65: + 53:07:d2:b1:1f:88:5f:6f:03:c5:41:93:9a:64:78: + 6e:ca:ca:72:5b:2d:e8:41:79:6d:57:3a:58:df:e3: + 9a:2b:6c:c4:c2:65:88:5c:dc:81:70:80:71:44:5a: + 5f:de:c1:c7:ff:d2:7e:16:d2 P: - 00:a0:1e:58:a8:4c:01:8a:79:b1:61:f9:ae:c9:a8: - 90:26:9c:92:29:41:f6:50:92:a8:66:7c:52:80:57: - e5:88:45:66:8b:ef:fd:05:aa:af:53:21:72:70:5b: - 2e:00:05:be:0d:6d:4b:a4:57:b8:97:25:db:19:dd: - 75:48:50:ec:37:20:57:1a:68:dc:f9:f6:32:1f:47: - d2:8e:06:2c:b2:51:0d:fa:86:39:e8:32:0f:69:16: - 94:5c:7c:c0:dc:44:9f:ff:6b:2e:0d:79:cc:6b:ff: - c1:8d:b5:f1:2d:ec:a5:a4:aa:15:e3:55:93:8e:9d: - 69:61:40:a3:f4:b0:35:a9:71 + 00:a6:a4:76:fa:34:e5:0e:e4:85:58:89:05:ae:6d: + 34:b6:92:ee:cd:6e:94:f1:8e:2c:fc:04:f4:4d:ce: + 40:09:3b:7f:d2:5e:09:96:e7:09:05:c6:41:4a:94: + 13:92:df:4c:66:ec:bd:19:0e:b3:04:26:e5:cf:79: + d2:9d:b4:f4:da:14:32:cc:cd:e5:6e:cb:f8:c7:6f: + c0:e9:90:91:9a:0b:ec:82:ea:9b:90:b7:70:50:e7: + 17:39:81:c0:0e:87:c3:46:f1:44:0a:8c:42:54:52: + 89:37:36:a1:0e:21:61:e5:31:5c:5b:a3:24:77:70: + b2:13:18:ab:3c:5a:71:00:5f Q: - 00:b0:16:10:18:a5:47:c7:f8:6a:13:b0:e1:3b:08: - 11:92:21:b0:30:e9 + 00:9d:22:10:85:4e:88:3f:a9:64:d0:10:71:ad:7d: + 7e:25:3a:38:23:55 G: - 0d:e8:2e:4f:bb:15:ce:43:9c:a3:d1:47:4d:78:e1: - 43:b8:75:4b:8a:9d:87:d6:79:ee:31:02:26:48:21: - 02:32:9f:9e:8a:27:52:b1:67:20:e0:ad:28:b4:fc: - 2f:36:dd:f5:8b:65:81:58:41:af:d1:62:f0:d7:e1: - 02:35:b1:e2:f2:dd:6e:a3:ea:2c:78:cb:dd:2a:4f: - e5:e2:eb:d6:02:36:bb:76:28:85:1f:83:d4:98:e9: - 5f:57:fa:5f:71:82:37:be:44:31:b6:fe:43:9e:93: - 91:2a:f9:12:c0:ed:c1:0d:c1:14:7b:db:53:52:fa: - 7a:00:e3:07:07:2a:b3:fd + 1c:ed:1c:03:2d:ab:02:5f:49:0a:35:b2:71:35:b8: + d0:b8:73:de:cb:3a:f5:99:20:61:6d:ae:a8:87:2b: + eb:85:f8:a5:6e:e5:c9:b6:31:83:0c:ad:03:0b:15: + 23:93:90:be:84:8d:8f:ce:1d:30:00:64:36:80:e8: + 3e:57:ad:ea:fc:d9:10:26:fc:51:c8:d8:7e:96:17: + 7f:e8:04:24:ff:20:82:5c:b6:f3:90:47:a6:d6:49: + a0:96:51:64:62:8b:84:03:f8:2e:7d:0e:d0:60:ee: + fa:b6:22:10:07:e0:e0:15:45:82:2f:b3:5d:56:b6: + 5f:f7:64:52:d4:01:c4:e6 X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - ED:94:32:2B:1F:41:F9:66:B7:78:D2:D8:53:78:EC:8F:46:C7:37:99 + C0:07:B0:7D:84:82:84:3D:68:A0:50:2E:AD:71:8C:DE:DE:A9:D4:A6 X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:server, IP Address:127.0.0.1 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 4f:e6:32:93:f7:6f:27:27:d2:1f:9c:24:f6:8e:a3:35:87:6c: - 16:7c:a6:5a:35:82:d0:6b:22:76:b2:8f:fe:7b:8a:6b:1e:00: - 8a:af:c3:fe:1a:78:47:9d:fb:49:72:b9:7e:8e:cf:ad:a6:85: - 47:ea:a6:c2:84:cc:92:c6:5a:43:47:15:83:78:fd:e9:8b:f9: - 83:4f:59:2e:40:81:47:92:6e:c3:93:aa:09:f9:51:8f:bd:5d: - 4a:53:cf:8d:3b:e4:2d:2e:51:de:b9:82:cf:f1:17:e3:f9:ac: - a1:ea:b3:68:f4:e9:c9:e5:54:10:ae:01:1b:3f:d1:97:1b:12: - ab:b5 + ab:20:34:a6:d1:83:b3:d5:f2:62:f1:7e:d7:f5:15:18:00:41: + 2e:94:07:09:cd:65:b5:46:a3:a3:c9:60:cf:d5:f7:d2:dd:47: + 32:51:39:1e:c5:a7:80:a0:38:88:f9:77:21:ac:ae:52:c0:05: + 5b:6f:37:d5:d5:c3:57:0d:b3:c8:44:c3:5f:02:84:0d:7a:cb: + c8:9a:1c:c6:d6:6f:bc:17:93:e2:65:4a:f9:24:6d:df:a8:04: + a1:d5:00:4b:5a:b1:31:65:96:18:52:99:8d:40:b2:c6:c6:9a: + 56:13:df:aa:08:c1:df:3a:35:db:8f:79:35:5d:a2:1a:ac:28: + 4a:4f -----BEGIN CERTIFICATE----- MIIE2TCCBEKgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzhaFw0yNDA4MTYxNDQwMzhaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGU2VydmVy -MIIBtzCCASsGByqGSM44BAEwggEeAoGBAKAeWKhMAYp5sWH5rsmokCackilB9lCS -qGZ8UoBX5YhFZovv/QWqr1MhcnBbLgAFvg1tS6RXuJcl2xnddUhQ7DcgVxpo3Pn2 -Mh9H0o4GLLJRDfqGOegyD2kWlFx8wNxEn/9rLg15zGv/wY218S3spaSqFeNVk46d -aWFAo/SwNalxAhUAsBYQGKVHx/hqE7DhOwgRkiGwMOkCgYAN6C5PuxXOQ5yj0UdN -eOFDuHVLip2H1nnuMQImSCECMp+eiidSsWcg4K0otPwvNt31i2WBWEGv0WLw1+EC -NbHi8t1uo+oseMvdKk/l4uvWAja7diiFH4PUmOlfV/pfcYI3vkQxtv5DnpORKvkS -wO3BDcEUe9tTUvp6AOMHByqz/QOBhQACgYEAhH2XHQ8qXA27Pe8NMR3Kv5UK3R9H -TPwyckqPeKXoMdKT4G6XYb+4AJKk6HNBPcyeHLLPxa6cqeo9T5DSfL0KEenazOLT -K4qvWx8/M2BccM1Q4jXqcfeVRUiPo4kqrhKECaLst1K7sq/zZE1Y8FgOpSUEyMRI -ibP5GqiqKrI7jwajggE7MIIBNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBTtlDIrH0H5 -Zrd40thTeOyPRsc3mTCBzgYDVR0jBIHGMIHDgBTTZKJ4bIwfrfImefgbBSXFi2Kp -86GBn6SBnDCBmTELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNV +MIIBtzCCASsGByqGSM44BAEwggEeAoGBAKakdvo05Q7khViJBa5tNLaS7s1ulPGO +LPwE9E3OQAk7f9JeCZbnCQXGQUqUE5LfTGbsvRkOswQm5c950p209NoUMszN5W7L ++MdvwOmQkZoL7ILqm5C3cFDnFzmBwA6Hw0bxRAqMQlRSiTc2oQ4hYeUxXFujJHdw +shMYqzxacQBfAhUAnSIQhU6IP6lk0BBxrX1+JTo4I1UCgYAc7RwDLasCX0kKNbJx +NbjQuHPeyzr1mSBhba6ohyvrhfilbuXJtjGDDK0DCxUjk5C+hI2Pzh0wAGQ2gOg+ +V63q/NkQJvxRyNh+lhd/6AQk/yCCXLbzkEem1kmgllFkYouEA/gufQ7QYO76tiIQ +B+DgFUWCL7NdVrZf92RS1AHE5gOBhQACgYEAiI5dKx7GRhg3VMB+hUyGpoIvWD0M +fmr3Oia+M8owdqwEglezf3PfzxJeHw4UrsF41qwg1VKncHtIGCI71UfrpyJcsBr7 +v/Da62VTB9KxH4hfbwPFQZOaZHhuyspyWy3oQXltVzpY3+OaK2zEwmWIXNyBcIBx +RFpf3sHH/9J+FtKjggE7MIIBNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBTAB7B9hIKE +PWigUC6tcYze3qnUpjCBzgYDVR0jBIHGMIHDgBQT+nJn/jQFmsk+YdKR1roDZRuK +mqGBn6SBnDCBmTELMAkGA1UEBhMCVVMxEDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNV BAcTElBhbG0gQmVhY2ggR2FyZGVuczEUMBIGA1UEChMLWmVyb0MsIEluYy4xDDAK BgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVyb0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcN -AQkBFg5pbmZvQHplcm9jLmNvbYIJAPnm+BGwt4UAMBcGA1UdEQQQMA6CBnNlcnZl +AQkBFg5pbmZvQHplcm9jLmNvbYIJAM6KZ+2Wb362MBcGA1UdEQQQMA6CBnNlcnZl cocEfwAAATAhBgNVHRIEGjAYgRBpc3N1ZXJAemVyb2MuY29thwR/AAABMA0GCSqG -SIb3DQEBCwUAA4GBAE/mMpP3bycn0h+cJPaOozWHbBZ8plo1gtBrInayj/57imse -AIqvw/4aeEed+0lyuX6Oz62mhUfqpsKEzJLGWkNHFYN4/emL+YNPWS5AgUeSbsOT -qgn5UY+9XUpTz4075C0uUd65gs/xF+P5rKHqs2j06cnlVBCuARs/0ZcbEqu1 +SIb3DQEBCwUAA4GBAKsgNKbRg7PV8mLxftf1FRgAQS6UBwnNZbVGo6PJYM/V99Ld +RzJROR7Fp4CgOIj5dyGsrlLABVtvN9XVw1cNs8hEw18ChA16y8iaHMbWb7wXk+Jl +Svkkbd+oBKHVAEtasTFllhhSmY1AssbGmlYT36oIwd86NduPeTVdohqsKEpP -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1.pfx b/cpp/test/IceSSL/certs/s_rsa_ca1.pfx Binary files differindex d5512e4234c..3a63f5d1f51 100644 --- a/cpp/test/IceSSL/certs/s_rsa_ca1.pfx +++ b/cpp/test/IceSSL/certs/s_rsa_ca1.pfx diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.pfx b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.pfx Binary files differindex 39fa6c7e96c..2316e29712f 100644 --- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.pfx +++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn1.pfx diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.pfx b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.pfx Binary files differindex 63cbb1e626c..f8b12b4bf76 100644 --- a/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.pfx +++ b/cpp/test/IceSSL/certs/s_rsa_ca1_cn2.pfx diff --git a/cpp/test/IceSSL/certs/s_rsa_ca1_exp.pfx b/cpp/test/IceSSL/certs/s_rsa_ca1_exp.pfx Binary files differindex 686ce5ba7ad..62b1b6f5d2e 100644 --- a/cpp/test/IceSSL/certs/s_rsa_ca1_exp.pfx +++ b/cpp/test/IceSSL/certs/s_rsa_ca1_exp.pfx diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_priv.pem index 7d59754928b..2621f32ea84 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALulBH1rmk/AN6KH -EdZEmcEb+nIAu5Fm0ccOGOY7awVV+eaCKk9iAlxmDBJXjc4gtz7yxtru3t0ZQo1k -TWlPSTCThLhUjvCc8YquLN/+TOPXWvR68a+TzzA4u7FkcDmcWMuiNB1swj4Vn62p -8ul+VCjKQhuRArAX+ANhwxf8CWu1AgMBAAECgYA7BNMds6tsbBPTndIhZ6BImcky -9EIKoKFYj3mLaKLnobwhIU23fCcr8rjXSAyFCcs5FFkxYTJdrmU9XY/vkI1/HPKF -UD/p2MEtewbbfs0xpcwvfZZzgZpJxMWYFLzL35N6FAYvSFsjIk2ezCdHVofuUft+ -Jmvp2miLKAoEEhum4QJBAN7jvEihXqKqg4ZrQKtK4gFroe6yVBYGPhFTBqACrRl7 -Nsv4jzjKdV/Xgz2Agky/xgIzJ6xD7SDVBXaSCb0guo0CQQDXhPNrAflZFiFLpOCk -Twnu5lojjZkdj/lIKqWMC61E0GvSaqiDTCes5Ie+0s7yf5kEkVqtV3dqHC3Wdir+ -t3/JAkBnM9l1Y8qW1Q8LSVPrPEQDVlvnUwjeHcvVZ7UUl8igmM2ZiiB+sjfAxeAN -tRggA1fiot8Gw3jjj970tM/vk1ztAkEAvDOflZx9sGwA21u5yAI1fGev40gto4Es -gPas5iT0RBl1bqQxT6bbJsHSQLM6gM0oRLLh6mltID5HUPaUCScY8QJAN5OSf4Ad -Zd0FnCDLjH3JnySL/8aGwJKyjUhY2KoCafrzFZh0k00RIvxOtOcuiqOWZAt87Clh -IJXbEIDizt+WtQ== +MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAK7ad3joIjRei58M +Jf+PY4KiUdANz/W2lyVCCu/oZTdDpExkKVly+hyS8OlWesiC6MvmL8oFWOSrnOUs +aK1kT96dmZH9kyME0t3FKxyAdF1nXNiQPCkRGG1YJI/4qEeelRqMbZt2k1AU58Tn +jj2cIgZZcVvTQtXPWoWJ3gcAy8/hAgMBAAECgYAuyJdUy09zkaRr3rVABp6KcmHP +eBKfXMZeGqiQfi6utbN9GQOTQlc3U/2PgSsDATvGaoV42Stqq5wkGVi8o+1WYqAY +VcNSq8IjScgGWJCYMReD3kJgd0ReNHgiZeDuBfm0U1SeCg4r2j53sJqA0ntgijmZ +7mXQmVGFSQ3i+KnbUQJBAN2QLo2fZIpqscEajsm2gq3tQyThuPwEfMT9rH3Yh/WP +SJwhO4liVTM6i8yBhaiFh7/MW3tdhBEgcDv7YfKwbS0CQQDKB71BNb3R6xkyzqos +i3m7D4j0bFc1z+ZX0KqophVf4kQmKACVMqVLQTBNG608YuKVHd4FLe/HgqXb3Jmo +2SYFAkAweDdG8iSrhzXFucqc5BlodSwoKF0wfMbSzW/rw+/ST3sh9L8yidl7sIYe +wgL8X+HXmpw0u7uFh6Ql6xN9ZQ0tAkALnypZ5/eFbdrDO3Q6n8Ne6WPde6YAqHb9 +sjk+/l7YZzG4aDCwZHtxusxGg0MR6DZUkaVF8wCKH4/e9++28NbpAkBidi6rmM2i +hXQB/E8tU4Dr6oU5bzWJJizQc/A2s39GrnXyDevAoxlYJjbsKPTH8MHOSqH+PXm3 +qLk3Zgc5xz0N -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_pub.pem index 261fb4bc6d1..068dbe7f879 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1_pub.pem @@ -5,63 +5,63 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=127.0.0.1 Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:bb:a5:04:7d:6b:9a:4f:c0:37:a2:87:11:d6:44: - 99:c1:1b:fa:72:00:bb:91:66:d1:c7:0e:18:e6:3b: - 6b:05:55:f9:e6:82:2a:4f:62:02:5c:66:0c:12:57: - 8d:ce:20:b7:3e:f2:c6:da:ee:de:dd:19:42:8d:64: - 4d:69:4f:49:30:93:84:b8:54:8e:f0:9c:f1:8a:ae: - 2c:df:fe:4c:e3:d7:5a:f4:7a:f1:af:93:cf:30:38: - bb:b1:64:70:39:9c:58:cb:a2:34:1d:6c:c2:3e:15: - 9f:ad:a9:f2:e9:7e:54:28:ca:42:1b:91:02:b0:17: - f8:03:61:c3:17:fc:09:6b:b5 + 00:ae:da:77:78:e8:22:34:5e:8b:9f:0c:25:ff:8f: + 63:82:a2:51:d0:0d:cf:f5:b6:97:25:42:0a:ef:e8: + 65:37:43:a4:4c:64:29:59:72:fa:1c:92:f0:e9:56: + 7a:c8:82:e8:cb:e6:2f:ca:05:58:e4:ab:9c:e5:2c: + 68:ad:64:4f:de:9d:99:91:fd:93:23:04:d2:dd:c5: + 2b:1c:80:74:5d:67:5c:d8:90:3c:29:11:18:6d:58: + 24:8f:f8:a8:47:9e:95:1a:8c:6d:9b:76:93:50:14: + e7:c4:e7:8e:3d:9c:22:06:59:71:5b:d3:42:d5:cf: + 5a:85:89:de:07:00:cb:cf:e1 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 5A:08:77:65:5C:5E:98:9C:FE:5A:79:9A:F2:C5:81:F5:5E:EB:0F:AE + B1:C4:DC:01:16:D5:A1:90:59:31:7C:A8:0F:35:5E:30:55:B0:25:64 X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - c8:3b:dc:9f:2d:9f:b7:a1:79:69:cc:f1:7e:af:bf:37:da:37: - 8f:99:39:70:e8:67:8e:a0:da:0d:8a:75:68:7a:01:bb:7c:c7: - 35:67:8d:da:22:53:72:08:cd:cc:be:40:12:a3:d6:61:fa:52: - fb:a7:48:9f:2f:6e:d2:90:57:7d:c2:8c:cf:f2:45:57:3d:9c: - ac:6c:57:be:89:91:bb:a6:3b:9f:63:b8:b5:a0:7d:43:e5:5f: - 05:3f:f2:dc:ce:b5:59:79:1a:61:78:48:78:b3:a2:24:a8:b5: - 51:0e:da:39:4d:b3:df:d3:53:3f:62:05:c4:85:3a:22:a4:2f: - ec:7a + 52:45:01:59:0e:c3:04:99:b0:05:87:74:4f:a7:21:c1:23:de: + 5a:b1:a7:69:fb:1a:28:1a:fe:10:95:5a:03:a9:3c:71:70:34: + 86:50:37:49:30:da:6a:85:d7:2d:07:80:02:c9:37:32:ed:ff: + 92:18:a3:87:ea:bb:ea:0b:b8:31:07:92:ed:b6:80:23:3c:1a: + 94:39:a9:94:c4:50:b9:17:83:de:40:15:8b:02:b9:da:fa:95: + 0e:6a:0e:77:0d:c9:0a:a4:42:a8:48:27:f5:c5:14:90:b4:d0: + 71:5e:06:c4:23:68:8c:3d:74:be:45:10:57:9a:8c:44:8b:03: + 74:07 -----BEGIN CERTIFICATE----- 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 -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_priv.pem index 1558f3a98bf..f657842186b 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALy+FsEDzmeOMFuO -0J/5eKgHaNESkBM3DNU9u+9/JW6LJgegL2J5pdTGpm4a/PByuL4OmhL7Q8eDiOfU -Gz1vvzUtV4oPSlPyfcyT8rW7V8/pnoOnEz/TtCDUecoqy4pZudHxZNoa7T2e7XF6 -+6ecpuhTmiYizCogafwrbOjRKzIzAgMBAAECgYAiEFyi8UDrR6pKm/fjJ28zREMS -mLsP/LuAMOgeTWBAFzUB41Mp/rKDOGcJMC2+Z7YX9yKvklGlTIQE8y8HY4eqjWNn -ddYC4O61Aea1LcDt1bdWrgNDwgE84WzgdAjkgy3XkWJvzs8+jyo2FfKOGzuDz/Uv -AhzDsDJrOLsZ8oZKgQJBAPdED/ovKIlCsixKsXnSXgOesSyoCaouR6kRYB2BcjjR -Gwh3LaNcgzFM1Xo3cbIQxY3RZ1iP0TlFYxn2xDHG/pECQQDDaNIaAk6rbQO1lEww -a6eakVhK7xzEupidNwa7RkXsvYqDl9pTDTE+FNn8mNX0ExVHRxRXLvnS1sfACAyb -Ow6DAkEAuWHnFKysmJRPnxN1Eh+dattcfF2TuWqvQVuMkzKM33ou6V7o8ZSXq6uu -Vc4hyN34L0ZzVBunQmf6T+oJ2EQYcQJAUc1Qnti2bCbvtZTGLEL038zWhFAC4Awp -FS9S3xT08r0J/jqUh83u/kkmVAr7DfjrIHKN/k1JAc0tw6La/CTF1wJASOsd5W1/ -ijdBsuihY5rnLrLk5eQwuirfkxSXdxvw/JGzCT/Lig4KETzUugPko1kS0lZ+XdIO -hKbMY3AgX4//Sw== +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAM6QNl7ef5qASNXk +YOHh4zKM4GdXA3i8xW2aCnhdjWbTndfWlrqkwTzn6EHLRj7gLtMykMa6lbMdu1Dy +pkkG9IzwTFJuCiKRX4an7R2LKfzjtHJ4na6jUWRYmu6CMN2Nrfw5ihMnskqbzbl4 +FNmyea9Z5SbKTyTOM7vnSIyE8r2BAgMBAAECgYBOgajobY/53H/SKzZXI08CS2CO +Zhe/r58phL4t+QBg8FSxT7GBxlRbHZi8SNGt2+5v/mvf29JBfS9QGKjyYF5Y8711 +403R5F1hP0HbuqD6cUwiRplz4uuJZE4YcoThnmcHG0dgzrbk3Dbcuix0ES1WKtsB +6rxjkdbDeluhbfkCQQJBAOfxSpYZ88UYtA91DBd8JWpvn9pdHX+h5Fo2fDw53KPu +ifRVcWcCbQLDV0mBaCgHYGGpD4F+HPiQu7rx5Nsfhg0CQQDj/QiTXhojPAjwKyjM +TsgImPDZFdOnVG9tcHFx26nDtpeI2WeumeAdYXKTHz1voKXLc9R17tqMT7IXYYKw +FwxFAkA+LqBScY67Do5nfnfJbA0T5e0zO7eG2j5AOU9BTjnq8S6nBKksdqgHD5u9 +JyZnZOLgC9UOYGMf+J171xIF9QOZAkEA42L3LqPoRcQW1hL1ue/JKmn/rURLuNRJ +3kkLnJeNlhmCwYa0Fjx6flM2xu2dhLwhH+4CtSzo5JCH+zHR+nbCUQJAUDwHJ8CM +Ww7092DXNtPofVkpS8Bsz0q07J2ZOhTK9R9fSnrIKNQ14/9wQ7h9PDjpyyXdDLYF +yYBnIS1/ClN7qQ== -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_pub.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_pub.pem index ec0fb9ec064..4d5ec02ba0c 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2_pub.pem @@ -5,63 +5,63 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=127.0.0.11 Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:bc:be:16:c1:03:ce:67:8e:30:5b:8e:d0:9f:f9: - 78:a8:07:68:d1:12:90:13:37:0c:d5:3d:bb:ef:7f: - 25:6e:8b:26:07:a0:2f:62:79:a5:d4:c6:a6:6e:1a: - fc:f0:72:b8:be:0e:9a:12:fb:43:c7:83:88:e7:d4: - 1b:3d:6f:bf:35:2d:57:8a:0f:4a:53:f2:7d:cc:93: - f2:b5:bb:57:cf:e9:9e:83:a7:13:3f:d3:b4:20:d4: - 79:ca:2a:cb:8a:59:b9:d1:f1:64:da:1a:ed:3d:9e: - ed:71:7a:fb:a7:9c:a6:e8:53:9a:26:22:cc:2a:20: - 69:fc:2b:6c:e8:d1:2b:32:33 + 00:ce:90:36:5e:de:7f:9a:80:48:d5:e4:60:e1:e1: + e3:32:8c:e0:67:57:03:78:bc:c5:6d:9a:0a:78:5d: + 8d:66:d3:9d:d7:d6:96:ba:a4:c1:3c:e7:e8:41:cb: + 46:3e:e0:2e:d3:32:90:c6:ba:95:b3:1d:bb:50:f2: + a6:49:06:f4:8c:f0:4c:52:6e:0a:22:91:5f:86:a7: + ed:1d:8b:29:fc:e3:b4:72:78:9d:ae:a3:51:64:58: + 9a:ee:82:30:dd:8d:ad:fc:39:8a:13:27:b2:4a:9b: + cd:b9:78:14:d9:b2:79:af:59:e5:26:ca:4f:24:ce: + 33:bb:e7:48:8c:84:f2:bd:81 Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 1A:8F:B8:95:A0:80:AF:F1:2B:CB:0B:E0:1F:E5:8E:D6:23:4A:9C:04 + BA:FC:0E:C3:70:34:B5:AC:30:A2:B7:3B:CB:47:5E:24:4E:B8:51:16 X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 49:35:59:63:c6:4e:2d:c9:a1:b9:ca:9f:f0:4d:ca:dc:24:62: - 3b:5e:ad:a0:da:e9:b7:39:82:ca:e4:06:aa:3e:8a:92:1b:ec: - 87:50:ba:5f:aa:bb:44:dd:3e:a0:8e:ca:86:3d:af:cd:81:e2: - 58:77:a0:d1:7e:c7:43:89:58:27:9c:3e:b7:f9:50:5c:60:a2: - 7d:73:ca:cb:4b:73:e9:8d:d7:97:81:44:b8:db:d0:68:77:9c: - 6a:2f:0a:f0:c9:a0:68:47:54:35:94:58:5d:6a:2d:e5:a9:50: - 76:4f:48:2d:a2:89:5f:2a:53:4c:9b:48:33:99:ba:27:43:38: - 8a:e7 + 53:fb:d0:7d:aa:83:23:f8:1b:30:60:27:54:7f:60:f4:ca:83: + cd:a5:9a:65:78:ee:c4:50:a3:1e:88:fa:aa:a2:6d:71:5a:70: + 92:fa:59:06:44:c4:70:1b:c9:32:a0:3c:0f:48:1c:06:1f:61: + b9:70:97:4e:6a:cb:e9:68:c8:fd:55:40:0a:c4:ea:08:a7:91: + 8d:bc:81:40:d6:a5:56:bc:e8:cf:8a:3b:cc:e4:4e:36:57:f0: + 14:56:6e:6f:1b:66:d3:61:e0:df:29:2d:1d:d0:1f:ac:80:2b: + e2:d0:a9:94:26:ea:c0:a5:09:53:5d:cd:2c:e4:a6:18:f4:13: + 9e:cc -----BEGIN CERTIFICATE----- MIIDqzCCAxSgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHcxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHcxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTETMBEGA1UEAxMKMTI3LjAu -MC4xMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAvL4WwQPOZ44wW47Qn/l4 -qAdo0RKQEzcM1T27738lbosmB6AvYnml1Mambhr88HK4vg6aEvtDx4OI59QbPW+/ -NS1Xig9KU/J9zJPytbtXz+meg6cTP9O0INR5yirLilm50fFk2hrtPZ7tcXr7p5ym -6FOaJiLMKiBp/Cts6NErMjMCAwEAAaOCASIwggEeMAkGA1UdEwQCMAAwHQYDVR0O -BBYEFBqPuJWggK/xK8sL4B/ljtYjSpwEMIHOBgNVHSMEgcYwgcOAFNNkonhsjB+t -8iZ5+BsFJcWLYqnzoYGfpIGcMIGZMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxv +MC4xMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAzpA2Xt5/moBI1eRg4eHj +MozgZ1cDeLzFbZoKeF2NZtOd19aWuqTBPOfoQctGPuAu0zKQxrqVsx27UPKmSQb0 +jPBMUm4KIpFfhqftHYsp/OO0cnidrqNRZFia7oIw3Y2t/DmKEyeySpvNuXgU2bJ5 +r1nlJspPJM4zu+dIjITyvYECAwEAAaOCASIwggEeMAkGA1UdEwQCMAAwHQYDVR0O +BBYEFLr8DsNwNLWsMKK3O8tHXiROuFEWMIHOBgNVHSMEgcYwgcOAFBP6cmf+NAWa +yT5h0pHWugNlG4qaoYGfpIGcMIGZMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxv cmlkYTEbMBkGA1UEBxMSUGFsbSBCZWFjaCBHYXJkZW5zMRQwEgYDVQQKEwtaZXJv QywgSW5jLjEMMAoGA1UECxMDSWNlMRgwFgYDVQQDEw9aZXJvQyBUZXN0IENBIDEx -HTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tggkA+eb4EbC3hQAwIQYDVR0S -BBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAAATANBgkqhkiG9w0BAQsFAAOBgQBJ -NVljxk4tyaG5yp/wTcrcJGI7Xq2g2um3OYLK5AaqPoqSG+yHULpfqrtE3T6gjsqG -Pa/NgeJYd6DRfsdDiVgnnD63+VBcYKJ9c8rLS3PpjdeXgUS429Bod5xqLwrwyaBo -R1Q1lFhdai3lqVB2T0gtoolfKlNMm0gzmbonQziK5w== +HTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tggkAzopn7ZZvfrYwIQYDVR0S +BBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAAATANBgkqhkiG9w0BAQsFAAOBgQBT ++9B9qoMj+BswYCdUf2D0yoPNpZpleO7EUKMeiPqqom1xWnCS+lkGRMRwG8kyoDwP +SBwGH2G5cJdOasvpaMj9VUAKxOoIp5GNvIFA1qVWvOjPijvM5E42V/AUVm5vG2bT +YeDfKS0d0B+sgCvi0KmUJurApQlTXc0s5KYY9BOezA== -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_priv.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_priv.pem index 9b8852e9b8a..afbbc3344ca 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAKZI/y2AXF/H6yPk -hoyzY5rMwiZxH5j46x1ci20xlnm+D0ZihGR16WyP0flfBujoVBj0OacB/v1R0Lz8 -2QcJE5FztbvYTJvzT0soVfofMrcB5SuJ+y/h9ow7z5PnsiFrMHUOYgPHJOtlCRE1 -51F7AbChFIDxGzLjgwpuFHmgKJORAgMBAAECgYEAhA6u0SUCt3JetKeVj4Ib1WFN -wxfN3z+4AR5xACwEc/TTzrMIr3vRAE2LlP65zxhLSXIToyV7qxRhsOUhOmwj4/Tf -9nOlnRozqjhLGtqSHH5CtLUyiU2uPx0tfaJ9OEviIoXXZP0YwZk6Uorw66O9QAOY -oCscL7WVBdixwFlLzo0CQQDU7FGxJIgdhiHbW36xx4ZRno2f28JRWAaFW7LTt4oa -xqFGLfHVehevTAhUUic/ksb2huly5mOI9HMhyNj2rs/DAkEAx+01+mCD3N1mQKkc -zKnLUZTVRPBtkZrsQlhrXtEKHo+ZsXC8wX2U/hZCga6NVZxaL4Kop8gfteb3hIb1 -+HQOGwJBAKV1v0XZDa1jvoun3hxo4IgsngHL1IVB0k9votfDmR6VnF3c9kDeT+l5 -PD/KV5Wfid2pmWAgiNi0nYNzgKax0eECQQClH1YlpPFDydhaL1KJ9vLmPnamqazV -RY88fKqxdRVWiGP4GZTMelxEPz5OvUweGTSjaNbDPJZ0Nn7YBl/BBJlhAkAsWpwC -2msg2BZgD4iQeKFY9kPyiz0wKF55WOw4Ls0r+mtJOUiTaBph7Av6NyWeL1eA4t+M -fL469PZvDSTWzm1n +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAM1yCf0J8zdyrNQA +wONxr0Ec/tyv/tdFmWCAyMJeJkwhg6taP+qWZqYxK8SI6HJDRuY7bpFSiEUwuX+I +PE/db/NYhHMlUbxGUrNPiAwSxvY6ZRmwAjx/2oiR0WH2yyAoi9rJMc5b3kVRC2z6 +R53/uUBQL9e9e613nN1hi2s+yPcPAgMBAAECgYEAp+ZjM2FGXDJj/H8BJOBsEhLY +VxOeeeBvkOavK+o18lIRgaCoS9fO3FOjKWOaVIeXEeHQYwPISoOflhKI99xI+Gh6 +q/+odVsKoQOrJp7idYPcwQScuu9uPMFRiecwjNFU7BHA+yw6XoTXqkKDPlXueJAj +HQeLcq8GYJEeQiESH0ECQQDs5YJeRQYRh2t1L/yZuvCqYoOelX8N5Ot1iv1IpYIR +rpQ2MFx9qTbvuK9aUGHcVN6GgvbUV7AwegQVpOUMaDSdAkEA3gNBGnZqGM3mUTRV +709znjk+E7rSuTp/Zuw2wOjqXTaIztK7t8pSfCLo8AI+RiCEg5tNh9y0O4HBl3ag +M5TMmwJALYB35fuECuHj9gJdlnmduFxrw44bdWO/BjjIJagEr7jEpxPq8AgMkUb8 +B3DhGx0CEPwexPKC2QzWtAGULSnm0QJBANArxwDUJbmqXxqncyiYnDWxQPbpB6ut +IUbVmKWcAB11BCTCTkgQSvWhGj/qKpBA72Aj4DfTh6AAlBC8p4yWKp8CQDG0m+Cq +TN9kD0XGYRNl98iq3pU9rv0j3GwVNLg2uawg2IXTOiLylybRatQbAZRguO78jeSx +r+ag78ptrAjUn1w= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_pub.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_pub.pem index e775d530115..e952599684b 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_exp_pub.pem @@ -5,66 +5,66 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT + Not Before: Aug 19 14:40:37 2014 GMT Not After : Dec 31 00:00:00 2005 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:a6:48:ff:2d:80:5c:5f:c7:eb:23:e4:86:8c:b3: - 63:9a:cc:c2:26:71:1f:98:f8:eb:1d:5c:8b:6d:31: - 96:79:be:0f:46:62:84:64:75:e9:6c:8f:d1:f9:5f: - 06:e8:e8:54:18:f4:39:a7:01:fe:fd:51:d0:bc:fc: - d9:07:09:13:91:73:b5:bb:d8:4c:9b:f3:4f:4b:28: - 55:fa:1f:32:b7:01:e5:2b:89:fb:2f:e1:f6:8c:3b: - cf:93:e7:b2:21:6b:30:75:0e:62:03:c7:24:eb:65: - 09:11:35:e7:51:7b:01:b0:a1:14:80:f1:1b:32:e3: - 83:0a:6e:14:79:a0:28:93:91 + 00:cd:72:09:fd:09:f3:37:72:ac:d4:00:c0:e3:71: + af:41:1c:fe:dc:af:fe:d7:45:99:60:80:c8:c2:5e: + 26:4c:21:83:ab:5a:3f:ea:96:66:a6:31:2b:c4:88: + e8:72:43:46:e6:3b:6e:91:52:88:45:30:b9:7f:88: + 3c:4f:dd:6f:f3:58:84:73:25:51:bc:46:52:b3:4f: + 88:0c:12:c6:f6:3a:65:19:b0:02:3c:7f:da:88:91: + d1:61:f6:cb:20:28:8b:da:c9:31:ce:5b:de:45:51: + 0b:6c:fa:47:9d:ff:b9:40:50:2f:d7:bd:7b:ad:77: + 9c:dd:61:8b:6b:3e:c8:f7:0f Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 22:5D:51:5A:6D:84:EA:3C:BD:6C:E2:41:B5:5E:BA:55:38:90:20:22 + 3B:80:26:A5:84:34:43:D0:E7:8C:EB:25:E4:1F:38:4B:A3:62:3B:FB X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:server, IP Address:127.0.0.1 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 3c:82:81:4c:bb:bc:a6:07:a6:44:88:4c:d3:9c:d5:e8:cb:58: - 1e:ee:89:c8:86:d3:2a:0a:ee:34:36:fb:76:ad:62:d3:77:e0: - 90:31:0e:03:cf:69:da:15:7f:b6:4f:b2:b6:9e:90:fe:8d:fd: - a0:68:35:eb:8d:9c:7b:3c:41:38:91:a6:e5:49:4a:02:2a:e8: - ec:b5:47:3a:e0:aa:e2:a0:b3:8e:00:df:69:20:93:b0:cc:07: - 5f:02:83:ed:c2:62:57:20:63:e9:3c:d7:78:00:bf:05:c1:3f: - aa:01:7a:c4:7f:ed:2f:57:0f:fd:90:1f:25:04:2c:e3:58:21: - 4f:5d + bc:6c:33:73:a9:2d:04:32:34:bc:d9:f4:76:03:80:81:38:e7: + 08:65:ef:c7:e0:bc:6b:03:32:c8:0b:3c:a6:3c:a0:e5:0f:bf: + 14:13:87:29:93:95:db:4b:e4:ab:99:19:13:c3:32:45:50:b6: + 90:77:78:d7:39:f2:54:ba:bb:80:35:84:6a:48:c0:c9:ef:10: + 8e:31:1c:63:ee:d0:d7:ef:c2:28:82:f5:05:9f:ee:b9:9c:ad: + 44:20:d8:ed:df:ee:08:5e:a0:00:f9:02:4c:e4:2a:47:98:92: + e0:7d:fd:17:31:6a:9a:a9:b1:c6:80:3a:40:db:73:7a:66:23: + d7:d0 -----BEGIN CERTIFICATE----- MIIDwDCCAymgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0wNTEyMzEwMDAwMDBaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0wNTEyMzEwMDAwMDBaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGU2VydmVy -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCmSP8tgFxfx+sj5IaMs2OazMIm -cR+Y+OsdXIttMZZ5vg9GYoRkdelsj9H5Xwbo6FQY9DmnAf79UdC8/NkHCRORc7W7 -2Eyb809LKFX6HzK3AeUrifsv4faMO8+T57IhazB1DmIDxyTrZQkRNedRewGwoRSA -8Rsy44MKbhR5oCiTkQIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -Il1RWm2E6jy9bOJBtV66VTiQICIwgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNcgn9CfM3cqzUAMDjca9BHP7c +r/7XRZlggMjCXiZMIYOrWj/qlmamMSvEiOhyQ0bmO26RUohFMLl/iDxP3W/zWIRz +JVG8RlKzT4gMEsb2OmUZsAI8f9qIkdFh9ssgKIvayTHOW95FUQts+ked/7lAUC/X +vXutd5zdYYtrPsj3DwIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +O4AmpYQ0Q9DnjOsl5B84S6NiO/swgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO ggZzZXJ2ZXKHBH8AAAEwIQYDVR0SBBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAA -ATANBgkqhkiG9w0BAQsFAAOBgQA8goFMu7ymB6ZEiEzTnNXoy1ge7onIhtMqCu40 -Nvt2rWLTd+CQMQ4Dz2naFX+2T7K2npD+jf2gaDXrjZx7PEE4kablSUoCKujstUc6 -4KrioLOOAN9pIJOwzAdfAoPtwmJXIGPpPNd4AL8FwT+qAXrEf+0vVw/9kB8lBCzj -WCFPXQ== +ATANBgkqhkiG9w0BAQsFAAOBgQC8bDNzqS0EMjS82fR2A4CBOOcIZe/H4LxrAzLI +CzymPKDlD78UE4cpk5XbS+SrmRkTwzJFULaQd3jXOfJUuruANYRqSMDJ7xCOMRxj +7tDX78IogvUFn+65nK1EINjt3+4IXqAA+QJM5CpHmJLgff0XMWqaqbHGgDpA23N6 +ZiPX0A== -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_priv.pem index 2fc63e0dbf7..d176d88e4a2 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMeHA4gTTGDqiBbc -H8EcA9K2gtjwRVkP8ft3/APEUKPaP0oTVB0nI11w1TTbQTOeNF9FP80KZ4QtsbIM -F8sncQCQ1UCfH38B8Lw05SinYWxamFBBMX+Tykwd+vyUOn6UaXAbmMkcLN5NkDJl -I1gBkdZ3e4VauwQgAyWb6wlQIi8xAgMBAAECgYEAwlJA4z8ATQc9YR4jIvy40HgF -+WgP8gxwfJu/ap/AdcPxjaBDdF0QuUlRrDe5SZ9TnFGiMHxokre57xCN/8I67zuU -T9i0k21R1VnaiuvbWORCRThp8wCXeLCWPa97U4kmYhTd0d0NL/RccR4ipmCt4V5c -hPZsy4bvSUBOJD+ZGp0CQQD0LC3Csyjfapd00JfXorxTRHNQO35IiWjCXJ6EZzDx -6Q4D6cz9xfwypEINAKVZQBq4ce5n2i+b4N5ug49ALgGDAkEA0TE4UXY9G41XH6zX -mewchPuL4SAfCUPkH6xAep0wXJrZi+HMnWetZodG3iu4YCnG9adOglfP3FM1pcm9 -fl7yOwJBANkev8I11c501iDFq3/P8W6Jm5Bolq6hoUnTWhGaQOebuR65s9KlTtEp -RqKRRHbMjfYdOUWXumX920yiJ6uGPUkCQQCQ6l/xTs+WPpuUPdA9uOso1HlaQz48 -1OM7bcBdMHdIL5104b81a5Ub6aqWTgMz2r0RgA1LDjnYj2wipVa4LF3xAkAq3rlZ -JmDasqLbys4IKGYQGluFBWIUyBU+GcT5e+ehadyql+Nsi/5HNJrS/RDJoSbRkQpH -bnBtJZ4MOIZFgXiw +MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAL/EpjUTelDzPxWJ +HyoSR9AGRKzhMB876Z/ud83YOqLj6MX03WfqvAXS8qg/tg9WppbeAzOjJs7+iFUJ +OoN0dwSSZcPh1sdEimA2ZJxRIa5yCtJT2ViXoFfvCYRWnpkbzyWryMPCd+V08r1K +ajkoxfu4yiCSFHd+xKH6XqCDx2fNAgMBAAECgYA/6vfLMRbP7IPWVcIBb95nw+8Y +AGbdwkZ4fC+KeMvyhyyK7rbtcBwDhPBEjBfOvP8BwjYm+/Zvf/9I+K58KlGQrLsT +CmO7rcmnWmlHlSMfg64Zo0UInBF8T+FDJZjKoAMsAqXwwa/eZbnyPF+U3MK8pee4 +bRoCBPLiWsjMi5vVsQJBAOZDLw+cc/+kVto84wgFwaOIH7LSO/fzxOjc//kML9bC +0ntFlwKC2sNpa57HGb68WdAuBxOxta6mJ62rZolnCysCQQDVM/nHadXOYC/Yj8Tu +CmKT8PBl4ixonW2lfkiQD2KOiBUOFMjPg2iqOCyEGQ2Mu2B1qTK0UEwpaSmObsrr +avznAkEAwZXWKO/F7jUB9/ScgpAkXhIBZFuvoyREdennIkCGr62XO6Aj9y6AMS2e +Fx0YnezILWek93++WRjD3xRs3jPNhQJAPqV0GpVNnsOCq5arHertRl1Ath88P00q +37r4pWPv6MOxtB6FVvxc789rvTEDWzvfvxMFdBg4GN7uuAx0EbKxNwJAF476RB9/ +RBYA87+Lhyq4KhHNFsw2VG06DI18CZnGgdUoEu+a/KAwfucjGKZChBAcfpQm82x0 +6KHxPY7dhmExpQ== -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_pub.pem index 27a90aac61c..87d6f9c41f5 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca1_pub.pem @@ -5,66 +5,66 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:35 2014 GMT - Not After : Jul 8 17:17:35 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:c7:87:03:88:13:4c:60:ea:88:16:dc:1f:c1:1c: - 03:d2:b6:82:d8:f0:45:59:0f:f1:fb:77:fc:03:c4: - 50:a3:da:3f:4a:13:54:1d:27:23:5d:70:d5:34:db: - 41:33:9e:34:5f:45:3f:cd:0a:67:84:2d:b1:b2:0c: - 17:cb:27:71:00:90:d5:40:9f:1f:7f:01:f0:bc:34: - e5:28:a7:61:6c:5a:98:50:41:31:7f:93:ca:4c:1d: - fa:fc:94:3a:7e:94:69:70:1b:98:c9:1c:2c:de:4d: - 90:32:65:23:58:01:91:d6:77:7b:85:5a:bb:04:20: - 03:25:9b:eb:09:50:22:2f:31 + 00:bf:c4:a6:35:13:7a:50:f3:3f:15:89:1f:2a:12: + 47:d0:06:44:ac:e1:30:1f:3b:e9:9f:ee:77:cd:d8: + 3a:a2:e3:e8:c5:f4:dd:67:ea:bc:05:d2:f2:a8:3f: + b6:0f:56:a6:96:de:03:33:a3:26:ce:fe:88:55:09: + 3a:83:74:77:04:92:65:c3:e1:d6:c7:44:8a:60:36: + 64:9c:51:21:ae:72:0a:d2:53:d9:58:97:a0:57:ef: + 09:84:56:9e:99:1b:cf:25:ab:c8:c3:c2:77:e5:74: + f2:bd:4a:6a:39:28:c5:fb:b8:ca:20:92:14:77:7e: + c4:a1:fa:5e:a0:83:c7:67:cd Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - BF:D3:42:A7:69:2F:12:F5:0D:C7:38:31:0E:2E:71:B5:9D:D2:19:93 + A6:42:AA:17:04:41:86:56:67:E4:04:64:59:34:30:C7:4C:6B:EF:A4 X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:server, IP Address:127.0.0.1 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - bf:f2:6e:79:3f:4f:34:4d:56:20:94:48:e2:c6:38:09:8e:f4: - 6c:b4:53:bb:87:0c:12:73:15:19:ac:30:a6:9e:c8:30:1c:83: - 4c:7a:54:90:96:39:fc:f3:2c:a2:66:71:87:c6:fd:d6:ce:f7: - 46:ab:76:53:00:b4:e5:8b:d2:29:be:36:ea:eb:07:6a:08:f5: - c5:e9:29:74:21:da:b1:07:19:70:3b:bc:db:80:5c:f9:9d:03: - 74:6b:58:93:6d:27:53:3a:f4:ed:9c:3b:b5:f5:cc:c8:d6:a7: - f6:70:02:e1:65:20:35:41:50:8f:4f:6a:45:e9:f1:57:ed:a2: - fc:36 + 64:f5:c1:2e:6c:fa:57:18:9b:e8:1f:44:0d:dc:f9:46:5b:08: + b8:b2:e0:46:bf:b2:a7:3f:d0:d5:15:be:4c:1d:e2:72:85:25: + 2d:14:8e:c9:85:49:b9:b5:d6:db:f2:9f:fd:e9:8b:71:7b:47: + 9e:99:52:90:fc:42:c5:d2:25:2d:a8:7a:a0:5d:98:62:71:58: + bf:4d:bb:25:ee:99:36:39:8c:c3:c8:fe:02:5b:4a:5c:63:65: + ed:f0:88:53:a7:08:08:75:b2:37:3c:6b:27:6b:45:dc:be:8b: + a1:46:05:fe:c1:b0:f2:86:73:a1:12:05:45:a1:cb:f8:9c:fa: + ab:ef -----BEGIN CERTIFICATE----- MIIDwDCCAymgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzVaFw0yNDA3MDgxNzE3MzVaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGU2VydmVy -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDHhwOIE0xg6ogW3B/BHAPStoLY -8EVZD/H7d/wDxFCj2j9KE1QdJyNdcNU020EznjRfRT/NCmeELbGyDBfLJ3EAkNVA -nx9/AfC8NOUop2FsWphQQTF/k8pMHfr8lDp+lGlwG5jJHCzeTZAyZSNYAZHWd3uF -WrsEIAMlm+sJUCIvMQIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -v9NCp2kvEvUNxzgxDi5xtZ3SGZMwgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/xKY1E3pQ8z8ViR8qEkfQBkSs +4TAfO+mf7nfN2Dqi4+jF9N1n6rwF0vKoP7YPVqaW3gMzoybO/ohVCTqDdHcEkmXD +4dbHRIpgNmScUSGucgrSU9lYl6BX7wmEVp6ZG88lq8jDwnfldPK9Smo5KMX7uMog +khR3fsSh+l6gg8dnzQIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +pkKqFwRBhlZn5ARkWTQwx0xr76Qwgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO ggZzZXJ2ZXKHBH8AAAEwIQYDVR0SBBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAA -ATANBgkqhkiG9w0BAQsFAAOBgQC/8m55P080TVYglEjixjgJjvRstFO7hwwScxUZ -rDCmnsgwHINMelSQljn88yyiZnGHxv3WzvdGq3ZTALTli9Ipvjbq6wdqCPXF6Sl0 -IdqxBxlwO7zbgFz5nQN0a1iTbSdTOvTtnDu19czI1qf2cALhZSA1QVCPT2pF6fFX -7aL8Ng== +ATANBgkqhkiG9w0BAQsFAAOBgQBk9cEubPpXGJvoH0QN3PlGWwi4suBGv7KnP9DV +Fb5MHeJyhSUtFI7JhUm5tdbb8p/96Ytxe0eemVKQ/ELF0iUtqHqgXZhicVi/Tbsl +7pk2OYzDyP4CW0pcY2Xt8IhTpwgIdbI3PGsna0XcvouhRgX+wbDyhnOhEgVFocv4 +nPqr7w== -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx Binary files differindex fffaf777f0d..a560023f314 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_priv.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_priv.pem index 09a5dd8be6f..461faf5b95b 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_priv.pem @@ -1,16 +1,16 @@ -----BEGIN PRIVATE KEY----- -MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAL7+tNkgWa08qyaY -P+pSX3o6/q13+AbBGPp0bVE0xQ+pnw/CLyhjyN/5iVuEuTW+9UTBj/0anMLKUHj6 -qmshS0/c287Y3SQud1tq2K7N+cWPmL+A8hm8k3ZCxVLVzKFbAE3y+qjKkWls743w -Im7Z5/J7t8VfOVI7ohvOpTfrSxNrAgMBAAECgYACgN4n9meWgLQRlm9IB/peZMWP -yoHCvOcx6TLBnLp0gRmnoDj0A5LPdLrbKzsuPCmE1DCp9Z5WY0Z4v3haXR5akM/0 -sEwm2AuhR4ZJTlIn8YgBaQz9BsnBnopI+wSHLahjlJX2IUlakgr4+Ueef+smhVM9 -8emYKo6cGucXwcwBUQJBAO0jnAdZTyYMs04blAiyvLYRtgO1SEwJH7DhMmsfCFNp -jLCsvvjbicngsnLdaHyHHqDLQiiQKeazFrxvl72ROnkCQQDOL448QQiIIFpIYREN -jxOr8gtCtOXFioPH3IVbB4qrVNJA82ZRatCeILvS7EfE5VDh2VvUJzJrWhwp/f9H -uYQDAkEAtsiS1KtHManqb1MciJPUl3YRWMxbnJgPwFPke+MglMKvueJ9FO6LR3sV -sSnuBsZTmlbxeLieQ39ZEAfn6ytM6QJAWAzA7gRLs241f+FL2gF2wiAMJQGBehmL -60bGADi5RC9l1mzbDfvSeSS7cPiMMY5IOxqKd5ABnQyPKHOal7OmpwJAVfQ8mtaF -VetDuqRYbUHGdmVQzaCQ3/8MxCw4msnED+DC2ZjdHxoRGhbg+euih+iDHOT00jR6 -me0k0ObGMzDEIg== +MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALmaBRJBbBgcLR/K +mDuUjCksV+czV7+tTBKunAhQ8t/8UKhzhekgTVsEHyg1AaVsdd9vr4y0LUdeFrjB +hdfntdLgP4a5LfFbeuPrEiNtYjrXWKeLo+3jJqdCQ7BKcSTW9/H+9t0zRv/Ox6WP +RMrbevpHoK7K1gi9eAF5TtUrq86/AgMBAAECgYEAtAOan5YsjUXmzkrlVARD3TtR +FsFJfnNKsWQBml9I8c37PSau3umhnYFl5s1ih1unB8t/bOzkba/oQdIRStNGGVZ1 +dQCP93wa6zbWBwEN6aYWVyDrYunmJPw9yj0zMED1Ql+Vnyu1yYbhNMdeVRE28nx+ +b1GCjQz03OTcNGtOFaECQQDkRUJCL9tVzIdmGR7JR4n/UWiu/wFBEZa1EHvj9SEb +VmfslG5II5YzqnhEfiSisETw+qf/Rp2QueWlv5OQEVJtAkEA0CXYstYZ+AKmfQJv +Vu9UHbw3si9XCGg6SEV2kS+FB3g4dNjozKvCrIzBIQHJU6mvQFEUojcP/t7WFJL4 +9HBKWwJAAqTGsquJN8Ipo0YRNDWO5JUVyEkNw6one6tYM/inzIBArd2+NTmsSKbl +w61OUVAHTF8qyOsRchalETlZxSZeNQJBAKD8pJ2s+mjXo+0L9RFICcb1zB4Ef0wB +URKUpx+joUAlu4SkP2oNboQGWVkuCIistN8J1uufqr91mh5Pjj2AnAECQFrE2c48 +kM3G9MnxWnKorPsD8ILHOAdSjLOA4SC71kUcDjKSi/SH7JINFxwAXczppvDRAjQj +hSwVO6xoP5jlEbw= -----END PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_pub.pem b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_pub.pem index 43de10ba4dc..8f37a935c00 100644 --- a/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_nopass_ca2_pub.pem @@ -5,66 +5,66 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 2/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:36 2014 GMT - Not After : Jul 8 17:17:36 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:be:fe:b4:d9:20:59:ad:3c:ab:26:98:3f:ea:52: - 5f:7a:3a:fe:ad:77:f8:06:c1:18:fa:74:6d:51:34: - c5:0f:a9:9f:0f:c2:2f:28:63:c8:df:f9:89:5b:84: - b9:35:be:f5:44:c1:8f:fd:1a:9c:c2:ca:50:78:fa: - aa:6b:21:4b:4f:dc:db:ce:d8:dd:24:2e:77:5b:6a: - d8:ae:cd:f9:c5:8f:98:bf:80:f2:19:bc:93:76:42: - c5:52:d5:cc:a1:5b:00:4d:f2:fa:a8:ca:91:69:6c: - ef:8d:f0:22:6e:d9:e7:f2:7b:b7:c5:5f:39:52:3b: - a2:1b:ce:a5:37:eb:4b:13:6b + 00:b9:9a:05:12:41:6c:18:1c:2d:1f:ca:98:3b:94: + 8c:29:2c:57:e7:33:57:bf:ad:4c:12:ae:9c:08:50: + f2:df:fc:50:a8:73:85:e9:20:4d:5b:04:1f:28:35: + 01:a5:6c:75:df:6f:af:8c:b4:2d:47:5e:16:b8:c1: + 85:d7:e7:b5:d2:e0:3f:86:b9:2d:f1:5b:7a:e3:eb: + 12:23:6d:62:3a:d7:58:a7:8b:a3:ed:e3:26:a7:42: + 43:b0:4a:71:24:d6:f7:f1:fe:f6:dd:33:46:ff:ce: + c7:a5:8f:44:ca:db:7a:fa:47:a0:ae:ca:d6:08:bd: + 78:01:79:4e:d5:2b:ab:ce:bf Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - CE:04:E2:8C:3C:F8:C6:05:3C:C4:6C:7E:0A:76:1B:94:0B:C2:13:E5 + 82:FA:FD:3C:05:D4:B1:E8:57:D6:93:7C:E2:95:95:25:91:60:34:54 X509v3 Authority Key Identifier: - keyid:E6:A2:63:95:8F:8C:4D:7F:7A:3C:62:1A:C3:2A:BA:53:BB:C2:BF:B1 + keyid:71:61:73:01:D1:B6:AA:21:F5:90:E7:DA:55:93:FA:1B:1F:DD:AD:66 DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 2/emailAddress=info@zeroc.com - serial:E3:A0:C8:CA:39:6A:77:CF + serial:C9:6F:11:B4:99:58:DA:C3 X509v3 Subject Alternative Name: DNS:server, IP Address:127.0.0.1 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - b6:25:8d:b4:aa:3b:9f:55:ca:54:36:e6:d0:d6:b2:29:09:d4: - 60:cb:61:bf:29:09:f4:4b:09:00:1a:03:e1:41:be:91:4a:2a: - e1:7f:5f:d8:f1:5a:ec:8a:d2:ca:22:0e:2a:11:4e:0e:f3:94: - eb:d0:8c:49:bf:75:11:28:8a:36:f5:0d:39:a4:06:71:8f:ba: - 67:e4:b5:cb:e6:86:76:a2:e3:24:e7:ee:01:4f:b2:70:57:a5: - 70:1f:27:70:cb:cd:6f:78:b2:10:69:d9:8c:d8:7a:9f:bf:8d: - 21:05:04:b0:bf:55:90:ec:31:34:ff:b9:d7:94:15:7b:b4:6e: - e0:4e + 25:0b:d2:38:5e:0b:91:cb:9d:bf:f6:96:4d:0b:3e:c0:96:d4: + 98:1a:31:46:06:83:5f:2a:e4:25:80:a3:5f:57:08:2f:1c:5b: + 1c:1e:28:8b:97:0e:39:7c:55:9c:02:d0:fd:50:00:65:90:9d: + e9:b5:ff:05:60:3e:e1:e3:a0:32:87:26:54:c5:78:2f:f7:f3: + 1a:25:77:8a:4b:68:a4:5a:d6:83:72:37:fa:74:4d:36:49:2f: + ab:2b:36:55:f8:50:ce:48:61:22:97:a8:2a:9f:ff:07:e3:88: + cc:43:77:1c:df:25:83:62:fe:75:a2:09:be:dd:67:1b:33:2f: + 42:a7 -----BEGIN CERTIFICATE----- MIIDwDCCAymgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAyMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzZaFw0yNDA3MDgxNzE3MzZaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGU2VydmVy -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC+/rTZIFmtPKsmmD/qUl96Ov6t -d/gGwRj6dG1RNMUPqZ8Pwi8oY8jf+YlbhLk1vvVEwY/9GpzCylB4+qprIUtP3NvO -2N0kLndbatiuzfnFj5i/gPIZvJN2QsVS1cyhWwBN8vqoypFpbO+N8CJu2efye7fF -XzlSO6IbzqU360sTawIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -zgTijDz4xgU8xGx+CnYblAvCE+Uwgc4GA1UdIwSBxjCBw4AU5qJjlY+MTX96PGIa -wyq6U7vCv7GhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5mgUSQWwYHC0fypg7lIwpLFfn +M1e/rUwSrpwIUPLf/FCoc4XpIE1bBB8oNQGlbHXfb6+MtC1HXha4wYXX57XS4D+G +uS3xW3rj6xIjbWI611ini6Pt4yanQkOwSnEk1vfx/vbdM0b/zselj0TK23r6R6Cu +ytYIvXgBeU7VK6vOvwIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +gvr9PAXUsehX1pN84pWVJZFgNFQwgc4GA1UdIwSBxjCBw4AUcWFzAdG2qiH1kOfa +VZP6Gx/drWahgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMjEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDjoMjKOWp3zzAXBgNVHREEEDAO +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDJbxG0mVjawzAXBgNVHREEEDAO ggZzZXJ2ZXKHBH8AAAEwIQYDVR0SBBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAA -ATANBgkqhkiG9w0BAQsFAAOBgQC2JY20qjufVcpUNubQ1rIpCdRgy2G/KQn0SwkA -GgPhQb6RSirhf1/Y8VrsitLKIg4qEU4O85Tr0IxJv3URKIo29Q05pAZxj7pn5LXL -5oZ2ouMk5+4BT7JwV6VwHydwy81veLIQadmM2Hqfv40hBQSwv1WQ7DE0/7nXlBV7 -tG7gTg== +ATANBgkqhkiG9w0BAQsFAAOBgQAlC9I4XguRy52/9pZNCz7AltSYGjFGBoNfKuQl +gKNfVwgvHFscHiiLlw45fFWcAtD9UABlkJ3ptf8FYD7h46AyhyZUxXgv9/MaJXeK +S2ikWtaDcjf6dE02SS+rKzZV+FDOSGEil6gqn/8H44jMQ3cc3yWDYv51ogm+3Wcb +My9Cpw== -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem index 9d4741a1fca..77ce211c3ba 100644 --- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem +++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_priv.pem @@ -1,17 +1,17 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQInlfYWwzyGTECAggA -MBQGCCqGSIb3DQMHBAhYU9lqNli1SASCAoBARv/s3Y8KZYe4nMrQq0iOIH+lfFCJ -PR45ALfCeJ/8FlzXiyhXTGGEodCjHUJtC53lnXrj/7krv/4g1fLvJb4IXJ5qG6Jv -9JZ6wKZ0Sjsb+6wW+mXLbxXXf3rCNhvwgoC+DovMtg5g0mbL7j5qR9bp5Ch2wM3/ -IIVL1GgAR9d7Tt6+5p3jvOkR1M6u94u7gMrm4iXnsdGSWHsZbByDiUXVUGyGxwOD -4q/BiCefqwS5TGqZPHcGFV4qjEPAI2awGH2x0x23eKZVZK4TtK3dzmCV2JdAnbgS -Rwn3aUoLNVKaAnomC/HpMMKXG9R9W6MQciPaQ3pYGNwxKL9j+0PtPob63d+q1Suw -Y8SaXimNbOV1XY0LTckMCJferTrvHWxa86v/KQIWz8SFgU7o1PVmHZ34iftzh4rs -0BRv0fCBBNZu53wylAD9MWDpGvExzbOqINUz8uiOHmGF/HGfSWaRm5pPf613jWUd -HXPYAD1h206ByGlaGgVGqSNWmmxbeLr/vPBq463sXiN2LQdKGPTvh5Ej/hJgbt12 -+NstnuA0H17MnqLsMT9aVSkTMRuyuaFC8u2NKOJ2PPDiuVKHN4jXJQCau4grOHnI -o+f+8rOYi/1DPYd8mq6hYqyolpJMC2UjyqwFwY9YMjEJT1cOaHegk47c/l20Mhmx -w8jysAw3FjR1RtJakyZSMm+erVmHw82lo5nSHzUScnK9IF/qt4vytXUTuGlLVkl/ -70Vme0WPQR14H5ivbtgjsumiD/7D0GSjMI8IBQQEz3mdD+tRqUqbNUANQvztgXjS -G8j8jn7WJ9Ri6ZSTvxZ1RKKAJwx8/YDC2j3Eo2rRnVNt8GnREWFjORxL +MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIc8/Oqjj7ivACAggA +MBQGCCqGSIb3DQMHBAiLrhyvMEdkkASCAoCj1CUPZc57567ZR53DMEWzt6xTXqhv +RqUd4ivqlAPUG4KmQPlqLyH3+nuFPHkhphrbKp8Axrb3CVPWDlOfvE/08GEMX5Uo +8P3oKTBK2p9kvl1FB+nVGDlLNpv1wqJPRNoAYpbSqx7nMrORmX+uk/gahCLpHDMz +k7t+PWMU6FEeRvmaniZmca5lsBu0es3bWbmFM4usERLqmx4wS9wUosVm5CTO5rX7 +WLWknmJ/ZpJS57Dj631R5WV5seeFmfLRbefs0i36SFYpg/p7tc1oo+eGogFw3t4i +I48hOyL4Qnd9ZJpunzz7D4NI7+VKUq0P5j6P0sKS8wYDSk+ygPBD2VytKOU4Za/L +k/ECKzd6pjFGVthMxxNqKqE6OHpNfzL4prHdoM/egHAPw1fVPAB+AA73iOLJ+GrQ +i2400dEl4CCo7AcVA08HxEmTSXODd4AcNrTQo6W8BTRLexE+LcRoNH5Ojewn3Ib/ +E+Rti+S23/cbLKeHqigLFl3mOwUw+Fy6Gd3tQnvVYM0CuGViPk1c3QNvwmdp+TFu +X4uC3GpXFCJrjZOS4H3O9qq0J4epsCF/Miwsp1dyya3R3MVxiWXgxfpQX1RHlhtF +DITLoJwzROioB3vQd/r14BXizgh+y+JvvPpfy/tEE2/SnS9mxAHRLSqvcBngUYEm +5kUAaHQoD2DKz8Uj9ypzbp87UTjUCHvZRTDOevuTCq0rgisdbi2Uyhpt9a0p/JTV +SomG2+pa0GTd4jcO0WpyacMb7FDdikMLLWfA5LxxPYMsJyRP4/ZMtFBSNu7yH9rr +05ankGgf9p0l0d4VWTde0ZC3yg6bgl0qDoPW7AUwQWJwrUhPtpV/dI01 -----END ENCRYPTED PRIVATE KEY----- diff --git a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem index 446dcd89920..1e37eb706fd 100644 --- a/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem +++ b/cpp/test/IceSSL/certs/s_rsa_pass_ca1_pub.pem @@ -5,66 +5,66 @@ Certificate: Signature Algorithm: sha256WithRSAEncryption Issuer: C=US, ST=Florida, L=Palm Beach Gardens, O=ZeroC, Inc., OU=Ice, CN=ZeroC Test CA 1/emailAddress=info@zeroc.com Validity - Not Before: Jul 11 17:17:35 2014 GMT - Not After : Jul 8 17:17:35 2024 GMT + Not Before: Aug 19 14:40:37 2014 GMT + Not After : Aug 16 14:40:37 2024 GMT Subject: C=US, ST=Florida, O=ZeroC, Inc., OU=Ice/emailAddress=info@zeroc.com, CN=Server Subject Public Key Info: Public Key Algorithm: rsaEncryption Public-Key: (1024 bit) Modulus: - 00:bd:85:92:f3:47:e4:a6:ce:b2:95:68:94:6b:69: - 23:c2:63:5e:89:a4:96:f3:3a:15:f1:2d:18:32:ca: - f2:d0:8a:91:c5:58:fa:12:a3:c1:a5:72:fa:07:70: - da:a2:f5:6b:d8:fc:e1:e9:52:5a:1e:29:14:81:4d: - 71:a4:b4:ef:d6:e0:dc:99:a5:5a:d1:c6:a4:39:41: - 5f:c6:a8:e0:ed:16:83:fa:24:1c:55:36:6a:98:46: - 0e:50:7a:14:7a:78:07:e5:03:3e:29:92:38:8a:33: - dc:da:92:28:83:47:62:a0:4a:a1:1e:e7:fa:bc:3b: - 97:83:cb:9e:0d:e0:fb:d9:89 + 00:bd:a1:7e:6d:f9:66:8d:53:3d:30:ed:fa:41:ab: + 9d:c7:1e:cf:7e:43:f9:55:65:ef:00:18:11:a0:24: + 56:bb:94:fa:dd:14:a0:15:fc:1a:3b:eb:d0:15:61: + 4a:06:22:4a:94:8f:9a:c8:fc:00:ba:1f:0b:02:53: + 47:e8:f6:ee:af:9e:ca:e1:01:91:a8:3a:4c:bd:98: + 7a:5d:ed:28:97:5a:2e:6a:35:76:8d:e5:25:18:d8: + ae:6c:7d:db:0b:7d:a0:a2:00:77:a2:db:5a:aa:4a: + c2:0e:d6:f9:53:31:35:52:29:04:87:57:5d:a1:61: + 9e:97:82:44:44:54:16:c2:8d Exponent: 65537 (0x10001) X509v3 extensions: X509v3 Basic Constraints: CA:FALSE X509v3 Subject Key Identifier: - 19:93:2B:8B:02:99:F7:CC:34:C4:2F:17:E5:23:EC:F1:74:ED:DB:1C + 4C:C3:97:A4:CC:F1:05:7B:39:EF:3A:C6:9B:A6:F8:69:0D:53:F7:6E X509v3 Authority Key Identifier: - keyid:D3:64:A2:78:6C:8C:1F:AD:F2:26:79:F8:1B:05:25:C5:8B:62:A9:F3 + keyid:13:FA:72:67:FE:34:05:9A:C9:3E:61:D2:91:D6:BA:03:65:1B:8A:9A DirName:/C=US/ST=Florida/L=Palm Beach Gardens/O=ZeroC, Inc./OU=Ice/CN=ZeroC Test CA 1/emailAddress=info@zeroc.com - serial:F9:E6:F8:11:B0:B7:85:00 + serial:CE:8A:67:ED:96:6F:7E:B6 X509v3 Subject Alternative Name: DNS:server, IP Address:127.0.0.1 X509v3 Issuer Alternative Name: email:issuer@zeroc.com, IP Address:127.0.0.1 Signature Algorithm: sha256WithRSAEncryption - 16:2c:ea:17:ad:ed:89:74:86:d4:90:cf:9b:66:37:25:7a:52: - be:c0:40:e9:bc:33:84:ec:a4:b4:da:21:b3:68:93:8c:be:ed: - c8:8b:c7:6c:fd:0b:89:6f:04:e2:53:c9:fa:4e:9b:11:28:f1: - ea:e8:df:b5:f6:33:f2:d5:7f:3c:84:f6:49:db:cd:3e:b5:ea: - 44:f5:4c:ed:16:6d:21:93:f8:88:22:3e:19:04:25:11:ac:44: - 34:3a:08:18:93:f4:e9:73:a1:fd:90:00:96:7b:db:4a:e8:06: - 16:d1:68:fc:27:da:86:2a:a5:e3:6e:06:7e:f5:29:e7:64:4a: - 9c:87 + 0e:b0:a2:d2:00:ac:ab:2d:60:cd:c6:15:29:00:48:ba:13:04: + 34:c6:07:0d:d9:2c:36:4d:ab:c1:6a:ca:ba:fc:c6:d4:4f:4d: + 91:28:dc:d7:48:d3:a4:13:62:04:8a:ac:2b:44:86:64:22:9f: + 38:e1:f7:d6:9c:16:94:4b:80:26:54:f5:1f:46:32:41:97:ed: + 55:2a:35:ca:f2:f1:be:0c:a7:85:57:ca:7d:c9:27:a7:84:ef: + e8:67:62:5d:98:cf:35:bf:ed:f8:34:4b:15:83:b7:9a:c2:bd: + 97:96:96:88:b5:cb:20:a5:6c:3f:2a:b4:66:f7:11:bb:d0:08: + 8a:8b -----BEGIN CERTIFICATE----- MIIDwDCCAymgAwIBAgIBATANBgkqhkiG9w0BAQsFADCBmTELMAkGA1UEBhMCVVMx EDAOBgNVBAgTB0Zsb3JpZGExGzAZBgNVBAcTElBhbG0gQmVhY2ggR2FyZGVuczEU MBIGA1UEChMLWmVyb0MsIEluYy4xDDAKBgNVBAsTA0ljZTEYMBYGA1UEAxMPWmVy b0MgVGVzdCBDQSAxMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0x -NDA3MTExNzE3MzVaFw0yNDA3MDgxNzE3MzVaMHMxCzAJBgNVBAYTAlVTMRAwDgYD +NDA4MTkxNDQwMzdaFw0yNDA4MTYxNDQwMzdaMHMxCzAJBgNVBAYTAlVTMRAwDgYD VQQIEwdGbG9yaWRhMRQwEgYDVQQKEwtaZXJvQywgSW5jLjEMMAoGA1UECxMDSWNl MR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTEPMA0GA1UEAxMGU2VydmVy -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9hZLzR+SmzrKVaJRraSPCY16J -pJbzOhXxLRgyyvLQipHFWPoSo8GlcvoHcNqi9WvY/OHpUloeKRSBTXGktO/W4NyZ -pVrRxqQ5QV/GqODtFoP6JBxVNmqYRg5QehR6eAflAz4pkjiKM9zakiiDR2KgSqEe -5/q8O5eDy54N4PvZiQIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU -GZMriwKZ98w0xC8X5SPs8XTt2xwwgc4GA1UdIwSBxjCBw4AU02SieGyMH63yJnn4 -GwUlxYtiqfOhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9oX5t+WaNUz0w7fpBq53HHs9+ +Q/lVZe8AGBGgJFa7lPrdFKAV/Bo769AVYUoGIkqUj5rI/AC6HwsCU0fo9u6vnsrh +AZGoOky9mHpd7SiXWi5qNXaN5SUY2K5sfdsLfaCiAHei21qqSsIO1vlTMTVSKQSH +V12hYZ6XgkREVBbCjQIDAQABo4IBOzCCATcwCQYDVR0TBAIwADAdBgNVHQ4EFgQU +TMOXpMzxBXs57zrGm6b4aQ1T924wgc4GA1UdIwSBxjCBw4AUE/pyZ/40BZrJPmHS +kda6A2UbipqhgZ+kgZwwgZkxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9yaWRh MRswGQYDVQQHExJQYWxtIEJlYWNoIEdhcmRlbnMxFDASBgNVBAoTC1plcm9DLCBJ bmMuMQwwCgYDVQQLEwNJY2UxGDAWBgNVBAMTD1plcm9DIFRlc3QgQ0EgMTEdMBsG -CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQD55vgRsLeFADAXBgNVHREEEDAO +CSqGSIb3DQEJARYOaW5mb0B6ZXJvYy5jb22CCQDOimftlm9+tjAXBgNVHREEEDAO ggZzZXJ2ZXKHBH8AAAEwIQYDVR0SBBowGIEQaXNzdWVyQHplcm9jLmNvbYcEfwAA -ATANBgkqhkiG9w0BAQsFAAOBgQAWLOoXre2JdIbUkM+bZjclelK+wEDpvDOE7KS0 -2iGzaJOMvu3Ii8ds/QuJbwTiU8n6TpsRKPHq6N+19jPy1X88hPZJ280+tepE9Uzt -Fm0hk/iIIj4ZBCURrEQ0OggYk/Tpc6H9kACWe9tK6AYW0Wj8J9qGKqXjbgZ+9Snn -ZEqchw== +ATANBgkqhkiG9w0BAQsFAAOBgQAOsKLSAKyrLWDNxhUpAEi6EwQ0xgcN2Sw2TavB +asq6/MbUT02RKNzXSNOkE2IEiqwrRIZkIp844ffWnBaUS4AmVPUfRjJBl+1VKjXK +8vG+DKeFV8p9ySenhO/oZ2JdmM81v+34NEsVg7eawr2XlpaItcsgpWw/KrRm9xG7 +0AiKiw== -----END CERTIFICATE----- diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 1e69b0961ff..c126ea2dd23 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -565,8 +565,9 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b info->nativeCerts[0]->getSubjectDN() == serverCert->getSubjectDN() && info->nativeCerts[0]->getIssuerDN() == serverCert->getIssuerDN()); } - catch(const LocalException&) + catch(const LocalException& ex) { + cerr << ex << endl; test(false); } fact->destroyServer(server); @@ -3484,18 +3485,18 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b comm->destroy(); } cout << "ok" << endl; - -#ifdef ICE_USE_SCHANNEL - cerr << "testing IceSSL.FindCerts properties... " << flush; + { +#if defined(ICE_USE_SCHANNEL) + cerr << "testing IceSSL.SChannel.FindCert... " << flush; const char* clientFindCertProperties[] = { "SUBJECTDN:'CN = Client, E = info@zeroc.com, OU = Ice, O = \"ZeroC, Inc.\", S = Florida, C = US'", - "ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:01", + "ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:02", "ISSUERDN:'E = info@zeroc.com, CN = \"ZeroC Test CA 1\", OU = Ice, O = \"ZeroC, Inc.\"," " L = \"Palm Beach Gardens\", S = Florida, C = US' SUBJECT:Client", - "THUMBPRINT:'64 55 c8 55 16 72 f5 e1 0d fc 74 25 83 30 46 1e 9e d1 21 48'", - "SUBJECTKEYID:'54 72 19 52 20 4a a8 aa b7 37 6a bf da b9 87 e2 47 51 03 4b'", + "THUMBPRINT:'54 26 20 f0 93 a9 b6 bc 2a 8c 83 ef 14 d4 49 18 a3 18 67 46'", + "SUBJECTKEYID:'58 77 81 07 55 2a 0c 10 19 88 13 47 6f 27 6e 21 75 5f 85 ca'", 0 }; @@ -3505,19 +3506,19 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b "ISSUER:'ZeroC, Inc.' SUBJECT:Server SERIAL:01", "ISSUERDN:'E = info@zeroc.com, CN = \"ZeroC Test CA 1\", OU = Ice, O = \"ZeroC, Inc.\"," " L = \"Palm Beach Gardens\", S = Florida, C = US' SUBJECT:Server", - "THUMBPRINT:'fc dd 8d c3 20 2e c2 fc 89 57 16 38 3c 76 5a 91 0a 3e f2 3d'", - "SUBJECTKEYID:'bf d3 42 a7 69 2f 12 f5 0d c7 38 31 0e 2e 71 b5 9d d2 19 93'", + "THUMBPRINT:'27 e0 18 c9 23 12 6c f0 5c da fa 36 5a 4c 63 5a e2 53 07 1a'", + "SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef a4'", 0 }; const char* failFindCertProperties[] = { "SUBJECTDN:'CN = Client, E = infox@zeroc.com, OU = Ice, O = \"ZeroC, Inc.\", S = Florida, C = US'", - "ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:'01 02'", + "ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:'02 02'", "ISSUERDN:'E = info@zeroc.com, CN = \"ZeroC Test CA 1\", OU = Ice, O = \"ZeroC, Inc.\"," " L = \"Palm Beach Gardens\", S = Florida, C = ES' SUBJECT:Client", - "THUMBPRINT:'64 55 c8 55 16 72 f5 e1 0d fc 74 25 83 30 46 1e 9e d1 21 XX'", - "SUBJECTKEYID:'54 72 19 52 20 4a a8 aa b7 37 6a bf da b9 87 e2 47 51 03 XX'", + "THUMBPRINT:'27 e0 18 c9 23 12 6c f0 5c da fa 36 5a 4c 63 5a e2 53 07 ff'", + "SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef ff'", 0 }; @@ -3566,7 +3567,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b InitializationData initData; initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx); initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem"); - initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", clientFindCertProperties[i]); + initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", clientFindCertProperties[i]); // // Use TrustOnly to ensure the peer has pick the expected certificate. // @@ -3578,7 +3579,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b test(fact); Test::Properties d = createServerProps(defaultProperties, defaultDir, defaultHost, pfx); d["IceSSL.CertAuthFile"] = "cacert1.pem"; - d["IceSSL.FindCert.CurrentUser.My"] = serverFindCertProperties[i]; + d["IceSSL.SChannel.FindCert.CurrentUser.My"] = serverFindCertProperties[i]; // // Use TrustOnly to ensure the peer has pick the expected certificate. // @@ -3607,7 +3608,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b InitializationData initData; initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx); initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem"); - initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", failFindCertProperties[i]); + initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", failFindCertProperties[i]); try { CommunicatorPtr comm = initialize(initData); @@ -3636,7 +3637,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b InitializationData initData; initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx); initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem"); - initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", clientFindCertProperties[i]); + initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", clientFindCertProperties[i]); try { CommunicatorPtr comm = initialize(initData); @@ -3652,9 +3653,105 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b test(false); } } - } - cerr << "ok" << endl; + cerr << "ok" << endl; +#elif defined(ICE_USE_SECURE_TRANSPORT) + cerr << "testing IceSSL.SecureTransport.FindCert... " << flush; + const char* clientFindCertProperties[] = + { + "SUBJECT:Client", + "LABEL:'Client'", + "SUBJECTKEYID:'58 77 81 07 55 2a 0c 10 19 88 13 47 6f 27 6e 21 75 5f 85 ca'", + "SERIAL:02", + "SERIAL:02 LABEL:Client", + 0 + }; + + const char* serverFindCertProperties[] = + { + "SUBJECT:Server", + "LABEL:'Server'", + "SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef a4'", + "SERIAL:01", + "SERIAL:01 LABEL:Server", + 0 + }; + + const char* failFindCertProperties[] = + { + "SUBJECT:ServerX", + "LABEL:'ServerX'", + "SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef ff'", + "SERIAL:03", + "SERIAL:01 LABEL:Client", + 0 + }; + + for(int i = 0; clientFindCertProperties[i] != 0; i++) + { + InitializationData initData; + initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx); + initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem"); + initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain"); + initData.properties->setProperty("IceSSL.KeychainPassword", "password"); + initData.properties->setProperty("IceSSL.SecureTransport.FindCert", clientFindCertProperties[i]); + // + // Use TrustOnly to ensure the peer has pick the expected certificate. + // + initData.properties->setProperty("IceSSL.TrustOnly", "CN=Server"); + + CommunicatorPtr comm = initialize(initData); + + Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(comm->stringToProxy(factoryRef)); + test(fact); + Test::Properties d = createServerProps(defaultProperties, defaultDir, defaultHost, pfx); + d["IceSSL.CertAuthFile"] = "cacert1.pem"; + d["IceSSL.Keychain"] = "../certs/Find.keychain"; + d["IceSSL.KeychainPassword"] = "password"; + d["IceSSL.SecureTransport.FindCert"] = serverFindCertProperties[i]; + // + // Use TrustOnly to ensure the peer has pick the expected certificate. + // + d["IceSSL.TrustOnly"] = "CN=Client"; + + Test::ServerPrx server = fact->createServer(d); + try + { + server->ice_ping(); + } + catch(const LocalException& ex) + { + cerr << ex << endl; + test(false); + } + fact->destroyServer(server); + comm->destroy(); + } + + for(int i = 0; failFindCertProperties[i] != 0; i++) + { + InitializationData initData; + initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx); + initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain"); + initData.properties->setProperty("IceSSL.KeychainPassword", "password"); + initData.properties->setProperty("IceSSL.SecureTransport.FindCert", failFindCertProperties[i]); + try + { + CommunicatorPtr comm = initialize(initData); + test(false); + } + catch(const PluginInitializationException&) + { + // expected + } + catch(const Ice::LocalException& ex) + { + cerr << ex << endl; + test(false); + } + } + cerr << "ok" << endl; #endif + } if(shutdown) { |