diff options
Diffstat (limited to 'cpp/src')
45 files changed, 357 insertions, 527 deletions
diff --git a/cpp/src/Glacier/StarterI.cpp b/cpp/src/Glacier/StarterI.cpp index 44de87d35a8..348ce4cfe58 100644 --- a/cpp/src/Glacier/StarterI.cpp +++ b/cpp/src/Glacier/StarterI.cpp @@ -22,7 +22,7 @@ using namespace std; using namespace Ice; using namespace Glacier; -using IceSSL::OpenSSL::RSAKeyPairPtr; +using IceSSL::RSAKeyPairPtr; Glacier::StarterI::StarterI(const CommunicatorPtr& communicator, const PasswordVerifierPrx& verifier) : _communicator(communicator), @@ -45,7 +45,7 @@ Glacier::StarterI::StarterI(const CommunicatorPtr& communicator, const PasswordV Int bitStrength = _properties->getPropertyAsIntWithDefault( "Glacier.Starter.Certificate.BitStrength", 1024); Int secondsValid = _properties->getPropertyAsIntWithDefault( - "Glacier.Starter.Certificate.SecondsValid", IceSSL::OpenSSL::RSACertificateGenContext::daysToSeconds(1)); + "Glacier.Starter.Certificate.SecondsValid", IceSSL::RSACertificateGenContext::daysToSeconds(1)); Int issuedAdjust = _properties->getPropertyAsIntWithDefault("Glacier.Starter.Certificate.IssuedAdjust", 0); _certContext.setCountry(country); diff --git a/cpp/src/Glacier/StarterI.h b/cpp/src/Glacier/StarterI.h index fbfa1de10a1..a5abf912738 100644 --- a/cpp/src/Glacier/StarterI.h +++ b/cpp/src/Glacier/StarterI.h @@ -18,8 +18,8 @@ namespace Glacier { -using IceSSL::OpenSSL::RSACertificateGenContext; -using IceSSL::OpenSSL::RSACertificateGen; +using IceSSL::RSACertificateGenContext; +using IceSSL::RSACertificateGen; class StarterI : public Starter { diff --git a/cpp/src/IceSSL/.depend b/cpp/src/IceSSL/.depend index 1a0bd69a44b..ad948f16397 100644 --- a/cpp/src/IceSSL/.depend +++ b/cpp/src/IceSSL/.depend @@ -1,22 +1,21 @@ Plugin.o: Plugin.cpp ../../include/IceSSL/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Stream.h Exception.o: Exception.cpp ../../include/IceSSL/Exception.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h -PluginBaseI.o: PluginBaseI.cpp ../../include/Ice/ProtocolPluginFacade.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/InstanceF.h ../../include/Ice/Communicator.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../IceSSL/PluginBaseI.h ../../include/IceSSL/Plugin.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/TraceLevels.h -OpenSSLPluginI.o: OpenSSLPluginI.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ProtocolPluginFacade.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/EndpointFactoryF.h ../IceSSL/OpenSSLPluginI.h ../IceSSL/PluginBaseI.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../../include/IceSSL/Exception.h ../IceSSL/ConfigParser.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h ../IceSSL/DefaultCertificateVerifier.h ../IceSSL/SingleCertificateVerifier.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../IceSSL/TraceLevels.h ../../include/IceSSL/RSAPrivateKey.h ../IceSSL/DHParams.h -SslEndpoint.o: SslEndpoint.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ProtocolPluginFacade.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/EndpointFactoryF.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../../include/Ice/EndpointF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../IceSSL/PluginBaseI.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/SslAcceptor.h ../Ice/Acceptor.h ../IceSSL/SslConnector.h ../Ice/Connector.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h +OpenSSLPluginI.o: OpenSSLPluginI.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ProtocolPluginFacade.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/EndpointFactoryF.h ../../include/Ice/Communicator.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/IceSSL/Plugin.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/TraceLevels.h ../../include/IceSSL/Exception.h ../IceSSL/ConfigParser.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h ../IceSSL/DefaultCertificateVerifier.h ../IceSSL/SingleCertificateVerifier.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../../include/IceSSL/RSAPrivateKey.h ../IceSSL/DHParams.h +SslEndpoint.o: SslEndpoint.cpp ../Ice/Network.h ../../include/Ice/Config.h ../../include/IceUtil/Config.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/ObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LocalException.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/ProtocolPluginFacade.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/EndpointFactoryF.h ../IceSSL/SslEndpoint.h ../Ice/Endpoint.h ../../include/Ice/EndpointF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/SslAcceptor.h ../../include/Ice/LoggerF.h ../Ice/Acceptor.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslConnector.h ../Ice/Connector.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslTransceiverF.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h SslException.o: SslException.cpp ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/IceSSL/Exception.h -SslConnector.o: SslConnector.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Network.h ../IceSSL/PluginBaseI.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/SslConnector.h ../Ice/TransceiverF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/TraceLevels.h -SslAcceptor.o: SslAcceptor.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Network.h ../IceSSL/PluginBaseI.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/SslAcceptor.h ../Ice/TransceiverF.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/TraceLevels.h -SslTransceiver.o: SslTransceiver.cpp ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslTransceiverF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/PluginBaseI.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../IceSSL/TraceLevels.h ../../include/Ice/Logger.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/OpenSSLUtils.h -SslClientTransceiver.o: SslClientTransceiver.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/SslClientTransceiver.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslTransceiverF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/PluginBaseI.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../IceSSL/TraceLevels.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h -SslServerTransceiver.o: SslServerTransceiver.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/PluginBaseI.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/TraceLevels.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/SslServerTransceiver.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h +SslConnector.o: SslConnector.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Network.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/SslConnector.h ../Ice/Connector.h ../Ice/ConnectorF.h ../IceSSL/TraceLevels.h +SslAcceptor.o: SslAcceptor.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../Ice/Network.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/SslAcceptor.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../IceSSL/TraceLevels.h +SslTransceiver.o: SslTransceiver.cpp ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslTransceiverF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/GeneralConfig.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/TraceLevels.h ../../include/Ice/Logger.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLUtils.h +SslClientTransceiver.o: SslClientTransceiver.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/SslClientTransceiver.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../IceSSL/SslTransceiverF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/GeneralConfig.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/TraceLevels.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h +SslServerTransceiver.o: SslServerTransceiver.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/LoggerUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/Buffer.h ../Ice/Network.h ../IceSSL/OpenSSL.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/Lock.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h ../IceSSL/TraceLevels.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/SslServerTransceiver.h BaseCerts.o: BaseCerts.cpp ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../../include/IceUtil/Config.h CertificateAuthority.o: CertificateAuthority.cpp ../IceSSL/CertificateAuthority.h ../../include/IceUtil/Config.h CertificateDesc.o: CertificateDesc.cpp ../IceSSL/CertificateDesc.h ../../include/IceUtil/Config.h ConfigParser.o: ConfigParser.cpp ../IceSSL/ConfigParser.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceSSL/CertificateDesc.h ../IceSSL/GeneralConfig.h ../IceSSL/OpenSSL.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/TraceLevelsF.h ../IceSSL/ConfigParserErrorReporter.h ../../include/IceSSL/Exception.h ConfigParserErrorReporter.o: ConfigParserErrorReporter.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceSSL/ConfigParserErrorReporter.h ../../include/Ice/LoggerF.h ../IceSSL/TraceLevelsF.h ../IceSSL/OpenSSL.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h -ContextOpenSSL.o: ContextOpenSSL.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../IceSSL/DefaultCertificateVerifier.h ../../include/Ice/LoggerF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../../include/IceSSL/Exception.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../IceSSL/CertificateDesc.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/PluginBaseIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/PropertiesF.h ../IceSSL/OpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h -ContextOpenSSLClient.o: ContextOpenSSLClient.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceSSL/Exception.h ../IceSSL/ContextOpenSSLClient.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../IceSSL/OpenSSL.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/PluginBaseIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslClientTransceiver.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h -ContextOpenSSLServer.o: ContextOpenSSLServer.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceSSL/Exception.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../IceSSL/OpenSSL.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/PluginBaseIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslServerTransceiver.h ../IceSSL/OpenSSLUtils.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h +Context.o: Context.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../IceSSL/DefaultCertificateVerifier.h ../../include/Ice/LoggerF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../../include/IceSSL/Exception.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../IceSSL/CertificateDesc.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/OpenSSLPluginIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/Context.h ../../include/Ice/PropertiesF.h ../IceSSL/OpenSSL.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../IceSSL/OpenSSLJanitors.h ../IceSSL/OpenSSLUtils.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h +ClientContext.o: ClientContext.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceSSL/Exception.h ../IceSSL/ClientContext.h ../IceSSL/Context.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../IceSSL/OpenSSL.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/OpenSSLPluginIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslClientTransceiver.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h +ServerContext.o: ServerContext.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/IceSSL/Exception.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../IceSSL/OpenSSL.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/CertificateDesc.h ../IceSSL/TempCerts.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/SslTransceiverF.h ../IceSSL/OpenSSLPluginIF.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/SslServerTransceiver.h ../IceSSL/OpenSSLUtils.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h GeneralConfig.o: GeneralConfig.cpp ../IceSSL/GeneralConfig.h ../IceSSL/OpenSSL.h ../../include/IceUtil/Config.h TempCerts.o: TempCerts.cpp ../IceSSL/TempCerts.h ../IceSSL/CertificateDesc.h ../../include/IceUtil/Config.h CertificateVerifier.o: CertificateVerifier.cpp ../../include/IceSSL/CertificateVerifier.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h @@ -28,7 +27,7 @@ RSAPrivateKey.o: RSAPrivateKey.cpp ../../include/IceUtil/Config.h ../../include/ RSAPublicKey.o: RSAPublicKey.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceSSL/RSAPublicKeyF.h ../IceSSL/Convert.h ../IceSSL/OpenSSLUtils.h ../../include/IceSSL/Exception.h RSAKeyPair.o: RSAKeyPair.cpp ../../include/IceUtil/Config.h ../../include/IceUtil/Base64.h ../../include/IceSSL/RSAKeyPair.h ../../include/IceUtil/Shared.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceSSL/RSAKeyPairF.h ../../include/IceSSL/RSACertificateGenF.h ../../include/IceSSL/RSAPrivateKeyF.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAPrivateKey.h ../../include/IceSSL/RSAPublicKey.h DHParams.o: DHParams.cpp ../IceSSL/DHParams.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../IceSSL/DHParamsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h -OpenSSLUtils.o: OpenSSLUtils.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../IceSSL/OpenSSLUtils.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../IceSSL/PluginBaseI.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/PluginBaseIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ContextOpenSSLServer.h ../IceSSL/ContextOpenSSL.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextOpenSSLF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ContextOpenSSLClient.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h +OpenSSLUtils.o: OpenSSLUtils.cpp ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Lock.h ../IceSSL/OpenSSLUtils.h ../IceSSL/OpenSSLPluginI.h ../../include/IceUtil/RecMutex.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/IceSSL/Plugin.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Plugin.h ../../include/Ice/LocalException.h ../../include/IceSSL/CertificateVerifierF.h ../IceSSL/OpenSSLPluginIF.h ../IceSSL/TraceLevelsF.h ../IceSSL/SslTransceiverF.h ../IceSSL/CertificateDesc.h ../IceSSL/CertificateAuthority.h ../IceSSL/BaseCerts.h ../IceSSL/TempCerts.h ../IceSSL/ServerContext.h ../IceSSL/Context.h ../IceSSL/OpenSSL.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/GeneralConfig.h ../IceSSL/SslTransceiver.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../IceSSL/ContextF.h ../../include/IceSSL/RSAPublicKey.h ../../include/IceSSL/RSAPublicKeyF.h ../../include/IceSSL/RSAKeyPairF.h ../IceSSL/ClientContext.h ../../include/IceSSL/RSAPrivateKeyF.h ../IceSSL/DHParamsF.h DefaultCertificateVerifier.o: DefaultCertificateVerifier.cpp ../../include/Ice/Logger.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../IceSSL/OpenSSL.h ../IceSSL/DefaultCertificateVerifier.h ../../include/Ice/LoggerF.h ../IceSSL/TraceLevelsF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/OpenSSLUtils.h ../IceSSL/TraceLevels.h ../../include/Ice/ProtocolPluginFacadeF.h SingleCertificateVerifier.o: SingleCertificateVerifier.cpp ../IceSSL/SingleCertificateVerifier.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Config.h ../../include/Ice/Config.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/IceSSL/CertificateVerifierOpenSSL.h ../../include/IceSSL/CertificateVerifier.h ../IceSSL/Convert.h TraceLevels.o: TraceLevels.cpp ../IceSSL/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/ProtocolPluginFacadeF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../IceSSL/TraceLevelsF.h ../../include/Ice/Communicator.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/StreamF.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionF.h ../../include/Ice/EndpointF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/Current.h ../../include/Ice/Identity.h ../../include/Ice/Facet.h ../../include/Ice/Object.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/Buffer.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/PropertiesF.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/Properties.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ProtocolPluginFacade.h ../../include/Ice/CommunicatorF.h ../../include/Ice/EndpointFactoryF.h diff --git a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp index a5dddb272b1..c9405961909 100644 --- a/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp +++ b/cpp/src/IceSSL/CertificateVerifierOpenSSL.cpp @@ -10,18 +10,18 @@ #include <IceSSL/CertificateVerifierOpenSSL.h> -IceSSL::OpenSSL::CertificateVerifier::~CertificateVerifier() +IceSSL::CertificateVerifierOpenSSL::~CertificateVerifierOpenSSL() { } void -IceInternal::incRef(::IceSSL::OpenSSL::CertificateVerifier* p) +IceInternal::incRef(::IceSSL::CertificateVerifierOpenSSL* p) { p->__incRef(); } void -IceInternal::decRef(::IceSSL::OpenSSL::CertificateVerifier* p) +IceInternal::decRef(::IceSSL::CertificateVerifierOpenSSL* p) { p->__decRef(); } diff --git a/cpp/src/IceSSL/ContextOpenSSLClient.cpp b/cpp/src/IceSSL/ClientContext.cpp index da127d331c3..0d05c03eb19 100644 --- a/cpp/src/IceSSL/ContextOpenSSLClient.cpp +++ b/cpp/src/IceSSL/ClientContext.cpp @@ -11,7 +11,7 @@ #include <Ice/Logger.h> #include <IceSSL/Exception.h> -#include <IceSSL/ContextOpenSSLClient.h> +#include <IceSSL/ClientContext.h> #include <IceSSL/SslClientTransceiver.h> #include <IceSSL/TraceLevels.h> @@ -50,11 +50,11 @@ IceSSL::ClientContext::configure(const GeneralConfig& generalConfig, } IceSSL::SslTransceiverPtr -IceSSL::ClientContext::createTransceiver(int socket, const PluginBaseIPtr& plugin) +IceSSL::ClientContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin) { if(_sslContext == 0) { - OpenSSL::ContextNotConfiguredException contextEx(__FILE__, __LINE__); + ContextNotConfiguredException contextEx(__FILE__, __LINE__); throw contextEx; } diff --git a/cpp/src/IceSSL/ContextOpenSSLClient.h b/cpp/src/IceSSL/ClientContext.h index 3a9921a92e6..5be3b3be6bc 100644 --- a/cpp/src/IceSSL/ContextOpenSSLClient.h +++ b/cpp/src/IceSSL/ClientContext.h @@ -11,7 +11,7 @@ #ifndef ICESSL_CLIENT_CONTEXT_H #define ICESSL_CLIENT_CONTEXT_H -#include <IceSSL/ContextOpenSSL.h> +#include <IceSSL/Context.h> namespace IceSSL { @@ -25,13 +25,13 @@ public: const BaseCertificates&); // Takes a socket fd as the first parameter. - virtual SslTransceiverPtr createTransceiver(int, const PluginBaseIPtr&); + virtual SslTransceiverPtr createTransceiver(int, const OpenSSLPluginIPtr&); protected: ClientContext(const TraceLevelsPtr&, const Ice::LoggerPtr&, const Ice::PropertiesPtr&); - friend class OpenSSL::PluginI; + friend class OpenSSLPluginI; }; } diff --git a/cpp/src/IceSSL/ContextOpenSSL.cpp b/cpp/src/IceSSL/Context.cpp index 405e4379c58..78179c7af99 100644 --- a/cpp/src/IceSSL/ContextOpenSSL.cpp +++ b/cpp/src/IceSSL/Context.cpp @@ -16,7 +16,7 @@ #include <IceSSL/RSAKeyPair.h> #include <IceSSL/CertificateDesc.h> #include <IceSSL/SslTransceiver.h> -#include <IceSSL/ContextOpenSSL.h> +#include <IceSSL/Context.h> #include <IceSSL/OpenSSLJanitors.h> #include <IceSSL/OpenSSLUtils.h> #include <IceSSL/TraceLevels.h> @@ -47,7 +47,7 @@ IceSSL::Context::isConfigured() } void -IceSSL::Context::setCertificateVerifier(const OpenSSL::CertificateVerifierPtr& verifier) +IceSSL::Context::setCertificateVerifier(const CertificateVerifierPtr& verifier) { _certificateVerifier = verifier; } @@ -55,7 +55,7 @@ IceSSL::Context::setCertificateVerifier(const OpenSSL::CertificateVerifierPtr& v void IceSSL::Context::addTrustedCertificateBase64(const string& trustedCertString) { - OpenSSL::RSAPublicKey pubKey(trustedCertString); + RSAPublicKey pubKey(trustedCertString); addTrustedCertificate(pubKey); } @@ -63,7 +63,7 @@ IceSSL::Context::addTrustedCertificateBase64(const string& trustedCertString) void IceSSL::Context::addTrustedCertificate(const Ice::ByteSeq& trustedCert) { - OpenSSL::RSAPublicKey pubKey(trustedCert); + RSAPublicKey pubKey(trustedCert); addTrustedCertificate(pubKey); } @@ -145,7 +145,7 @@ IceSSL::Context::Context(const TraceLevelsPtr& traceLevels, const LoggerPtr& log _logger(logger), _properties(properties) { - _certificateVerifier = new OpenSSL::DefaultCertificateVerifier(traceLevels, logger); + _certificateVerifier = new DefaultCertificateVerifier(traceLevels, logger); _sslContext = 0; _maxPassphraseRetriesDefault = "4"; @@ -214,9 +214,9 @@ IceSSL::Context::createContext(SslProtocol sslProtocol) if(_sslContext == 0) { - OpenSSL::ContextInitializationException contextInitEx(__FILE__, __LINE__); + ContextInitializationException contextInitEx(__FILE__, __LINE__); - contextInitEx.message = "unable to create ssl context\n" + OpenSSL::sslGetErrors(); + contextInitEx.message = "unable to create ssl context\n" + sslGetErrors(); throw contextInitEx; } @@ -320,10 +320,10 @@ IceSSL::Context::checkKeyCert() // set against the SSL context match up. if(!SSL_CTX_check_private_key(_sslContext)) { - OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx.message = "private key does not match the certificate public key"; - string sslError = OpenSSL::sslGetErrors(); + string sslError = sslGetErrors(); if(!sslError.empty()) { @@ -336,11 +336,11 @@ IceSSL::Context::checkKeyCert() } void -IceSSL::Context::addTrustedCertificate(const OpenSSL::RSAPublicKey& trustedCertificate) +IceSSL::Context::addTrustedCertificate(const RSAPublicKey& trustedCertificate) { if(_sslContext == 0) { - OpenSSL::ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); + ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); contextConfigEx.message = "ssl context not configured"; @@ -353,9 +353,9 @@ IceSSL::Context::addTrustedCertificate(const OpenSSL::RSAPublicKey& trustedCerti if(X509_STORE_add_cert(certStore, trustedCertificate.getX509PublicKey()) == 0) { - OpenSSL::TrustedCertificateAddException trustEx(__FILE__, __LINE__); + TrustedCertificateAddException trustEx(__FILE__, __LINE__); - trustEx.message = OpenSSL::sslGetErrors(); + trustEx.message = sslGetErrors(); throw trustEx; } @@ -379,12 +379,12 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate // Set which Public Key file to use. if(SSL_CTX_use_certificate_file(_sslContext, publicFile, publicEncoding) <= 0) { - OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx.message = "unable to load certificate from '"; certLoadEx.message += publicFile; certLoadEx.message += "'\n"; - certLoadEx.message += OpenSSL::sslGetErrors(); + certLoadEx.message += sslGetErrors(); throw certLoadEx; } @@ -407,7 +407,7 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate while(retryCount != _maxPassphraseTries) { // We ignore the errors and remove them from the stack. - string errorString = OpenSSL::sslGetErrors(); + string errorString = sslGetErrors(); // Set which Private Key file to use. pkLoadResult = SSL_CTX_use_PrivateKey_file(_sslContext, privKeyFile, privKeyFileType); @@ -444,10 +444,10 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate // key matches the private key when calling SSL_CTX_use_PrivateKey_file(). if(errCode == X509_R_KEY_VALUES_MISMATCH || errCode == X509_R_KEY_TYPE_MISMATCH) { - OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx.message = "private key does not match the certificate public key"; - string sslError = OpenSSL::sslGetErrors(); + string sslError = sslGetErrors(); if(!sslError.empty()) { @@ -459,12 +459,12 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate } else { - OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx.message = "unable to load private key from '"; pklEx.message += privKeyFile; pklEx.message += "'\n"; - pklEx.message += OpenSSL::sslGetErrors(); + pklEx.message += sslGetErrors(); throw pklEx; } @@ -475,11 +475,11 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate } void -IceSSL::Context::addKeyCert(const OpenSSL::RSAKeyPair& keyPair) +IceSSL::Context::addKeyCert(const RSAKeyPair& keyPair) { if(_sslContext == 0) { - OpenSSL::ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); + ContextNotConfiguredException contextConfigEx(__FILE__, __LINE__); contextConfigEx.message = "ssl context not configured"; @@ -494,10 +494,10 @@ IceSSL::Context::addKeyCert(const OpenSSL::RSAKeyPair& keyPair) // Set which Public Key file to use. if(SSL_CTX_use_certificate(_sslContext, keyPair.getX509PublicKey()) <= 0) { - OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx.message = "unable to set certificate from memory"; - string sslError = OpenSSL::sslGetErrors(); + string sslError = sslGetErrors(); if(!sslError.empty()) { @@ -517,10 +517,10 @@ IceSSL::Context::addKeyCert(const OpenSSL::RSAKeyPair& keyPair) // key matches the private key when calling SSL_CTX_use_PrivateKey_file(). if(errCode == X509_R_KEY_VALUES_MISMATCH || errCode == X509_R_KEY_TYPE_MISMATCH) { - OpenSSL::CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); + CertificateKeyMatchException certKeyMatchEx(__FILE__, __LINE__); certKeyMatchEx.message = "private key does not match the certificate public key"; - string sslError = OpenSSL::sslGetErrors(); + string sslError = sslGetErrors(); if(!sslError.empty()) { @@ -532,10 +532,10 @@ IceSSL::Context::addKeyCert(const OpenSSL::RSAKeyPair& keyPair) } else { - OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx.message = "unable to set private key from memory"; - string sslError = OpenSSL::sslGetErrors(); + string sslError = sslGetErrors(); if(!sslError.empty()) { @@ -566,7 +566,7 @@ IceSSL::Context::addKeyCert(const Ice::ByteSeq& privateKey, const Ice::ByteSeq& } // Make a key pair based on the DER encoded byte sequences. - addKeyCert(OpenSSL::RSAKeyPair(privKey, publicKey)); + addKeyCert(RSAKeyPair(privKey, publicKey)); } void @@ -585,7 +585,7 @@ IceSSL::Context::addKeyCert(const string& privateKey, const string& publicKey) } // Make a key pair based on the Base64 encoded strings. - addKeyCert(OpenSSL::RSAKeyPair(privKey, publicKey)); + addKeyCert(RSAKeyPair(privKey, publicKey)); } SSL* @@ -621,7 +621,7 @@ IceSSL::Context::setCipherList(const string& cipherList) (_traceLevels->security >= IceSSL::SECURITY_WARNINGS)) { string errorString = "WRN error setting cipher list " + cipherList + " -- using default list\n"; - errorString += OpenSSL::sslGetErrors(); + errorString += sslGetErrors(); _logger->trace(_traceLevels->securityCat, errorString); } } @@ -637,7 +637,7 @@ IceSSL::Context::setDHParams(const BaseCertificates& baseCerts) // File type must be PEM - that's the only way we can load DH Params, apparently. if((!dhFile.empty()) && (encoding == SSL_FILETYPE_PEM)) { - dh = OpenSSL::loadDHParam(dhFile.c_str()); + dh = loadDHParam(dhFile.c_str()); } if(dh == 0) @@ -648,7 +648,7 @@ IceSSL::Context::setDHParams(const BaseCertificates& baseCerts) "WRN Could not load Diffie-Hellman params, generating a temporary 512bit key."); } - dh = OpenSSL::getTempDH512(); + dh = getTempDH512(); } if(dh != 0) diff --git a/cpp/src/IceSSL/ContextOpenSSL.h b/cpp/src/IceSSL/Context.h index 33168853311..c709237e944 100644 --- a/cpp/src/IceSSL/ContextOpenSSL.h +++ b/cpp/src/IceSSL/Context.h @@ -22,20 +22,13 @@ #include <IceSSL/BaseCerts.h> #include <IceSSL/TempCerts.h> #include <IceSSL/SslTransceiver.h> -#include <IceSSL/ContextOpenSSLF.h> +#include <IceSSL/ContextF.h> #include <IceSSL/RSAPublicKey.h> #include <IceSSL/RSAKeyPairF.h> namespace IceSSL { -namespace OpenSSL -{ - -class PluginI; - -} - class Context : public IceUtil::Shared { public: @@ -44,7 +37,7 @@ public: bool isConfigured(); - virtual void setCertificateVerifier(const OpenSSL::CertificateVerifierPtr&); + virtual void setCertificateVerifier(const CertificateVerifierPtr&); virtual void addTrustedCertificateBase64(const std::string&); @@ -59,7 +52,7 @@ public: const BaseCertificates&); // Takes a socket fd as the first parameter. - virtual SslTransceiverPtr createTransceiver(int, const PluginBaseIPtr&) = 0; + virtual SslTransceiverPtr createTransceiver(int, const OpenSSLPluginIPtr&) = 0; protected: @@ -74,11 +67,11 @@ protected: void checkKeyCert(); - void addTrustedCertificate(const OpenSSL::RSAPublicKey&); + void addTrustedCertificate(const RSAPublicKey&); void addKeyCert(const CertificateFile&, const CertificateFile&); - void addKeyCert(const OpenSSL::RSAKeyPair&); + void addKeyCert(const RSAKeyPair&); void addKeyCert(const Ice::ByteSeq&, const Ice::ByteSeq&); @@ -105,7 +98,7 @@ protected: std::string _passphraseRetriesProperty; std::string _maxPassphraseRetriesDefault; - OpenSSL::CertificateVerifierPtr _certificateVerifier; + CertificateVerifierPtr _certificateVerifier; SSL_CTX* _sslContext; diff --git a/cpp/src/IceSSL/ContextOpenSSLF.h b/cpp/src/IceSSL/ContextF.h index 918b37b62dd..918b37b62dd 100644 --- a/cpp/src/IceSSL/ContextOpenSSLF.h +++ b/cpp/src/IceSSL/ContextF.h diff --git a/cpp/src/IceSSL/DHParams.cpp b/cpp/src/IceSSL/DHParams.cpp index 8c299c7db2c..3655f655bb9 100644 --- a/cpp/src/IceSSL/DHParams.cpp +++ b/cpp/src/IceSSL/DHParams.cpp @@ -10,16 +10,16 @@ #include <IceSSL/DHParams.h> -void ::IceInternal::incRef(::IceSSL::OpenSSL::DHParams* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::OpenSSL::DHParams* p) { p->__decRef(); } +void ::IceInternal::incRef(::IceSSL::DHParams* p) { p->__incRef(); } +void ::IceInternal::decRef(::IceSSL::DHParams* p) { p->__decRef(); } -IceSSL::OpenSSL::DHParams::DHParams(DH* dhParams) : - _dhParams(dhParams) +IceSSL::DHParams::DHParams(DH* dhParams) : + _dhParams(dhParams) { assert(_dhParams != 0); } -IceSSL::OpenSSL::DHParams::~DHParams() +IceSSL::DHParams::~DHParams() { if(_dhParams != 0) { @@ -28,7 +28,7 @@ IceSSL::OpenSSL::DHParams::~DHParams() } DH* -IceSSL::OpenSSL::DHParams::get() const +IceSSL::DHParams::get() const { return _dhParams; } diff --git a/cpp/src/IceSSL/DHParams.h b/cpp/src/IceSSL/DHParams.h index 6edecb620cc..32fda87d031 100644 --- a/cpp/src/IceSSL/DHParams.h +++ b/cpp/src/IceSSL/DHParams.h @@ -18,9 +18,6 @@ namespace IceSSL { -namespace OpenSSL -{ - class DHParams : public IceUtil::Shared { public: @@ -40,6 +37,4 @@ private: } -} - #endif diff --git a/cpp/src/IceSSL/DHParamsF.h b/cpp/src/IceSSL/DHParamsF.h index 7c5545410c2..8cfc1bf06a9 100644 --- a/cpp/src/IceSSL/DHParamsF.h +++ b/cpp/src/IceSSL/DHParamsF.h @@ -16,21 +16,16 @@ namespace IceSSL { -namespace OpenSSL -{ - class DHParams; typedef IceInternal::Handle<DHParams> DHParamsPtr; } -} - namespace IceInternal { -void incRef(::IceSSL::OpenSSL::DHParams*); -void decRef(::IceSSL::OpenSSL::DHParams*); +void incRef(::IceSSL::DHParams*); +void decRef(::IceSSL::DHParams*); } diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp index a38e701d8a0..0c37fa4fba5 100644 --- a/cpp/src/IceSSL/DefaultCertificateVerifier.cpp +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.cpp @@ -18,16 +18,15 @@ using namespace std; -IceSSL::OpenSSL::DefaultCertificateVerifier::DefaultCertificateVerifier(const IceSSL::TraceLevelsPtr& traceLevels, - const Ice::LoggerPtr& logger) : +IceSSL::DefaultCertificateVerifier::DefaultCertificateVerifier(const IceSSL::TraceLevelsPtr& traceLevels, + const Ice::LoggerPtr& logger) : _traceLevels(traceLevels), _logger(logger) { } int -IceSSL::OpenSSL::DefaultCertificateVerifier::verify(int preVerifyOkay, X509_STORE_CTX* x509StoreContext, - SSL* sslConnection) +IceSSL::DefaultCertificateVerifier::verify(int preVerifyOkay, X509_STORE_CTX* x509StoreContext, SSL* sslConnection) { // // Default verification steps. diff --git a/cpp/src/IceSSL/DefaultCertificateVerifier.h b/cpp/src/IceSSL/DefaultCertificateVerifier.h index f19bffb6e9a..5977f9b8a2e 100644 --- a/cpp/src/IceSSL/DefaultCertificateVerifier.h +++ b/cpp/src/IceSSL/DefaultCertificateVerifier.h @@ -18,10 +18,7 @@ namespace IceSSL { -namespace OpenSSL -{ - -class DefaultCertificateVerifier : public IceSSL::OpenSSL::CertificateVerifier +class DefaultCertificateVerifier : public IceSSL::CertificateVerifierOpenSSL { public: @@ -37,6 +34,4 @@ private: } -} - #endif diff --git a/cpp/src/IceSSL/Makefile b/cpp/src/IceSSL/Makefile index 294eb9cc2fe..54d7486b87d 100644 --- a/cpp/src/IceSSL/Makefile +++ b/cpp/src/IceSSL/Makefile @@ -20,7 +20,6 @@ TARGETS = $(NAME) $(VERSIONED_NAME) OBJS = Plugin.o \ Exception.o \ - PluginBaseI.o \ OpenSSLPluginI.o \ SslEndpoint.o \ SslException.o \ @@ -34,9 +33,9 @@ OBJS = Plugin.o \ CertificateDesc.o \ ConfigParser.o \ ConfigParserErrorReporter.o \ - ContextOpenSSL.o \ - ContextOpenSSLClient.o \ - ContextOpenSSLServer.o \ + Context.o \ + ClientContext.o \ + ServerContext.o \ GeneralConfig.o \ TempCerts.o \ CertificateVerifier.o \ diff --git a/cpp/src/IceSSL/OpenSSLJanitors.cpp b/cpp/src/IceSSL/OpenSSLJanitors.cpp index 1b4581bd5fb..67199c7b346 100644 --- a/cpp/src/IceSSL/OpenSSLJanitors.cpp +++ b/cpp/src/IceSSL/OpenSSLJanitors.cpp @@ -10,13 +10,13 @@ #include <IceSSL/OpenSSLJanitors.h> -IceSSL::OpenSSL::RSAJanitor::RSAJanitor(RSA* rsa) : +IceSSL::RSAJanitor::RSAJanitor(RSA* rsa) : _rsa(rsa) { assert(_rsa != 0); } -IceSSL::OpenSSL::RSAJanitor::~RSAJanitor() +IceSSL::RSAJanitor::~RSAJanitor() { if(_rsa) { @@ -25,24 +25,24 @@ IceSSL::OpenSSL::RSAJanitor::~RSAJanitor() } void -IceSSL::OpenSSL::RSAJanitor::clear() +IceSSL::RSAJanitor::clear() { _rsa = 0; } RSA* -IceSSL::OpenSSL::RSAJanitor::get() const +IceSSL::RSAJanitor::get() const { return _rsa; } -IceSSL::OpenSSL::EVP_PKEYJanitor::EVP_PKEYJanitor(EVP_PKEY* evp_pkey) : +IceSSL::EVP_PKEYJanitor::EVP_PKEYJanitor(EVP_PKEY* evp_pkey) : _evp_pkey(evp_pkey) { assert(_evp_pkey != 0); } -IceSSL::OpenSSL::EVP_PKEYJanitor::~EVP_PKEYJanitor() +IceSSL::EVP_PKEYJanitor::~EVP_PKEYJanitor() { if(_evp_pkey) { @@ -51,24 +51,24 @@ IceSSL::OpenSSL::EVP_PKEYJanitor::~EVP_PKEYJanitor() } void -IceSSL::OpenSSL::EVP_PKEYJanitor::clear() +IceSSL::EVP_PKEYJanitor::clear() { _evp_pkey = 0; } EVP_PKEY* -IceSSL::OpenSSL::EVP_PKEYJanitor::get() const +IceSSL::EVP_PKEYJanitor::get() const { return _evp_pkey; } -IceSSL::OpenSSL::X509_REQJanitor::X509_REQJanitor(X509_REQ* x509_req) : +IceSSL::X509_REQJanitor::X509_REQJanitor(X509_REQ* x509_req) : _x509_req(x509_req) { assert(_x509_req != 0); } -IceSSL::OpenSSL::X509_REQJanitor::~X509_REQJanitor() +IceSSL::X509_REQJanitor::~X509_REQJanitor() { if(_x509_req) { @@ -77,24 +77,24 @@ IceSSL::OpenSSL::X509_REQJanitor::~X509_REQJanitor() } void -IceSSL::OpenSSL::X509_REQJanitor::clear() +IceSSL::X509_REQJanitor::clear() { _x509_req = 0; } X509_REQ* -IceSSL::OpenSSL::X509_REQJanitor::get() const +IceSSL::X509_REQJanitor::get() const { return _x509_req; } -IceSSL::OpenSSL::X509Janitor::X509Janitor(X509* x509) : +IceSSL::X509Janitor::X509Janitor(X509* x509) : _x509(x509) { assert(_x509 != 0); } -IceSSL::OpenSSL::X509Janitor::~X509Janitor() +IceSSL::X509Janitor::~X509Janitor() { if(_x509) { @@ -103,24 +103,24 @@ IceSSL::OpenSSL::X509Janitor::~X509Janitor() } void -IceSSL::OpenSSL::X509Janitor::clear() +IceSSL::X509Janitor::clear() { _x509 = 0; } X509* -IceSSL::OpenSSL::X509Janitor::get() const +IceSSL::X509Janitor::get() const { return _x509; } -IceSSL::OpenSSL::BIOJanitor::BIOJanitor(BIO* bio) : +IceSSL::BIOJanitor::BIOJanitor(BIO* bio) : _bio(bio) { assert(_bio != 0); } -IceSSL::OpenSSL::BIOJanitor::~BIOJanitor() +IceSSL::BIOJanitor::~BIOJanitor() { if(_bio) { @@ -129,13 +129,13 @@ IceSSL::OpenSSL::BIOJanitor::~BIOJanitor() } void -IceSSL::OpenSSL::BIOJanitor::clear() +IceSSL::BIOJanitor::clear() { _bio = 0; } BIO* -IceSSL::OpenSSL::BIOJanitor::get() const +IceSSL::BIOJanitor::get() const { return _bio; } diff --git a/cpp/src/IceSSL/OpenSSLJanitors.h b/cpp/src/IceSSL/OpenSSLJanitors.h index 4a8983b9823..7e2864ae6f8 100644 --- a/cpp/src/IceSSL/OpenSSLJanitors.h +++ b/cpp/src/IceSSL/OpenSSLJanitors.h @@ -17,9 +17,6 @@ namespace IceSSL { -namespace OpenSSL -{ - class RSAJanitor { public: @@ -97,6 +94,4 @@ private: } -} - #endif diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp index daeb1590a60..9efe00d324e 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.cpp +++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp @@ -8,16 +8,15 @@ // // ********************************************************************** -// -// This needs to be first since <openssl/e_os.h> #include <windows.h> -// without our configuration settings. -// #include <IceUtil/Mutex.h> -#include <IceUtil/RecMutex.h> + #include <Ice/Logger.h> #include <Ice/Properties.h> #include <Ice/ProtocolPluginFacade.h> +#include <Ice/Communicator.h> + #include <IceSSL/OpenSSLPluginI.h> +#include <IceSSL/TraceLevels.h> #include <IceSSL/Exception.h> #include <IceSSL/ConfigParser.h> #include <IceSSL/OpenSSLJanitors.h> @@ -26,14 +25,12 @@ #include <IceSSL/DefaultCertificateVerifier.h> #include <IceSSL/SingleCertificateVerifier.h> #include <IceSSL/SslEndpoint.h> -#include <IceSSL/TraceLevels.h> - #include <IceSSL/RSAPrivateKey.h> #include <IceSSL/DHParams.h> #include <openssl/e_os.h> #include <openssl/rand.h> -//#include <openssl/dh.h> +#include <openssl/err.h> #include <sstream> @@ -49,6 +46,9 @@ using namespace Ice; using namespace IceInternal; using namespace IceSSL; +void IceInternal::incRef(::IceSSL::OpenSSLPluginI* p) { p->__incRef(); } +void IceInternal::decRef(::IceSSL::OpenSSLPluginI* p) { p->__decRef(); } + // // Plugin factory function // @@ -60,7 +60,7 @@ create(const CommunicatorPtr& communicator, const string& name, const StringSeq& { ProtocolPluginFacadePtr facade = getProtocolPluginFacade(communicator); - IceSSL::OpenSSL::PluginI* plugin = new IceSSL::OpenSSL::PluginI(facade); + IceSSL::OpenSSLPluginI* plugin = new IceSSL::OpenSSLPluginI(facade); try { plugin->configure(); @@ -152,8 +152,38 @@ IceSSL::SslLockKeeper::~SslLockKeeper() // // PluginI implementation // + +// +// Public Methods +// +// +IceSSL::OpenSSLPluginI::OpenSSLPluginI(const ProtocolPluginFacadePtr& protocolPluginFacade) : + _protocolPluginFacade(protocolPluginFacade), + _serverContext(new TraceLevels(protocolPluginFacade), + protocolPluginFacade->getCommunicator()->getLogger(), + protocolPluginFacade->getCommunicator()->getProperties()), + _clientContext(new TraceLevels(protocolPluginFacade), + protocolPluginFacade->getCommunicator()->getLogger(), + protocolPluginFacade->getCommunicator()->getProperties()) +{ + _logger = _protocolPluginFacade->getCommunicator()->getLogger(); + _properties = _protocolPluginFacade->getCommunicator()->getProperties(); + _traceLevels = new TraceLevels(_protocolPluginFacade); + + _randSeeded = 0; + + SSL_load_error_strings(); + + OpenSSL_add_ssl_algorithms(); +} + +IceSSL::OpenSSLPluginI::~OpenSSLPluginI() +{ + ERR_free_strings(); +} + IceSSL::SslTransceiverPtr -IceSSL::OpenSSL::PluginI::createTransceiver(ContextType connectionType, int socket) +IceSSL::OpenSSLPluginI::createTransceiver(ContextType connectionType, int socket) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -187,7 +217,7 @@ IceSSL::OpenSSL::PluginI::createTransceiver(ContextType connectionType, int sock } bool -IceSSL::OpenSSL::PluginI::isConfigured(ContextType contextType) +IceSSL::OpenSSLPluginI::isConfigured(ContextType contextType) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -218,7 +248,7 @@ IceSSL::OpenSSL::PluginI::isConfigured(ContextType contextType) } void -IceSSL::OpenSSL::PluginI::configure() +IceSSL::OpenSSLPluginI::configure() { string clientConfigFile = _properties->getProperty("IceSSL.Client.Config"); string serverConfigFile = _properties->getProperty("IceSSL.Server.Config"); @@ -241,7 +271,7 @@ IceSSL::OpenSSL::PluginI::configure() } void -IceSSL::OpenSSL::PluginI::configure(ContextType contextType) +IceSSL::OpenSSLPluginI::configure(ContextType contextType) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -286,7 +316,7 @@ IceSSL::OpenSSL::PluginI::configure(ContextType contextType) } void -IceSSL::OpenSSL::PluginI::loadConfig(ContextType contextType, +IceSSL::OpenSSLPluginI::loadConfig(ContextType contextType, const std::string& configFile, const std::string& certPath) { @@ -374,7 +404,7 @@ IceSSL::OpenSSL::PluginI::loadConfig(ContextType contextType, } RSA* -IceSSL::OpenSSL::PluginI::getRSAKey(int isExport, int keyLength) +IceSSL::OpenSSLPluginI::getRSAKey(int isExport, int keyLength) { IceUtil::Mutex::Lock sync(_tempRSAKeysMutex); @@ -467,7 +497,7 @@ IceSSL::OpenSSL::PluginI::getRSAKey(int isExport, int keyLength) } DH* -IceSSL::OpenSSL::PluginI::getDHParams(int isExport, int keyLength) +IceSSL::OpenSSLPluginI::getDHParams(int isExport, int keyLength) { IceUtil::Mutex::Lock sync(_tempDHKeysMutex); @@ -547,13 +577,13 @@ IceSSL::OpenSSL::PluginI::getDHParams(int isExport, int keyLength) } void -IceSSL::OpenSSL::PluginI::setCertificateVerifier(ContextType contextType, - const IceSSL::CertificateVerifierPtr& verifier) +IceSSL::OpenSSLPluginI::setCertificateVerifier(ContextType contextType, + const IceSSL::CertificateVerifierPtr& verifier) { IceUtil::RecMutex::Lock sync(_configMutex); - IceSSL::OpenSSL::CertificateVerifierPtr castVerifier; - castVerifier = IceSSL::OpenSSL::CertificateVerifierPtr::dynamicCast(verifier); + IceSSL::CertificateVerifierOpenSSLPtr castVerifier; + castVerifier = IceSSL::CertificateVerifierOpenSSLPtr::dynamicCast(verifier); if(!castVerifier.get()) { @@ -573,7 +603,7 @@ IceSSL::OpenSSL::PluginI::setCertificateVerifier(ContextType contextType, } void -IceSSL::OpenSSL::PluginI::addTrustedCertificateBase64(ContextType contextType, const string& certString) +IceSSL::OpenSSLPluginI::addTrustedCertificateBase64(ContextType contextType, const string& certString) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -589,7 +619,7 @@ IceSSL::OpenSSL::PluginI::addTrustedCertificateBase64(ContextType contextType, c } void -IceSSL::OpenSSL::PluginI::addTrustedCertificate(ContextType contextType, const Ice::ByteSeq& certSeq) +IceSSL::OpenSSLPluginI::addTrustedCertificate(ContextType contextType, const Ice::ByteSeq& certSeq) { IceUtil::RecMutex::Lock sync(_configMutex); @@ -605,7 +635,7 @@ IceSSL::OpenSSL::PluginI::addTrustedCertificate(ContextType contextType, const I } void -IceSSL::OpenSSL::PluginI::setRSAKeysBase64(ContextType contextType, +IceSSL::OpenSSLPluginI::setRSAKeysBase64(ContextType contextType, const std::string& privateKey, const std::string& publicKey) { @@ -623,7 +653,7 @@ IceSSL::OpenSSL::PluginI::setRSAKeysBase64(ContextType contextType, } void -IceSSL::OpenSSL::PluginI::setRSAKeys(ContextType contextType, +IceSSL::OpenSSLPluginI::setRSAKeys(ContextType contextType, const ::Ice::ByteSeq& privateKey, const ::Ice::ByteSeq& publicKey) { @@ -641,40 +671,44 @@ IceSSL::OpenSSL::PluginI::setRSAKeys(ContextType contextType, } IceSSL::CertificateVerifierPtr -IceSSL::OpenSSL::PluginI::getDefaultCertVerifier() +IceSSL::OpenSSLPluginI::getDefaultCertVerifier() { return new DefaultCertificateVerifier(getTraceLevels(), getLogger()); } IceSSL::CertificateVerifierPtr -IceSSL::OpenSSL::PluginI::getSingleCertVerifier(const ByteSeq& certSeq) +IceSSL::OpenSSLPluginI::getSingleCertVerifier(const ByteSeq& certSeq) { return new SingleCertificateVerifier(certSeq); } void -IceSSL::OpenSSL::PluginI::destroy() +IceSSL::OpenSSLPluginI::destroy() { } -// -// Protected -// - -IceSSL::OpenSSL::PluginI::PluginI(const ProtocolPluginFacadePtr& protocolPluginFacade) : - PluginBaseI(protocolPluginFacade), - _serverContext(getTraceLevels(), getLogger(), getProperties()), - _clientContext(getTraceLevels(), getLogger(), getProperties()) +TraceLevelsPtr +IceSSL::OpenSSLPluginI::getTraceLevels() const { - _randSeeded = 0; + return _traceLevels; +} - SSL_load_error_strings(); +LoggerPtr +IceSSL::OpenSSLPluginI::getLogger() const +{ + return _logger; +} - OpenSSL_add_ssl_algorithms(); +PropertiesPtr +IceSSL::OpenSSLPluginI::getProperties() const +{ + return _properties; } -IceSSL::OpenSSL::PluginI::~PluginI() +ProtocolPluginFacadePtr +IceSSL::OpenSSLPluginI::getProtocolPluginFacade() const { + return _protocolPluginFacade; } // @@ -682,7 +716,7 @@ IceSSL::OpenSSL::PluginI::~PluginI() // int -IceSSL::OpenSSL::PluginI::seedRand() +IceSSL::OpenSSLPluginI::seedRand() { #ifdef WINDOWS RAND_screen(); @@ -700,7 +734,7 @@ IceSSL::OpenSSL::PluginI::seedRand() } long -IceSSL::OpenSSL::PluginI::loadRandFiles(const string& names) +IceSSL::OpenSSLPluginI::loadRandFiles(const string& names) { if(!names.empty()) { @@ -749,7 +783,7 @@ IceSSL::OpenSSL::PluginI::loadRandFiles(const string& names) } void -IceSSL::OpenSSL::PluginI::initRandSystem(const string& randBytesFiles) +IceSSL::OpenSSLPluginI::initRandSystem(const string& randBytesFiles) { if(_randSeeded) { @@ -776,7 +810,7 @@ IceSSL::OpenSSL::PluginI::initRandSystem(const string& randBytesFiles) } void -IceSSL::OpenSSL::PluginI::loadTempCerts(TempCertificates& tempCerts) +IceSSL::OpenSSLPluginI::loadTempCerts(TempCertificates& tempCerts) { RSAVector::iterator iRSA = tempCerts.getRSACerts().begin(); RSAVector::iterator eRSA = tempCerts.getRSACerts().end(); diff --git a/cpp/src/IceSSL/OpenSSLPluginI.h b/cpp/src/IceSSL/OpenSSLPluginI.h index 36a9ac887ee..bd4a5036daf 100644 --- a/cpp/src/IceSSL/OpenSSLPluginI.h +++ b/cpp/src/IceSSL/OpenSSLPluginI.h @@ -1,6 +1,6 @@ // ********************************************************************** // -// Copyright (c) 2002 +// Copyright (c) 2001 // Mutable Realms, Inc. // Huntsville, AL, USA // @@ -12,42 +12,50 @@ #define ICE_SSL_OPENSSL_PLUGIN_I_H #include <IceUtil/RecMutex.h> -#include <IceSSL/PluginBaseI.h> + +#include <Ice/LoggerF.h> +#include <Ice/PropertiesF.h> +#include <Ice/ProtocolPluginFacadeF.h> + +#include <IceSSL/Plugin.h> +#include <IceSSL/OpenSSLPluginIF.h> +#include <IceSSL/CertificateVerifierF.h> +#include <IceSSL/TraceLevelsF.h> +#include <IceSSL/SslTransceiverF.h> #include <IceSSL/CertificateDesc.h> #include <IceSSL/CertificateAuthority.h> #include <IceSSL/BaseCerts.h> #include <IceSSL/TempCerts.h> -#include <IceSSL/ContextOpenSSLServer.h> -#include <IceSSL/ContextOpenSSLClient.h> +#include <IceSSL/ServerContext.h> +#include <IceSSL/ClientContext.h> #include <IceSSL/RSAPrivateKeyF.h> #include <IceSSL/DHParamsF.h> + #include <openssl/ssl.h> namespace IceSSL { -namespace OpenSSL -{ - typedef std::map<int,RSAPrivateKeyPtr> RSAMap; typedef std::map<int,DHParamsPtr> DHMap; typedef std::map<int,CertificateDesc> RSACertMap; typedef std::map<int,DiffieHellmanParamsFile> DHParamsMap; -class PluginI : public PluginBaseI +class OpenSSLPluginI : public Plugin { public: - PluginI(const IceInternal::ProtocolPluginFacadePtr&); - ~PluginI(); - - virtual IceSSL::SslTransceiverPtr createTransceiver(ContextType, int); + OpenSSLPluginI(const IceInternal::ProtocolPluginFacadePtr&); + virtual ~OpenSSLPluginI(); + + + virtual SslTransceiverPtr createTransceiver(ContextType, int); virtual bool isConfigured(ContextType); virtual void configure(); virtual void configure(ContextType); - virtual void loadConfig(ContextType, const std::string&, const std::string&); + virtual void loadConfig(ContextType, const ::std::string&, const ::std::string&); // Returns the desired RSA Key, or creates it if not already created. // This is public because the tmpRSACallback must be able to access it. @@ -60,23 +68,26 @@ public: // This is public because the tmpDHCallback must be able to access it. DH* getDHParams(int, int); - virtual void setCertificateVerifier(ContextType, const IceSSL::CertificateVerifierPtr&); - + virtual void setCertificateVerifier(ContextType, const CertificateVerifierPtr&); virtual void addTrustedCertificateBase64(ContextType, const std::string&); - virtual void addTrustedCertificate(ContextType, const Ice::ByteSeq&); - virtual void setRSAKeysBase64(ContextType, const std::string&, const std::string&); - - virtual void setRSAKeys(ContextType, const Ice::ByteSeq&, const Ice::ByteSeq&); + virtual void setRSAKeys(ContextType, const ::Ice::ByteSeq&, const ::Ice::ByteSeq&); virtual IceSSL::CertificateVerifierPtr getDefaultCertVerifier(); - virtual IceSSL::CertificateVerifierPtr getSingleCertVerifier(const Ice::ByteSeq&); - virtual void destroy(); + TraceLevelsPtr getTraceLevels() const; + Ice::LoggerPtr getLogger() const; + Ice::PropertiesPtr getProperties() const; + IceInternal::ProtocolPluginFacadePtr getProtocolPluginFacade() const; + private: + IceInternal::ProtocolPluginFacadePtr _protocolPluginFacade; + TraceLevelsPtr _traceLevels; + Ice::LoggerPtr _logger; + Ice::PropertiesPtr _properties; IceSSL::ServerContext _serverContext; IceSSL::ClientContext _clientContext; @@ -113,6 +124,5 @@ private: } -} - #endif + diff --git a/cpp/src/IceSSL/OpenSSLUtils.cpp b/cpp/src/IceSSL/OpenSSLUtils.cpp index 65251b1d08d..1f436921870 100644 --- a/cpp/src/IceSSL/OpenSSLUtils.cpp +++ b/cpp/src/IceSSL/OpenSSLUtils.cpp @@ -144,7 +144,7 @@ static const char *mon[12]= }; string -IceSSL::OpenSSL::getGeneralizedTime(ASN1_GENERALIZEDTIME *tm) +IceSSL::getGeneralizedTime(ASN1_GENERALIZEDTIME *tm) { assert(tm != 0); @@ -199,7 +199,7 @@ err: } string -IceSSL::OpenSSL::getUTCTime(ASN1_UTCTIME *tm) +IceSSL::getUTCTime(ASN1_UTCTIME *tm) { assert(tm != 0); @@ -258,7 +258,7 @@ err: } string -IceSSL::OpenSSL::getASN1time(ASN1_TIME *tm) +IceSSL::getASN1time(ASN1_TIME *tm) { assert(tm != 0); @@ -289,7 +289,7 @@ IceSSL::OpenSSL::getASN1time(ASN1_TIME *tm) } DH* -IceSSL::OpenSSL::loadDHParam(const char* dhfile) +IceSSL::loadDHParam(const char* dhfile) { assert(dhfile != 0); @@ -306,7 +306,7 @@ IceSSL::OpenSSL::loadDHParam(const char* dhfile) } DH* -IceSSL::OpenSSL::getTempDH(unsigned char* p, int plen, unsigned char* g, int glen) +IceSSL::getTempDH(unsigned char* p, int plen, unsigned char* g, int glen) { assert(p != 0); assert(g != 0); @@ -330,7 +330,7 @@ IceSSL::OpenSSL::getTempDH(unsigned char* p, int plen, unsigned char* g, int gle } DH* -IceSSL::OpenSSL::getTempDH512() +IceSSL::getTempDH512() { DH* dh = getTempDH(dh512_p, sizeof(dh512_p), dh512_g, sizeof(dh512_g)); @@ -338,7 +338,7 @@ IceSSL::OpenSSL::getTempDH512() } DH* -IceSSL::OpenSSL::getTempDH1024() +IceSSL::getTempDH1024() { DH* dh = getTempDH(dh1024_p, sizeof(dh1024_p), dh1024_g, sizeof(dh1024_g)); @@ -346,7 +346,7 @@ IceSSL::OpenSSL::getTempDH1024() } DH* -IceSSL::OpenSSL::getTempDH2048() +IceSSL::getTempDH2048() { DH* dh = getTempDH(dh2048_p, sizeof(dh2048_p), dh2048_g, sizeof(dh2048_g)); @@ -354,7 +354,7 @@ IceSSL::OpenSSL::getTempDH2048() } DH* -IceSSL::OpenSSL::getTempDH4096() +IceSSL::getTempDH4096() { DH* dh = getTempDH(dh4096_p, sizeof(dh4096_p), dh4096_g, sizeof(dh4096_g)); @@ -362,7 +362,7 @@ IceSSL::OpenSSL::getTempDH4096() } string -IceSSL::OpenSSL::sslGetErrors() +IceSSL::sslGetErrors() { IceUtil::Mutex::Lock sync(sslErrorsMutex); @@ -409,7 +409,7 @@ IceSSL::OpenSSL::sslGetErrors() } string -IceSSL::OpenSSL::getVerificationError(int errorCode) +IceSSL::getVerificationError(int errorCode) { static char* errorStrings[] = { @@ -481,9 +481,7 @@ tmpRSACallback(SSL* sslConnection, int isExport, int keyLength) void* p = SSL_get_ex_data(sslConnection, 0); assert(p != 0); - IceSSL::PluginBaseI* plugin = static_cast<IceSSL::PluginBaseI*>(p); - - IceSSL::OpenSSL::PluginI* openSslPlugin = dynamic_cast<IceSSL::OpenSSL::PluginI*>(plugin); + IceSSL::OpenSSLPluginI* openSslPlugin = static_cast<IceSSL::OpenSSLPluginI*>(p); assert(openSslPlugin != 0); return openSslPlugin->getRSAKey(isExport, keyLength); @@ -496,9 +494,8 @@ tmpDHCallback(SSL* sslConnection, int isExport, int keyLength) void* p = SSL_get_ex_data(sslConnection, 0); assert(p != 0); - IceSSL::PluginBaseI* plugin = static_cast<IceSSL::PluginBaseI*>(p); + IceSSL::OpenSSLPluginI* openSslPlugin = static_cast<IceSSL::OpenSSLPluginI*>(p); - IceSSL::OpenSSL::PluginI* openSslPlugin = dynamic_cast<IceSSL::OpenSSL::PluginI*>(plugin); assert(openSslPlugin != 0); return openSslPlugin->getDHParams(isExport, keyLength); diff --git a/cpp/src/IceSSL/OpenSSLUtils.h b/cpp/src/IceSSL/OpenSSLUtils.h index 87c6bd2a5cb..efff081e212 100644 --- a/cpp/src/IceSSL/OpenSSLUtils.h +++ b/cpp/src/IceSSL/OpenSSLUtils.h @@ -14,9 +14,6 @@ namespace IceSSL { -namespace OpenSSL -{ - std::string getGeneralizedTime(ASN1_GENERALIZEDTIME*); std::string getUTCTime(ASN1_UTCTIME*); @@ -38,8 +35,6 @@ std::string getVerificationError(int); } -} - extern "C" { diff --git a/cpp/src/IceSSL/PluginBaseI.cpp b/cpp/src/IceSSL/PluginBaseI.cpp deleted file mode 100644 index 777e38af4a8..00000000000 --- a/cpp/src/IceSSL/PluginBaseI.cpp +++ /dev/null @@ -1,62 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// Mutable Realms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#include <Ice/ProtocolPluginFacade.h> -#include <Ice/Communicator.h> -#include <IceSSL/PluginBaseI.h> -#include <IceSSL/TraceLevels.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; -using namespace IceSSL; - -void IceInternal::incRef(PluginBaseI* p) { p->__incRef(); } -void IceInternal::decRef(PluginBaseI* p) { p->__decRef(); } - -// -// Protected Methods -// - -IceSSL::PluginBaseI::PluginBaseI(const ProtocolPluginFacadePtr& protocolPluginFacade) : - _protocolPluginFacade(protocolPluginFacade) -{ - _logger = _protocolPluginFacade->getCommunicator()->getLogger(); - _properties = _protocolPluginFacade->getCommunicator()->getProperties(); - _traceLevels = new TraceLevels(_protocolPluginFacade); -} - -IceSSL::PluginBaseI::~PluginBaseI() -{ -} - -TraceLevelsPtr -IceSSL::PluginBaseI::getTraceLevels() const -{ - return _traceLevels; -} - -LoggerPtr -IceSSL::PluginBaseI::getLogger() const -{ - return _logger; -} - -PropertiesPtr -IceSSL::PluginBaseI::getProperties() const -{ - return _properties; -} - -ProtocolPluginFacadePtr -IceSSL::PluginBaseI::getProtocolPluginFacade() const -{ - return _protocolPluginFacade; -} diff --git a/cpp/src/IceSSL/PluginBaseI.h b/cpp/src/IceSSL/PluginBaseI.h deleted file mode 100644 index c85fc8132cc..00000000000 --- a/cpp/src/IceSSL/PluginBaseI.h +++ /dev/null @@ -1,71 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// Mutable Realms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SSL_PLUGIN_I_H -#define ICE_SSL_PLUGIN_I_H - -#include <Ice/LoggerF.h> -#include <Ice/PropertiesF.h> -#include <Ice/ProtocolPluginFacadeF.h> -#include <IceSSL/Plugin.h> -#include <IceSSL/PluginBaseIF.h> -#include <IceSSL/CertificateVerifierF.h> -#include <IceSSL/TraceLevelsF.h> -#include <IceSSL/SslTransceiverF.h> - -namespace IceSSL -{ - -class PluginBaseI : public Plugin -{ -public: - - virtual SslTransceiverPtr createTransceiver(ContextType, int) = 0; - - virtual bool isConfigured(ContextType) = 0; - - virtual void configure() = 0; - - virtual void configure(ContextType) = 0; - - virtual void loadConfig(ContextType, const ::std::string&, const ::std::string&) = 0; - - virtual void setCertificateVerifier(ContextType, const CertificateVerifierPtr&) = 0; - - virtual void addTrustedCertificateBase64(ContextType, const std::string&) = 0; - - virtual void addTrustedCertificate(ContextType, const Ice::ByteSeq&) = 0; - - virtual void setRSAKeysBase64(ContextType, const std::string&, const std::string&) = 0; - - virtual void setRSAKeys(ContextType, const ::Ice::ByteSeq&, const ::Ice::ByteSeq&) = 0; - - TraceLevelsPtr getTraceLevels() const; - - Ice::LoggerPtr getLogger() const; - - Ice::PropertiesPtr getProperties() const; - - IceInternal::ProtocolPluginFacadePtr getProtocolPluginFacade() const; - -protected: - - PluginBaseI(const IceInternal::ProtocolPluginFacadePtr&); - virtual ~PluginBaseI(); - - IceInternal::ProtocolPluginFacadePtr _protocolPluginFacade; - TraceLevelsPtr _traceLevels; - Ice::LoggerPtr _logger; - Ice::PropertiesPtr _properties; -}; - -} - -#endif diff --git a/cpp/src/IceSSL/PluginBaseIF.h b/cpp/src/IceSSL/PluginBaseIF.h deleted file mode 100644 index bcc309e2e1c..00000000000 --- a/cpp/src/IceSSL/PluginBaseIF.h +++ /dev/null @@ -1,32 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2001 -// Mutable Realms, Inc. -// Huntsville, AL, USA -// -// All Rights Reserved -// -// ********************************************************************** - -#ifndef ICE_SSL_PLUGIN_BASE_I_F_H -#define ICE_SSL_PLUGIN_BASE_I_F_H - -#include <Ice/Handle.h> - -namespace IceSSL -{ - -class PluginBaseI; -typedef IceInternal::Handle<PluginBaseI> PluginBaseIPtr; - -} - -namespace IceInternal -{ - -void incRef(IceSSL::PluginBaseI*); -void decRef(IceSSL::PluginBaseI*); - -} - -#endif diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index 77aaeb10b8e..600b4e386e4 100644 --- a/cpp/src/IceSSL/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -22,105 +22,103 @@ using std::string; using std::back_inserter; -using namespace IceSSL::OpenSSL; - long -IceSSL::OpenSSL::RSACertificateGenContext::minutesToSeconds(long minutes) +IceSSL::RSACertificateGenContext::minutesToSeconds(long minutes) { return minutes * 60L; } long -IceSSL::OpenSSL::RSACertificateGenContext::hoursToSeconds(long hours) +IceSSL::RSACertificateGenContext::hoursToSeconds(long hours) { return minutesToSeconds(hours * 60L); } long -IceSSL::OpenSSL::RSACertificateGenContext::daysToSeconds(long days) +IceSSL::RSACertificateGenContext::daysToSeconds(long days) { return hoursToSeconds(days * 24L); } long -IceSSL::OpenSSL::RSACertificateGenContext::weeksToSeconds(long weeks) +IceSSL::RSACertificateGenContext::weeksToSeconds(long weeks) { return daysToSeconds(weeks * 7L); } long -IceSSL::OpenSSL::RSACertificateGenContext::yearsToSeconds(long years) +IceSSL::RSACertificateGenContext::yearsToSeconds(long years) { return weeksToSeconds(years * 365L); } -IceSSL::OpenSSL::RSACertificateGenContext::RSACertificateGenContext() : +IceSSL::RSACertificateGenContext::RSACertificateGenContext() : _modulusLength(0), _secondsValid(0), _issuedAdjustment(0) { } -IceSSL::OpenSSL::RSACertificateGenContext::~RSACertificateGenContext() +IceSSL::RSACertificateGenContext::~RSACertificateGenContext() { } void -IceSSL::OpenSSL::RSACertificateGenContext::setCountry(const string& country) +IceSSL::RSACertificateGenContext::setCountry(const string& country) { _country = country; } void -IceSSL::OpenSSL::RSACertificateGenContext::setStateProvince(const string& stateProvince) +IceSSL::RSACertificateGenContext::setStateProvince(const string& stateProvince) { _stateProvince = stateProvince; } void -IceSSL::OpenSSL::RSACertificateGenContext::setLocality(const string& locality) +IceSSL::RSACertificateGenContext::setLocality(const string& locality) { _locality = locality; } void -IceSSL::OpenSSL::RSACertificateGenContext::setOrganization(const string& organization) +IceSSL::RSACertificateGenContext::setOrganization(const string& organization) { _organization = organization; } void -IceSSL::OpenSSL::RSACertificateGenContext::setOrgainizationalUnit(const string& organizationalUnit) +IceSSL::RSACertificateGenContext::setOrgainizationalUnit(const string& organizationalUnit) { _organizationalUnit = organizationalUnit; } void -IceSSL::OpenSSL::RSACertificateGenContext::setCommonName(const string& commonName) +IceSSL::RSACertificateGenContext::setCommonName(const string& commonName) { _commonName = commonName; } void -IceSSL::OpenSSL::RSACertificateGenContext::setBitStrength(int bitStrength) +IceSSL::RSACertificateGenContext::setBitStrength(int bitStrength) { _modulusLength = bitStrength; } void -IceSSL::OpenSSL::RSACertificateGenContext::setSecondsValid(long secondsValid) +IceSSL::RSACertificateGenContext::setSecondsValid(long secondsValid) { _secondsValid = secondsValid; } void -IceSSL::OpenSSL::RSACertificateGenContext::setIssuedAdjustment(long issuedAdjustment) +IceSSL::RSACertificateGenContext::setIssuedAdjustment(long issuedAdjustment) { _issuedAdjustment = issuedAdjustment; } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getCountry() const +IceSSL::RSACertificateGenContext::getCountry() const { unsigned char* country = reinterpret_cast<unsigned char *>(const_cast<char*>(_country.c_str())); @@ -130,7 +128,7 @@ IceSSL::OpenSSL::RSACertificateGenContext::getCountry() const } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getStateProvince() const +IceSSL::RSACertificateGenContext::getStateProvince() const { unsigned char* stateProvince = reinterpret_cast<unsigned char *>(const_cast<char*>(_stateProvince.c_str())); @@ -140,7 +138,7 @@ IceSSL::OpenSSL::RSACertificateGenContext::getStateProvince() const } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getLocality() const +IceSSL::RSACertificateGenContext::getLocality() const { unsigned char* locality = reinterpret_cast<unsigned char *>(const_cast<char*>(_locality.c_str())); @@ -150,7 +148,7 @@ IceSSL::OpenSSL::RSACertificateGenContext::getLocality() const } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getOrganization() const +IceSSL::RSACertificateGenContext::getOrganization() const { unsigned char* organization = reinterpret_cast<unsigned char *>(const_cast<char*>(_organization.c_str())); @@ -160,7 +158,7 @@ IceSSL::OpenSSL::RSACertificateGenContext::getOrganization() const } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getOrgainizationalUnit() const +IceSSL::RSACertificateGenContext::getOrgainizationalUnit() const { unsigned char* orgUnit = reinterpret_cast<unsigned char *>(const_cast<char*>(_organizationalUnit.c_str())); @@ -170,7 +168,7 @@ IceSSL::OpenSSL::RSACertificateGenContext::getOrgainizationalUnit() const } unsigned char* -IceSSL::OpenSSL::RSACertificateGenContext::getCommonName() const +IceSSL::RSACertificateGenContext::getCommonName() const { unsigned char* commonName = reinterpret_cast<unsigned char *>(const_cast<char*>(_commonName.c_str())); @@ -180,34 +178,34 @@ IceSSL::OpenSSL::RSACertificateGenContext::getCommonName() const } int -IceSSL::OpenSSL::RSACertificateGenContext::getModulusLength() const +IceSSL::RSACertificateGenContext::getModulusLength() const { return _modulusLength; } long -IceSSL::OpenSSL::RSACertificateGenContext::getSecondsValid() const +IceSSL::RSACertificateGenContext::getSecondsValid() const { return _secondsValid; } long -IceSSL::OpenSSL::RSACertificateGenContext::getIssuedAdjustment() const +IceSSL::RSACertificateGenContext::getIssuedAdjustment() const { return _issuedAdjustment; } -IceSSL::OpenSSL::RSACertificateGen::RSACertificateGen() +IceSSL::RSACertificateGen::RSACertificateGen() { ERR_load_crypto_strings(); } -IceSSL::OpenSSL::RSACertificateGen::~RSACertificateGen() +IceSSL::RSACertificateGen::~RSACertificateGen() { } -IceSSL::OpenSSL::RSAKeyPairPtr -IceSSL::OpenSSL::RSACertificateGen::generate(const RSACertificateGenContext& context) +IceSSL::RSAKeyPairPtr +IceSSL::RSACertificateGen::generate(const RSACertificateGenContext& context) { // Generate an RSA key pair. RSAJanitor rsaJanitor(RSA_generate_key(context.getModulusLength(), RSA_F4, 0, 0)); @@ -290,8 +288,8 @@ IceSSL::OpenSSL::RSACertificateGen::generate(const RSACertificateGenContext& con return keyPairPtr; } -IceSSL::OpenSSL::RSAKeyPairPtr -IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, const std::string& certFile) +IceSSL::RSAKeyPairPtr +IceSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, const std::string& certFile) { // // Read in the X509 Certificate Structure @@ -299,7 +297,7 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons BIOJanitor certBIO(BIO_new_file(certFile.c_str(), "r")); if(certBIO.get() == 0) { - IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + IceSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx.message = "unable to load certificate from '"; certLoadEx.message += certFile; @@ -313,7 +311,7 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons if(x509Janitor.get() == 0) { - IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); + IceSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); certLoadEx.message = "unable to load certificate from '"; certLoadEx.message += certFile; @@ -329,7 +327,7 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons BIOJanitor keyBIO(BIO_new_file(keyFile.c_str(), "r")); if(keyBIO.get() == 0) { - IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + IceSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx.message = "unable to load private key from '"; pklEx.message += keyFile; @@ -343,7 +341,7 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons if(rsaJanitor.get() == 0) { - IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); + IceSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); pklEx.message = "unable to load private key from '"; pklEx.message += keyFile; diff --git a/cpp/src/IceSSL/RSAKeyPair.cpp b/cpp/src/IceSSL/RSAKeyPair.cpp index 2acc9c73319..a80f5403fe6 100644 --- a/cpp/src/IceSSL/RSAKeyPair.cpp +++ b/cpp/src/IceSSL/RSAKeyPair.cpp @@ -15,15 +15,15 @@ #include <IceSSL/RSAPublicKey.h> #include <assert.h> -void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAKeyPair* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::OpenSSL::RSAKeyPair* p) { p->__decRef(); } +void ::IceInternal::incRef(::IceSSL::RSAKeyPair* p) { p->__incRef(); } +void ::IceInternal::decRef(::IceSSL::RSAKeyPair* p) { p->__decRef(); } using std::back_inserter; using std::string; using Ice::ByteSeq; using IceUtil::Base64; -IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) : +IceSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) : _privateKey(new RSAPrivateKey(key)), _publicKey(new RSAPublicKey(cert)) { @@ -31,7 +31,7 @@ IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) : assert(_publicKey != 0); } -IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& certSeq) : +IceSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& certSeq) : _privateKey(new RSAPrivateKey(keySeq)), _publicKey(new RSAPublicKey(certSeq)) { @@ -39,47 +39,47 @@ IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& ce assert(_publicKey != 0); } -IceSSL::OpenSSL::RSAKeyPair::~RSAKeyPair() +IceSSL::RSAKeyPair::~RSAKeyPair() { } void -IceSSL::OpenSSL::RSAKeyPair::keyToBase64(string& b64Key) +IceSSL::RSAKeyPair::keyToBase64(string& b64Key) { _privateKey->keyToBase64(b64Key); } void -IceSSL::OpenSSL::RSAKeyPair::certToBase64(string& b64Cert) +IceSSL::RSAKeyPair::certToBase64(string& b64Cert) { _publicKey->certToBase64(b64Cert); } void -IceSSL::OpenSSL::RSAKeyPair::keyToByteSeq(ByteSeq& keySeq) +IceSSL::RSAKeyPair::keyToByteSeq(ByteSeq& keySeq) { _privateKey->keyToByteSeq(keySeq); } void -IceSSL::OpenSSL::RSAKeyPair::certToByteSeq(ByteSeq& certSeq) +IceSSL::RSAKeyPair::certToByteSeq(ByteSeq& certSeq) { _publicKey->certToByteSeq(certSeq); } RSA* -IceSSL::OpenSSL::RSAKeyPair::getRSAPrivateKey() const +IceSSL::RSAKeyPair::getRSAPrivateKey() const { return _privateKey->get(); } X509* -IceSSL::OpenSSL::RSAKeyPair::getX509PublicKey() const +IceSSL::RSAKeyPair::getX509PublicKey() const { return _publicKey->getX509PublicKey(); } -IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const RSAPrivateKeyPtr& rsa, const RSAPublicKeyPtr& x509) : +IceSSL::RSAKeyPair::RSAKeyPair(const RSAPrivateKeyPtr& rsa, const RSAPublicKeyPtr& x509) : _privateKey(rsa), _publicKey(x509) { diff --git a/cpp/src/IceSSL/RSAPrivateKey.cpp b/cpp/src/IceSSL/RSAPrivateKey.cpp index a3a5f0f98f0..c2058031e1f 100644 --- a/cpp/src/IceSSL/RSAPrivateKey.cpp +++ b/cpp/src/IceSSL/RSAPrivateKey.cpp @@ -16,15 +16,15 @@ #include <IceSSL/Exception.h> #include <assert.h> -void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAPrivateKey* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::OpenSSL::RSAPrivateKey* p) { p->__decRef(); } +void ::IceInternal::incRef(::IceSSL::RSAPrivateKey* p) { p->__incRef(); } +void ::IceInternal::decRef(::IceSSL::RSAPrivateKey* p) { p->__decRef(); } using std::back_inserter; using std::string; using Ice::ByteSeq; using IceUtil::Base64; -IceSSL::OpenSSL::RSAPrivateKey::RSAPrivateKey(const string& key) +IceSSL::RSAPrivateKey::RSAPrivateKey(const string& key) { assert(!key.empty()); @@ -35,7 +35,7 @@ IceSSL::OpenSSL::RSAPrivateKey::RSAPrivateKey(const string& key) byteSeqToKey(keySeq); } -IceSSL::OpenSSL::RSAPrivateKey::RSAPrivateKey(const ByteSeq& keySeq) +IceSSL::RSAPrivateKey::RSAPrivateKey(const ByteSeq& keySeq) { assert(!keySeq.empty()); @@ -44,13 +44,13 @@ IceSSL::OpenSSL::RSAPrivateKey::RSAPrivateKey(const ByteSeq& keySeq) byteSeqToKey(keySeq); } -IceSSL::OpenSSL::RSAPrivateKey::RSAPrivateKey(RSA* rsa) : +IceSSL::RSAPrivateKey::RSAPrivateKey(RSA* rsa) : _privateKey(rsa) { assert(_privateKey != 0); } -IceSSL::OpenSSL::RSAPrivateKey::~RSAPrivateKey() +IceSSL::RSAPrivateKey::~RSAPrivateKey() { if(_privateKey != 0) { @@ -59,7 +59,7 @@ IceSSL::OpenSSL::RSAPrivateKey::~RSAPrivateKey() } void -IceSSL::OpenSSL::RSAPrivateKey::keyToBase64(string& b64Key) +IceSSL::RSAPrivateKey::keyToBase64(string& b64Key) { ByteSeq keySeq; keyToByteSeq(keySeq); @@ -67,7 +67,7 @@ IceSSL::OpenSSL::RSAPrivateKey::keyToBase64(string& b64Key) } void -IceSSL::OpenSSL::RSAPrivateKey::keyToByteSeq(ByteSeq& keySeq) +IceSSL::RSAPrivateKey::keyToByteSeq(ByteSeq& keySeq) { assert(_privateKey); @@ -89,13 +89,13 @@ IceSSL::OpenSSL::RSAPrivateKey::keyToByteSeq(ByteSeq& keySeq) } RSA* -IceSSL::OpenSSL::RSAPrivateKey::get() const +IceSSL::RSAPrivateKey::get() const { return _privateKey; } void -IceSSL::OpenSSL::RSAPrivateKey::byteSeqToKey(const ByteSeq& keySeq) +IceSSL::RSAPrivateKey::byteSeqToKey(const ByteSeq& keySeq) { unsigned char* privateKeyBuffer = byteSeqToUChar(keySeq); assert(privateKeyBuffer != 0); diff --git a/cpp/src/IceSSL/RSAPublicKey.cpp b/cpp/src/IceSSL/RSAPublicKey.cpp index 4e2e02ea97c..c5ec4fc00e9 100644 --- a/cpp/src/IceSSL/RSAPublicKey.cpp +++ b/cpp/src/IceSSL/RSAPublicKey.cpp @@ -16,15 +16,15 @@ #include <IceSSL/Exception.h> #include <assert.h> -void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAPublicKey* p) { p->__incRef(); } -void ::IceInternal::decRef(::IceSSL::OpenSSL::RSAPublicKey* p) { p->__decRef(); } +void ::IceInternal::incRef(::IceSSL::RSAPublicKey* p) { p->__incRef(); } +void ::IceInternal::decRef(::IceSSL::RSAPublicKey* p) { p->__decRef(); } using std::back_inserter; using std::string; using Ice::ByteSeq; using IceUtil::Base64; -IceSSL::OpenSSL::RSAPublicKey::RSAPublicKey(const string& cert) +IceSSL::RSAPublicKey::RSAPublicKey(const string& cert) { assert(!cert.empty()); @@ -35,7 +35,7 @@ IceSSL::OpenSSL::RSAPublicKey::RSAPublicKey(const string& cert) byteSeqToCert(certSeq); } -IceSSL::OpenSSL::RSAPublicKey::RSAPublicKey(const ByteSeq& certSeq) +IceSSL::RSAPublicKey::RSAPublicKey(const ByteSeq& certSeq) { assert(!certSeq.empty()); @@ -44,7 +44,7 @@ IceSSL::OpenSSL::RSAPublicKey::RSAPublicKey(const ByteSeq& certSeq) byteSeqToCert(certSeq); } -IceSSL::OpenSSL::RSAPublicKey::~RSAPublicKey() +IceSSL::RSAPublicKey::~RSAPublicKey() { if(_publicKey != 0) { @@ -53,7 +53,7 @@ IceSSL::OpenSSL::RSAPublicKey::~RSAPublicKey() } void -IceSSL::OpenSSL::RSAPublicKey::certToBase64(string& b64Cert) +IceSSL::RSAPublicKey::certToBase64(string& b64Cert) { ByteSeq certSeq; certToByteSeq(certSeq); @@ -61,7 +61,7 @@ IceSSL::OpenSSL::RSAPublicKey::certToBase64(string& b64Cert) } void -IceSSL::OpenSSL::RSAPublicKey::certToByteSeq(ByteSeq& certSeq) +IceSSL::RSAPublicKey::certToByteSeq(ByteSeq& certSeq) { assert(_publicKey); @@ -83,18 +83,18 @@ IceSSL::OpenSSL::RSAPublicKey::certToByteSeq(ByteSeq& certSeq) } X509* -IceSSL::OpenSSL::RSAPublicKey::getX509PublicKey() const +IceSSL::RSAPublicKey::getX509PublicKey() const { return _publicKey; } -IceSSL::OpenSSL::RSAPublicKey::RSAPublicKey(X509* x509) : +IceSSL::RSAPublicKey::RSAPublicKey(X509* x509) : _publicKey(x509) { } void -IceSSL::OpenSSL::RSAPublicKey::byteSeqToCert(const ByteSeq& certSeq) +IceSSL::RSAPublicKey::byteSeqToCert(const ByteSeq& certSeq) { unsigned char* publicKeyBuffer = byteSeqToUChar(certSeq); assert(publicKeyBuffer != 0); diff --git a/cpp/src/IceSSL/ContextOpenSSLServer.cpp b/cpp/src/IceSSL/ServerContext.cpp index 62a2a7355a7..a63415a243a 100644 --- a/cpp/src/IceSSL/ContextOpenSSLServer.cpp +++ b/cpp/src/IceSSL/ServerContext.cpp @@ -11,7 +11,7 @@ #include <Ice/Logger.h> #include <IceSSL/Exception.h> -#include <IceSSL/ContextOpenSSLServer.h> +#include <IceSSL/ServerContext.h> #include <IceSSL/SslServerTransceiver.h> #include <IceSSL/OpenSSLUtils.h> #include <IceSSL/TraceLevels.h> @@ -71,11 +71,11 @@ IceSSL::ServerContext::configure(const GeneralConfig& generalConfig, } IceSSL::SslTransceiverPtr -IceSSL::ServerContext::createTransceiver(int socket, const PluginBaseIPtr& plugin) +IceSSL::ServerContext::createTransceiver(int socket, const OpenSSLPluginIPtr& plugin) { if(_sslContext == 0) { - OpenSSL::ContextNotConfiguredException contextEx(__FILE__, __LINE__); + ContextNotConfiguredException contextEx(__FILE__, __LINE__); throw contextEx; } @@ -126,7 +126,7 @@ IceSSL::ServerContext::loadCertificateAuthority(const CertificateAuthority& cert if(_traceLevels->security >= SECURITY_WARNINGS) { string errorString = "unable to load certificate authorities certificate names from " + caFile + "\n"; - errorString += OpenSSL::sslGetErrors(); + errorString += sslGetErrors(); _logger->trace(_traceLevels->securityCat, "WRN " + errorString); } } diff --git a/cpp/src/IceSSL/ContextOpenSSLServer.h b/cpp/src/IceSSL/ServerContext.h index 4e73f81e845..6fdc5bcabf2 100644 --- a/cpp/src/IceSSL/ContextOpenSSLServer.h +++ b/cpp/src/IceSSL/ServerContext.h @@ -11,7 +11,7 @@ #ifndef ICESSL_SERVER_CONTEXT_H #define ICESSL_SERVER_CONTEXT_H -#include <IceSSL/ContextOpenSSL.h> +#include <IceSSL/Context.h> namespace IceSSL { @@ -25,7 +25,7 @@ public: const BaseCertificates&); // Takes a socket fd as the first parameter. - virtual SslTransceiverPtr createTransceiver(int, const PluginBaseIPtr&); + virtual SslTransceiverPtr createTransceiver(int, const OpenSSLPluginIPtr&); protected: @@ -33,7 +33,7 @@ protected: virtual void loadCertificateAuthority(const CertificateAuthority& certAuth); - friend class OpenSSL::PluginI; + friend class OpenSSLPluginI; }; } diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.cpp b/cpp/src/IceSSL/SingleCertificateVerifier.cpp index e728ffef9b0..b7e9d73567d 100644 --- a/cpp/src/IceSSL/SingleCertificateVerifier.cpp +++ b/cpp/src/IceSSL/SingleCertificateVerifier.cpp @@ -17,13 +17,13 @@ using namespace std; using Ice::ByteSeq; -IceSSL::OpenSSL::SingleCertificateVerifier::SingleCertificateVerifier(const ByteSeq& publicKey) : +IceSSL::SingleCertificateVerifier::SingleCertificateVerifier(const ByteSeq& publicKey) : _publicKey(publicKey) { } int -IceSSL::OpenSSL::SingleCertificateVerifier::verify(int preVerifyOkay, +IceSSL::SingleCertificateVerifier::verify(int preVerifyOkay, X509_STORE_CTX* x509StoreContext, SSL* sslConnection) { @@ -92,7 +92,7 @@ IceSSL::OpenSSL::SingleCertificateVerifier::verify(int preVerifyOkay, } ByteSeq -IceSSL::OpenSSL::SingleCertificateVerifier::toByteSeq(X509* certificate) +IceSSL::SingleCertificateVerifier::toByteSeq(X509* certificate) { ByteSeq certByteSeq; diff --git a/cpp/src/IceSSL/SingleCertificateVerifier.h b/cpp/src/IceSSL/SingleCertificateVerifier.h index 6f38276ea89..e79502f9ce5 100644 --- a/cpp/src/IceSSL/SingleCertificateVerifier.h +++ b/cpp/src/IceSSL/SingleCertificateVerifier.h @@ -17,10 +17,7 @@ namespace IceSSL { -namespace OpenSSL -{ - -class SingleCertificateVerifier : public IceSSL::OpenSSL::CertificateVerifier +class SingleCertificateVerifier : public IceSSL::CertificateVerifierOpenSSL { public: @@ -37,7 +34,5 @@ protected: } -} - #endif diff --git a/cpp/src/IceSSL/SslAcceptor.cpp b/cpp/src/IceSSL/SslAcceptor.cpp index 420279d3578..dab6487906c 100644 --- a/cpp/src/IceSSL/SslAcceptor.cpp +++ b/cpp/src/IceSSL/SslAcceptor.cpp @@ -11,7 +11,7 @@ #include <Ice/Logger.h> #include <Ice/Network.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/SslAcceptor.h> #include <IceSSL/SslTransceiver.h> #include <IceSSL/TraceLevels.h> @@ -98,7 +98,7 @@ IceSSL::SslAcceptor::effectivePort() return ntohs(_addr.sin_port); } -IceSSL::SslAcceptor::SslAcceptor(const PluginBaseIPtr& plugin, const string& host, int port) : +IceSSL::SslAcceptor::SslAcceptor(const OpenSSLPluginIPtr& plugin, const string& host, int port) : _plugin(plugin), _traceLevels(plugin->getTraceLevels()), _logger(plugin->getLogger()), diff --git a/cpp/src/IceSSL/SslAcceptor.h b/cpp/src/IceSSL/SslAcceptor.h index ce7e104bdbf..47d09c601fa 100644 --- a/cpp/src/IceSSL/SslAcceptor.h +++ b/cpp/src/IceSSL/SslAcceptor.h @@ -14,7 +14,7 @@ #include <Ice/TransceiverF.h> #include <Ice/LoggerF.h> #include <Ice/Acceptor.h> -#include <IceSSL/PluginBaseIF.h> +#include <IceSSL/OpenSSLPluginIF.h> #include <IceSSL/TraceLevelsF.h> #ifndef _WIN32 @@ -41,11 +41,11 @@ public: private: - SslAcceptor(const PluginBaseIPtr&, const std::string&, int); + SslAcceptor(const OpenSSLPluginIPtr&, const std::string&, int); virtual ~SslAcceptor(); friend class SslEndpoint; - PluginBaseIPtr _plugin; + OpenSSLPluginIPtr _plugin; TraceLevelsPtr _traceLevels; ::Ice::LoggerPtr _logger; SOCKET _fd; diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp index 0dccb3b6016..cb40d8a39ae 100644 --- a/cpp/src/IceSSL/SslClientTransceiver.cpp +++ b/cpp/src/IceSSL/SslClientTransceiver.cpp @@ -14,7 +14,7 @@ #include <Ice/Network.h> #include <IceSSL/OpenSSL.h> #include <IceSSL/SslClientTransceiver.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/TraceLevels.h> #include <Ice/LocalException.h> @@ -144,7 +144,7 @@ IceSSL::SslClientTransceiver::write(Buffer& buf, int timeout) // Protocol Error: Unexpected EOF protocolEx.message = "encountered an EOF that violates the ssl protocol\n"; - protocolEx.message += OpenSSL::sslGetErrors(); + protocolEx.message += sslGetErrors(); throw protocolEx; } @@ -160,7 +160,7 @@ IceSSL::SslClientTransceiver::write(Buffer& buf, int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx.message = "encountered a violation of the ssl protocol\n"; - protocolEx.message += OpenSSL::sslGetErrors(); + protocolEx.message += sslGetErrors(); throw protocolEx; } @@ -294,9 +294,9 @@ IceSSL::SslClientTransceiver::handshake(int timeout) { CertificateVerificationException certVerEx(__FILE__, __LINE__); - certVerEx.message = OpenSSL::getVerificationError(verifyError); + certVerEx.message = getVerificationError(verifyError); - string errors = OpenSSL::sslGetErrors(); + string errors = sslGetErrors(); if(!errors.empty()) { @@ -311,7 +311,7 @@ IceSSL::SslClientTransceiver::handshake(int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx.message = "encountered a violation of the ssl protocol during handshake\n"; - protocolEx.message += OpenSSL::sslGetErrors(); + protocolEx.message += sslGetErrors(); throw protocolEx; } @@ -353,7 +353,7 @@ IceSSL::SslClientTransceiver::showConnectionInfo() // Only in extreme cases do we enable this, partially because it doesn't use the Logger. if((_traceLevels->security >= SECURITY_PROTOCOL_DEBUG) && 0) { - OpenSSL::BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE)); + BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE)); BIO* bio = bioJanitor.get(); showCertificateChain(bio); @@ -381,9 +381,9 @@ IceSSL::SslClientTransceiver::showConnectionInfo() // but unfortunately, it appears that this is not properly picked up. // -IceSSL::SslClientTransceiver::SslClientTransceiver(const PluginBaseIPtr& plugin, +IceSSL::SslClientTransceiver::SslClientTransceiver(const OpenSSLPluginIPtr& plugin, SOCKET fd, - const OpenSSL::CertificateVerifierPtr& certVerifier, + const CertificateVerifierPtr& certVerifier, SSL* sslConnection) : SslTransceiver(plugin, fd, certVerifier, sslConnection) { diff --git a/cpp/src/IceSSL/SslClientTransceiver.h b/cpp/src/IceSSL/SslClientTransceiver.h index dba84a9231b..fe1a18d5de8 100644 --- a/cpp/src/IceSSL/SslClientTransceiver.h +++ b/cpp/src/IceSSL/SslClientTransceiver.h @@ -11,11 +11,7 @@ #ifndef ICE_SSL_CLIENT_TRANSCEIVER_H #define ICE_SSL_CLIENT_TRANSCEIVER_H -#include <Ice/LoggerF.h> #include <IceSSL/SslTransceiver.h> -#include <IceSSL/ContextOpenSSLClient.h> -#include <IceSSL/PluginBaseIF.h> -#include <IceSSL/TraceLevelsF.h> namespace IceSSL { @@ -30,7 +26,7 @@ public: protected: virtual void showConnectionInfo(); - SslClientTransceiver(const PluginBaseIPtr&, SOCKET, const OpenSSL::CertificateVerifierPtr&, SSL*); + SslClientTransceiver(const OpenSSLPluginIPtr&, SOCKET, const CertificateVerifierPtr&, SSL*); friend class ClientContext; }; diff --git a/cpp/src/IceSSL/SslConnector.cpp b/cpp/src/IceSSL/SslConnector.cpp index 65d010af218..df1e14b2419 100644 --- a/cpp/src/IceSSL/SslConnector.cpp +++ b/cpp/src/IceSSL/SslConnector.cpp @@ -11,7 +11,7 @@ #include <Ice/Logger.h> #include <Ice/Network.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/SslConnector.h> #include <IceSSL/SslTransceiver.h> #include <IceSSL/TraceLevels.h> @@ -53,7 +53,7 @@ IceSSL::SslConnector::toString() const return addrToString(_addr); } -IceSSL::SslConnector::SslConnector(const PluginBaseIPtr& plugin, const string& host, int port) : +IceSSL::SslConnector::SslConnector(const OpenSSLPluginIPtr& plugin, const string& host, int port) : _plugin(plugin) { getAddress(host.c_str(), port, _addr); diff --git a/cpp/src/IceSSL/SslConnector.h b/cpp/src/IceSSL/SslConnector.h index 587363ea5de..c31c5a186d5 100644 --- a/cpp/src/IceSSL/SslConnector.h +++ b/cpp/src/IceSSL/SslConnector.h @@ -13,7 +13,7 @@ #include <Ice/TransceiverF.h> #include <Ice/Connector.h> -#include <IceSSL/PluginBaseIF.h> +#include <IceSSL/OpenSSLPluginIF.h> #ifndef _WIN32 # include <netinet/in.h> // For struct sockaddr_in @@ -33,11 +33,11 @@ public: private: - SslConnector(const PluginBaseIPtr&, const std::string&, int); + SslConnector(const OpenSSLPluginIPtr&, const std::string&, int); virtual ~SslConnector(); friend class SslEndpoint; - PluginBaseIPtr _plugin; + OpenSSLPluginIPtr _plugin; struct sockaddr_in _addr; }; diff --git a/cpp/src/IceSSL/SslEndpoint.cpp b/cpp/src/IceSSL/SslEndpoint.cpp index 83192d98548..71096443372 100644 --- a/cpp/src/IceSSL/SslEndpoint.cpp +++ b/cpp/src/IceSSL/SslEndpoint.cpp @@ -16,12 +16,13 @@ #include <IceSSL/SslAcceptor.h> #include <IceSSL/SslConnector.h> #include <IceSSL/SslTransceiver.h> +#include <IceSSL/OpenSSLPluginI.h> using namespace std; using namespace Ice; using namespace IceInternal; -IceSSL::SslEndpoint::SslEndpoint(const PluginBaseIPtr& plugin, const string& ho, Int po, Int ti) : +IceSSL::SslEndpoint::SslEndpoint(const OpenSSLPluginIPtr& plugin, const string& ho, Int po, Int ti) : _plugin(plugin), _host(ho), _port(po), @@ -29,7 +30,7 @@ IceSSL::SslEndpoint::SslEndpoint(const PluginBaseIPtr& plugin, const string& ho, { } -IceSSL::SslEndpoint::SslEndpoint(const PluginBaseIPtr& plugin, const string& str) : +IceSSL::SslEndpoint::SslEndpoint(const OpenSSLPluginIPtr& plugin, const string& str) : _plugin(plugin), _port(0), _timeout(-1) @@ -117,7 +118,7 @@ IceSSL::SslEndpoint::SslEndpoint(const PluginBaseIPtr& plugin, const string& str } } -IceSSL::SslEndpoint::SslEndpoint(const PluginBaseIPtr& plugin, BasicStream* s) : +IceSSL::SslEndpoint::SslEndpoint(const OpenSSLPluginIPtr& plugin, BasicStream* s) : _plugin(plugin), _port(0), _timeout(-1) @@ -338,7 +339,7 @@ IceSSL::SslEndpoint::operator<(const Endpoint& r) const return false; } -IceSSL::SslEndpointFactory::SslEndpointFactory(const PluginBaseIPtr& plugin) +IceSSL::SslEndpointFactory::SslEndpointFactory(const OpenSSLPluginIPtr& plugin) : _plugin(plugin) { } diff --git a/cpp/src/IceSSL/SslEndpoint.h b/cpp/src/IceSSL/SslEndpoint.h index cedbf6e7db4..ba3a10558e5 100644 --- a/cpp/src/IceSSL/SslEndpoint.h +++ b/cpp/src/IceSSL/SslEndpoint.h @@ -13,7 +13,7 @@ #include <Ice/Endpoint.h> #include <Ice/EndpointFactory.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginIF.h> namespace IceSSL { @@ -24,9 +24,9 @@ class SslEndpoint : public IceInternal::Endpoint { public: - SslEndpoint(const IceSSL::PluginBaseIPtr&, const std::string&, ::Ice::Int, ::Ice::Int); - SslEndpoint(const IceSSL::PluginBaseIPtr&, const std::string&); - SslEndpoint(const IceSSL::PluginBaseIPtr&, IceInternal::BasicStream*); + SslEndpoint(const IceSSL::OpenSSLPluginIPtr&, const std::string&, ::Ice::Int, ::Ice::Int); + SslEndpoint(const IceSSL::OpenSSLPluginIPtr&, const std::string&); + SslEndpoint(const IceSSL::OpenSSLPluginIPtr&, IceInternal::BasicStream*); virtual void streamWrite(IceInternal::BasicStream*) const; virtual std::string toString() const; @@ -52,7 +52,7 @@ private: // // All members are const, because endpoints are immutable. // - const IceSSL::PluginBaseIPtr _plugin; + const IceSSL::OpenSSLPluginIPtr _plugin; const std::string _host; const ::Ice::Int _port; const ::Ice::Int _timeout; @@ -62,7 +62,7 @@ class SslEndpointFactory : public IceInternal::EndpointFactory { public: - SslEndpointFactory(const IceSSL::PluginBaseIPtr&); + SslEndpointFactory(const IceSSL::OpenSSLPluginIPtr&); virtual ~SslEndpointFactory(); virtual ::Ice::Short type() const; @@ -73,7 +73,7 @@ public: private: - IceSSL::PluginBaseIPtr _plugin; + IceSSL::OpenSSLPluginIPtr _plugin; }; } diff --git a/cpp/src/IceSSL/SslException.cpp b/cpp/src/IceSSL/SslException.cpp index d621b041bbe..1fcdc1ef841 100644 --- a/cpp/src/IceSSL/SslException.cpp +++ b/cpp/src/IceSSL/SslException.cpp @@ -97,49 +97,49 @@ IceSSL::CertificateVerifierTypeException::ice_print(ostream& out) const } void -IceSSL::OpenSSL::ContextException::ice_print(ostream& out) const +IceSSL::ContextException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::ContextInitializationException::ice_print(ostream& out) const +IceSSL::ContextInitializationException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::ContextNotConfiguredException::ice_print(ostream& out) const +IceSSL::ContextNotConfiguredException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::UnsupportedContextException::ice_print(ostream& out) const +IceSSL::UnsupportedContextException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::CertificateLoadException::ice_print(ostream& out) const +IceSSL::CertificateLoadException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::PrivateKeyLoadException::ice_print(ostream& out) const +IceSSL::PrivateKeyLoadException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::CertificateKeyMatchException::ice_print(ostream& out) const +IceSSL::CertificateKeyMatchException::ice_print(ostream& out) const { SslException::ice_print(out); } void -IceSSL::OpenSSL::TrustedCertificateAddException::ice_print(ostream& out) const +IceSSL::TrustedCertificateAddException::ice_print(ostream& out) const { SslException::ice_print(out); } diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp index 4732c59bad9..960efe90a40 100644 --- a/cpp/src/IceSSL/SslServerTransceiver.cpp +++ b/cpp/src/IceSSL/SslServerTransceiver.cpp @@ -13,7 +13,7 @@ #include <Ice/Buffer.h> #include <Ice/Network.h> #include <IceSSL/OpenSSL.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/TraceLevels.h> #include <Ice/LocalException.h> @@ -136,7 +136,7 @@ IceSSL::SslServerTransceiver::write(Buffer& buf, int timeout) // Protocol Error: Unexpected EOF. protocolEx.message = "encountered an EOF that violates the ssl protocol\n"; - protocolEx.message += IceSSL::OpenSSL::sslGetErrors(); + protocolEx.message += IceSSL::sslGetErrors(); throw protocolEx; } @@ -147,7 +147,7 @@ IceSSL::SslServerTransceiver::write(Buffer& buf, int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx.message = "encountered a violation of the ssl protocol\n"; - protocolEx.message += IceSSL::OpenSSL::sslGetErrors(); + protocolEx.message += IceSSL::sslGetErrors(); throw protocolEx; } @@ -218,7 +218,7 @@ IceSSL::SslServerTransceiver::handshake(int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx.message = "encountered an ssl protocol violation during handshake\n"; - protocolEx.message += IceSSL::OpenSSL::sslGetErrors(); + protocolEx.message += IceSSL::sslGetErrors(); throw protocolEx; } @@ -281,7 +281,7 @@ IceSSL::SslServerTransceiver::handshake(int timeout) // Protocol Error: Unexpected EOF protocolEx.message = "encountered an eof during handshake that violates the ssl protocol\n"; - protocolEx.message += IceSSL::OpenSSL::sslGetErrors(); + protocolEx.message += IceSSL::sslGetErrors(); throw protocolEx; } @@ -292,7 +292,7 @@ IceSSL::SslServerTransceiver::handshake(int timeout) ProtocolException protocolEx(__FILE__, __LINE__); protocolEx.message = "encountered a violation of the ssl protocol during handshake\n"; - protocolEx.message += IceSSL::OpenSSL::sslGetErrors(); + protocolEx.message += IceSSL::sslGetErrors(); throw protocolEx; } @@ -329,7 +329,7 @@ IceSSL::SslServerTransceiver::showConnectionInfo() // Only in extreme cases do we enable this, partially because it doesn't use the Logger. if((_traceLevels->security >= IceSSL::SECURITY_PROTOCOL_DEBUG) && 0) { - IceSSL::OpenSSL::BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE)); + BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE)); BIO* bio = bioJanitor.get(); showCertificateChain(bio); @@ -351,9 +351,9 @@ IceSSL::SslServerTransceiver::showConnectionInfo() // but unfortunately, it appears that this is not properly picked up. // -IceSSL::SslServerTransceiver::SslServerTransceiver(const PluginBaseIPtr& plugin, +IceSSL::SslServerTransceiver::SslServerTransceiver(const OpenSSLPluginIPtr& plugin, SOCKET fd, - const IceSSL::OpenSSL::CertificateVerifierPtr& certVerifier, + const IceSSL::CertificateVerifierPtr& certVerifier, SSL* sslConnection) : SslTransceiver(plugin, fd, certVerifier, sslConnection) { diff --git a/cpp/src/IceSSL/SslServerTransceiver.h b/cpp/src/IceSSL/SslServerTransceiver.h index b0e60b8f1e8..2301c534ab3 100644 --- a/cpp/src/IceSSL/SslServerTransceiver.h +++ b/cpp/src/IceSSL/SslServerTransceiver.h @@ -24,7 +24,7 @@ public: protected: virtual void showConnectionInfo(); - SslServerTransceiver(const PluginBaseIPtr&, SOCKET, const OpenSSL::CertificateVerifierPtr&, SSL*); + SslServerTransceiver(const OpenSSLPluginIPtr&, SOCKET, const CertificateVerifierPtr&, SSL*); friend class ServerContext; }; diff --git a/cpp/src/IceSSL/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp index 1b9d582f622..e2d94be92a7 100644 --- a/cpp/src/IceSSL/SslTransceiver.cpp +++ b/cpp/src/IceSSL/SslTransceiver.cpp @@ -13,7 +13,7 @@ #include <Ice/Network.h> #include <IceSSL/OpenSSL.h> #include <IceSSL/SslTransceiver.h> -#include <IceSSL/PluginBaseI.h> +#include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/TraceLevels.h> // Added @@ -33,7 +33,6 @@ using namespace std; using namespace Ice; using namespace IceInternal; -using namespace IceSSL::OpenSSL; // // Static Member Initialization @@ -305,8 +304,8 @@ IceSSL::SslTransceiver::verifyCertificate(int preVerifyOkay, X509_STORE_CTX* x50 assert(_certificateVerifier.get() != 0); // Get the verifier, make sure it is for OpenSSL connections - IceSSL::OpenSSL::CertificateVerifierPtr verifier; - verifier = dynamic_cast<IceSSL::OpenSSL::CertificateVerifier*>(_certificateVerifier.get()); + CertificateVerifierOpenSSLPtr verifier; + verifier = dynamic_cast<CertificateVerifierOpenSSL*>(_certificateVerifier.get()); // Check to make sure we have a proper verifier for the operation. if(verifier) @@ -937,9 +936,9 @@ IceSSL::SslTransceiver::showClientCAList(BIO* bio, const char* connType) // Private Methods // -IceSSL::SslTransceiver::SslTransceiver(const PluginBaseIPtr& plugin, +IceSSL::SslTransceiver::SslTransceiver(const OpenSSLPluginIPtr& plugin, SOCKET fd, - const IceSSL::OpenSSL::CertificateVerifierPtr& certificateVerifier, + const CertificateVerifierPtr& certificateVerifier, SSL* sslConnection) : _sslConnection(sslConnection), _traceLevels(plugin->getTraceLevels()), diff --git a/cpp/src/IceSSL/SslTransceiver.h b/cpp/src/IceSSL/SslTransceiver.h index d2b6e3f2894..be7be5b1548 100644 --- a/cpp/src/IceSSL/SslTransceiver.h +++ b/cpp/src/IceSSL/SslTransceiver.h @@ -16,7 +16,7 @@ #include <Ice/Buffer.h> #include <IceUtil/Mutex.h> #include <IceSSL/SslTransceiverF.h> -#include <IceSSL/PluginBaseIF.h> +#include <IceSSL/OpenSSLPluginIF.h> #include <IceSSL/TraceLevelsF.h> #include <IceSSL/CertificateVerifierF.h> #include <IceSSL/CertificateVerifierOpenSSL.h> @@ -195,7 +195,7 @@ protected: ConnectPhase _phase; - SslTransceiver(const PluginBaseIPtr&, SOCKET, const IceSSL::OpenSSL::CertificateVerifierPtr&, SSL*); + SslTransceiver(const OpenSSLPluginIPtr&, SOCKET, const IceSSL::CertificateVerifierPtr&, SSL*); virtual ~SslTransceiver(); TraceLevelsPtr _traceLevels; @@ -204,7 +204,7 @@ protected: fd_set _rFdSet; fd_set _wFdSet; - IceSSL::OpenSSL::CertificateVerifierPtr _certificateVerifier; + IceSSL::CertificateVerifierPtr _certificateVerifier; }; } |