diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-16 19:06:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-16 19:06:07 +0200 |
| commit | 92d89cd2713faffed0ba8ba69a65e392400b64fc (patch) | |
| tree | 6e12c321b5c9debc2ad137f78813f890ab3723fc /cpp/src/IceSSL/Util.cpp | |
| parent | Remove MD5 support from icehashpassword.py (diff) | |
| download | ice-92d89cd2713faffed0ba8ba69a65e392400b64fc.tar.bz2 ice-92d89cd2713faffed0ba8ba69a65e392400b64fc.tar.xz ice-92d89cd2713faffed0ba8ba69a65e392400b64fc.zip | |
Various SSL fixes, tests for intermedate CAs
Diffstat (limited to 'cpp/src/IceSSL/Util.cpp')
| -rw-r--r-- | cpp/src/IceSSL/Util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/Util.cpp b/cpp/src/IceSSL/Util.cpp index 19713f79364..f87e361c194 100644 --- a/cpp/src/IceSSL/Util.cpp +++ b/cpp/src/IceSSL/Util.cpp @@ -579,7 +579,7 @@ loadKeychainItems(const string& file, SecExternalItemType type, SecKeychainRef k throw CertificateReadException(__FILE__, __LINE__, os.str()); } - if(type != kSecItemTypeUnknown && importType != type) + if(type != kSecItemTypeUnknown && importType != kSecItemTypeAggregate && importType != type) { CFRelease(items); ostringstream os; |