diff options
| author | Anthony Neal <aneal@zeroc.com> | 2002-03-19 19:59:40 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2002-03-19 19:59:40 +0000 |
| commit | 285fbbfd2f7133eeb246b342b49417e1b88a725e (patch) | |
| tree | e93702456b8d4e777f41e798b80f21e8f6ac10f9 /cpp/src/Ice/ContextOpenSSL.cpp | |
| parent | Updated to allow for binary representation of trusted certificates. (diff) | |
| download | ice-285fbbfd2f7133eeb246b342b49417e1b88a725e.tar.bz2 ice-285fbbfd2f7133eeb246b342b49417e1b88a725e.tar.xz ice-285fbbfd2f7133eeb246b342b49417e1b88a725e.zip | |
Updated to support binary addition of trusted certificates.
Diffstat (limited to 'cpp/src/Ice/ContextOpenSSL.cpp')
| -rw-r--r-- | cpp/src/Ice/ContextOpenSSL.cpp | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/cpp/src/Ice/ContextOpenSSL.cpp b/cpp/src/Ice/ContextOpenSSL.cpp index b8185d2546a..1e0ce4e6a81 100644 --- a/cpp/src/Ice/ContextOpenSSL.cpp +++ b/cpp/src/Ice/ContextOpenSSL.cpp @@ -50,7 +50,7 @@ IceSSL::OpenSSL::Context::setCertificateVerifier(const CertificateVerifierPtr& v }
void
-IceSSL::OpenSSL::Context::addTrustedCertificate(const std::string& trustedCertString)
+IceSSL::OpenSSL::Context::addTrustedCertificateBase64(const std::string& trustedCertString)
{
if (_sslContext == 0)
{
@@ -78,6 +78,34 @@ IceSSL::OpenSSL::Context::addTrustedCertificate(const std::string& trustedCertSt }
void
+IceSSL::OpenSSL::Context::addTrustedCertificate(const Ice::ByteSeq& trustedCert)
+{
+ if (_sslContext == 0)
+ {
+ IceSSL::OpenSSL::ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__);
+
+ contextConfigEx._message = "SSL Context not configured.";
+
+ throw contextConfigEx;
+ }
+
+ RSAPublicKey pubKey(trustedCert);
+
+ X509_STORE* certStore = SSL_CTX_get_cert_store(_sslContext);
+
+ assert(certStore != 0);
+
+ if (X509_STORE_add_cert(certStore, pubKey.getX509PublicKey()) == 0)
+ {
+ IceSSL::OpenSSL::TrustedCertificateAddException trustEx(__FILE__, __LINE__);
+
+ trustEx._message = sslGetErrors();
+
+ throw trustEx;
+ }
+}
+
+void
IceSSL::OpenSSL::Context::setRSAKeysBase64(const std::string& privateKey,
const std::string& publicKey)
{
@@ -280,7 +308,7 @@ IceSSL::OpenSSL::Context::loadCertificateAuthority(const CertificateAuthority& c std::string caCertBase64 = _properties->getProperty(_caCertificateProperty);
if (!caCertBase64.empty())
{
- addTrustedCertificate(caCertBase64);
+ addTrustedCertificateBase64(caCertBase64);
}
}
|