summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-09 11:23:45 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-09 11:23:45 +0100
commitcd3b8da7e09c4ad900313f9e4340eca605f7959a (patch)
tree65fc1c0ec9113a209f112f66b0933d43a75bd30e /cpp/src/IceSSL
parentUpdates to support Windows binary distribution testing (diff)
downloadice-cd3b8da7e09c4ad900313f9e4340eca605f7959a.tar.bz2
ice-cd3b8da7e09c4ad900313f9e4340eca605f7959a.tar.xz
ice-cd3b8da7e09c4ad900313f9e4340eca605f7959a.zip
iOS controller fixes
Diffstat (limited to 'cpp/src/IceSSL')
-rwxr-xr-xcpp/src/IceSSL/Certificate.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index 5c4f268f67d..c0f7cb42589 100755
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -1071,8 +1071,8 @@ Certificate::Certificate(X509CertificateRef cert) : _cert(cert)
throw;
}
#elif defined(ICE_USE_SECURE_TRANSPORT_IOS)
- _subject = NULL;
- _issuer = NULL;
+ _subject = 0;
+ _issuer = 0;
#endif
}
@@ -1860,7 +1860,7 @@ Certificate::initializeAttributes() const
{
_subject = 0;
_issuer = 0;
- return;
+ throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
}
_subject = (CFDataRef)CFDictionaryGetValue(attributes, kSecAttrSubject);