summaryrefslogtreecommitdiff
path: root/cpp/include/IceSSL
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/include/IceSSL')
-rw-r--r--cpp/include/IceSSL/Makefile2
-rw-r--r--cpp/include/IceSSL/Makefile.mak2
-rw-r--r--cpp/include/IceSSL/Plugin.h15
3 files changed, 11 insertions, 8 deletions
diff --git a/cpp/include/IceSSL/Makefile b/cpp/include/IceSSL/Makefile
index 9936106ead9..74e0d75a772 100644
--- a/cpp/include/IceSSL/Makefile
+++ b/cpp/include/IceSSL/Makefile
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/IceSSL/Makefile.mak b/cpp/include/IceSSL/Makefile.mak
index 16fa4aa1ed7..303417dacfb 100644
--- a/cpp/include/IceSSL/Makefile.mak
+++ b/cpp/include/IceSSL/Makefile.mak
@@ -1,6 +1,6 @@
# **********************************************************************
#
-# Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
#
# This copy of Ice is licensed to you under the terms described in the
# ICE_LICENSE file included in this distribution.
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index 468ea3a59b3..bd9c3e92580 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -1,6 +1,6 @@
// **********************************************************************
//
-// Copyright (c) 2003-2008 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
//
// This copy of Ice is licensed to you under the terms described in the
// ICE_LICENSE file included in this distribution.
@@ -428,10 +428,10 @@ typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
// so the application can supply an implementation of PasswordPrompt
// to take responsibility for obtaining the password.
//
-// Note that the password is needed during plugin initialization, so
+// Note that the password is needed during plug-in initialization, so
// in general you will need to delay initialization (by defining
// IceSSL.DelayInit=1), configure the PasswordPrompt, then manually
-// initialize the plugin.
+// initialize the plug-in.
//
class PasswordPrompt : public IceUtil::Shared
{
@@ -452,13 +452,16 @@ public:
//
// Establish the OpenSSL context. This must be done before the
- // plugin is initialized, therefore the application must define
+ // plug-in is initialized, therefore the application must define
// the property Ice.InitPlugins=0, set the context, and finally
// invoke initializePlugins on the PluginManager.
//
// When the application supplies its own OpenSSL context, the
- // plugin skips its normal property-based configuration.
+ // plug-in ignores configuration properties related to certificates,
+ // keys, and passwords.
//
+ // Note that the plugin assumes ownership of the given context.
+ //
virtual void setContext(SSL_CTX*) = 0;
//
@@ -475,7 +478,7 @@ public:
//
// Establish the password prompt object. This must be done before
- // the plugin is initialized.
+ // the plug-in is initialized.
//
virtual void setPasswordPrompt(const PasswordPromptPtr&) = 0;
};