zeroc-ice 3.6.5 → 3.7.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -6
- data/ext/Communicator.cpp +223 -61
- data/ext/Communicator.h +1 -6
- data/ext/Config.h +23 -7
- data/ext/Connection.cpp +108 -76
- data/ext/Connection.h +4 -6
- data/ext/Endpoint.cpp +16 -54
- data/ext/Endpoint.h +1 -6
- data/ext/ImplicitContext.cpp +1 -10
- data/ext/ImplicitContext.h +1 -6
- data/ext/Init.cpp +4 -6
- data/ext/Logger.cpp +1 -6
- data/ext/Logger.h +1 -6
- data/ext/Operation.cpp +38 -54
- data/ext/Operation.h +1 -6
- data/ext/Properties.cpp +3 -8
- data/ext/Properties.h +1 -6
- data/ext/Proxy.cpp +111 -70
- data/ext/Proxy.h +1 -6
- data/ext/Slice.cpp +5 -20
- data/ext/Slice.h +1 -6
- data/ext/Types.cpp +313 -224
- data/ext/Types.h +118 -71
- data/ext/Util.cpp +69 -36
- data/ext/Util.h +117 -42
- data/ext/ValueFactoryManager.cpp +440 -0
- data/ext/ValueFactoryManager.h +95 -0
- data/ext/extconf.rb +52 -48
- data/ext/ice/cpp/include/Ice/Application.h +275 -105
- data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
- data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
- data/ext/ice/cpp/include/Ice/Config.h +16 -39
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
- data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
- data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
- data/ext/ice/cpp/include/Ice/Exception.h +110 -63
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
- data/ext/ice/cpp/include/Ice/Format.h +17 -18
- data/ext/ice/cpp/include/Ice/Functional.h +38 -38
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
- data/ext/ice/cpp/include/Ice/Handle.h +6 -16
- data/ext/ice/cpp/include/Ice/Ice.h +9 -10
- data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
- data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
- data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
- data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
- data/ext/ice/cpp/include/Ice/Object.h +413 -78
- data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
- data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
- data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
- data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
- data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
- data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
- data/ext/ice/cpp/include/Ice/Service.h +273 -154
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
- data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
- data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
- data/ext/ice/cpp/include/Ice/UUID.h +19 -0
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
- data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
- data/ext/ice/cpp/include/Ice/Value.h +139 -0
- data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
- data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
- data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
- data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
- data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
- data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
- data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
- data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
- data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
- data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
- data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
- data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
- data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
- data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
- data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
- data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
- data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
- data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
- data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
- data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
- data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
- data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
- data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
- data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
- data/ext/ice/cpp/src/Ice/ACM.h +9 -7
- data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
- data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
- data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
- data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
- data/ext/ice/cpp/src/Ice/Base64.h +1 -6
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
- data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
- data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
- data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
- data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
- data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
- data/ext/ice/cpp/src/Ice/Connector.h +4 -8
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
- data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
- data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
- data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
- data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
- data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
- data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
- data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
- data/ext/ice/cpp/src/Ice/Instance.h +30 -23
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
- data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
- data/ext/ice/cpp/src/Ice/Network.h +99 -36
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
- data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
- data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
- data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
- data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
- data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
- data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
- data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
- data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
- data/ext/ice/cpp/src/Ice/Reference.h +39 -28
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
- data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
- data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
- data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
- data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
- data/ext/ice/cpp/src/Ice/Selector.h +100 -152
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
- data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
- data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
- data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
- data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
- data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
- data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
- data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
- data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
- data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
- data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
- data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
- data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
- data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
- data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
- data/ext/ice/cpp/src/Slice/MD5.h +1 -6
- data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
- data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
- data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
- data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
- data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
- data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
- data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
- data/ext/ice/cpp/src/Slice/Util.h +50 -0
- data/ice.gemspec +2 -9
- data/lib/Glacier2.rb +1 -6
- data/lib/Glacier2/Metrics.rb +6 -50
- data/lib/Glacier2/PermissionsVerifier.rb +23 -99
- data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
- data/lib/Glacier2/Router.rb +31 -78
- data/lib/Glacier2/RouterF.rb +2 -7
- data/lib/Glacier2/SSLInfo.rb +3 -11
- data/lib/Glacier2/Session.rb +87 -311
- data/lib/Ice.rb +84 -58
- data/lib/Ice/BuiltinSequences.rb +3 -8
- data/lib/Ice/Communicator.rb +54 -61
- data/lib/Ice/CommunicatorF.rb +2 -7
- data/lib/Ice/Connection.rb +152 -166
- data/lib/Ice/ConnectionF.rb +2 -7
- data/lib/Ice/Current.rb +3 -15
- data/lib/Ice/Endpoint.rb +56 -137
- data/lib/Ice/EndpointF.rb +2 -7
- data/lib/Ice/EndpointTypes.rb +2 -11
- data/lib/Ice/FacetMap.rb +3 -8
- data/lib/Ice/Identity.rb +4 -12
- data/lib/Ice/ImplicitContext.rb +4 -38
- data/lib/Ice/ImplicitContextF.rb +2 -7
- data/lib/Ice/Instrumentation.rb +22 -279
- data/lib/Ice/InstrumentationF.rb +2 -7
- data/lib/Ice/LocalException.rb +94 -145
- data/lib/Ice/Locator.rb +50 -169
- data/lib/Ice/LocatorF.rb +2 -7
- data/lib/Ice/Logger.rb +4 -38
- data/lib/Ice/LoggerF.rb +2 -7
- data/lib/Ice/Metrics.rb +60 -420
- data/lib/Ice/ObjectAdapter.rb +29 -0
- data/lib/Ice/ObjectAdapterF.rb +2 -7
- data/lib/Ice/ObjectFactory.rb +4 -34
- data/lib/Ice/Plugin.rb +6 -64
- data/lib/Ice/PluginF.rb +2 -7
- data/lib/Ice/Process.rb +15 -56
- data/lib/Ice/ProcessF.rb +2 -7
- data/lib/Ice/Properties.rb +4 -45
- data/lib/Ice/PropertiesAdmin.rb +18 -60
- data/lib/Ice/PropertiesF.rb +2 -7
- data/lib/Ice/RemoteLogger.rb +33 -119
- data/lib/Ice/Router.rb +28 -105
- data/lib/Ice/RouterF.rb +2 -7
- data/lib/Ice/ServantLocator.rb +26 -0
- data/lib/Ice/ServantLocatorF.rb +24 -0
- data/lib/Ice/SliceChecksumDict.rb +2 -7
- data/lib/Ice/ValueFactory.rb +28 -0
- data/lib/Ice/Version.rb +4 -15
- data/lib/IceBox.rb +1 -6
- data/lib/IceBox/IceBox.rb +43 -152
- data/lib/IceGrid.rb +1 -9
- data/lib/IceGrid/Admin.rb +550 -431
- data/lib/IceGrid/Descriptor.rb +61 -533
- data/lib/IceGrid/Exception.rb +23 -49
- data/lib/IceGrid/FileParser.rb +13 -54
- data/lib/IceGrid/PluginFacade.rb +35 -0
- data/lib/IceGrid/Registry.rb +150 -62
- data/lib/IceGrid/Session.rb +24 -68
- data/lib/IceGrid/UserAccountMapper.rb +13 -54
- data/lib/IcePatch2.rb +1 -6
- data/lib/IcePatch2/FileInfo.rb +4 -15
- data/lib/IcePatch2/FileServer.rb +32 -80
- data/lib/IceStorm.rb +1 -6
- data/lib/IceStorm/IceStorm.rb +78 -210
- data/lib/IceStorm/Metrics.rb +10 -93
- data/slice/Glacier2/Metrics.ice +20 -10
- data/slice/Glacier2/PermissionsVerifier.ice +19 -12
- data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
- data/slice/Glacier2/Router.ice +19 -13
- data/slice/Glacier2/RouterF.ice +16 -9
- data/slice/Glacier2/SSLInfo.ice +17 -10
- data/slice/Glacier2/Session.ice +24 -18
- data/slice/Ice/BuiltinSequences.ice +18 -9
- data/slice/Ice/Communicator.ice +180 -64
- data/slice/Ice/CommunicatorF.ice +18 -9
- data/slice/Ice/Connection.ice +208 -75
- data/slice/Ice/ConnectionF.ice +18 -9
- data/slice/Ice/Current.ice +37 -28
- data/slice/Ice/Endpoint.ice +73 -21
- data/slice/Ice/EndpointF.ice +19 -10
- data/slice/Ice/EndpointTypes.ice +21 -13
- data/slice/Ice/FacetMap.ice +19 -10
- data/slice/Ice/Identity.ice +24 -10
- data/slice/Ice/ImplicitContext.ice +41 -33
- data/slice/Ice/ImplicitContextF.ice +17 -9
- data/slice/Ice/Instrumentation.ice +37 -30
- data/slice/Ice/InstrumentationF.ice +19 -10
- data/slice/Ice/LocalException.ice +118 -112
- data/slice/Ice/Locator.ice +28 -21
- data/slice/Ice/LocatorF.ice +18 -9
- data/slice/Ice/Logger.ice +26 -18
- data/slice/Ice/LoggerF.ice +18 -9
- data/slice/Ice/Metrics.ice +42 -30
- data/slice/Ice/ObjectAdapter.ice +88 -53
- data/slice/Ice/ObjectAdapterF.ice +18 -9
- data/slice/Ice/ObjectFactory.ice +28 -17
- data/slice/Ice/Plugin.ice +25 -13
- data/slice/Ice/PluginF.ice +22 -9
- data/slice/Ice/Process.ice +20 -11
- data/slice/Ice/ProcessF.ice +18 -9
- data/slice/Ice/Properties.ice +42 -28
- data/slice/Ice/PropertiesAdmin.ice +20 -10
- data/slice/Ice/PropertiesF.ice +18 -9
- data/slice/Ice/RemoteLogger.ice +23 -19
- data/slice/Ice/Router.ice +28 -13
- data/slice/Ice/RouterF.ice +18 -9
- data/slice/Ice/ServantLocator.ice +40 -29
- data/slice/Ice/ServantLocatorF.ice +18 -9
- data/slice/Ice/SliceChecksumDict.ice +18 -9
- data/slice/Ice/ValueFactory.ice +132 -0
- data/slice/Ice/Version.ice +20 -10
- data/slice/IceBT/ConnectionInfo.ice +58 -0
- data/slice/IceBT/EndpointInfo.ice +56 -0
- data/slice/IceBT/Types.ice +44 -0
- data/slice/IceBox/IceBox.ice +45 -27
- data/slice/IceDiscovery/IceDiscovery.ice +75 -10
- data/slice/IceGrid/Admin.ice +410 -44
- data/slice/IceGrid/Descriptor.ice +47 -34
- data/slice/IceGrid/Exception.ice +43 -32
- data/slice/IceGrid/FileParser.ice +21 -12
- data/slice/IceGrid/PluginFacade.ice +26 -18
- data/slice/IceGrid/Registry.ice +150 -21
- data/slice/IceGrid/Session.ice +25 -17
- data/slice/IceGrid/UserAccountMapper.ice +23 -14
- data/slice/IceIAP/ConnectionInfo.ice +73 -0
- data/slice/IceIAP/EndpointInfo.ice +67 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
- data/slice/IcePatch2/FileInfo.ice +19 -13
- data/slice/IcePatch2/FileServer.ice +27 -18
- data/slice/IceSSL/ConnectionInfo.ice +27 -23
- data/slice/IceSSL/ConnectionInfoF.ice +30 -0
- data/slice/IceSSL/EndpointInfo.ice +21 -36
- data/slice/IceStorm/IceStorm.ice +33 -24
- data/slice/IceStorm/Metrics.ice +19 -11
- metadata +148 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
- data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
- data/ext/ice/cpp/include/Ice/Connection.h +0 -497
- data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
- data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
- data/ext/ice/cpp/include/Ice/Current.h +0 -102
- data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
- data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
- data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
- data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
- data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
- data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
- data/ext/ice/cpp/include/Ice/Logger.h +0 -100
- data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
- data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
- data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
- data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
- data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
- data/ext/ice/cpp/include/Ice/Properties.h +0 -136
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
- data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
- data/ext/ice/cpp/include/Ice/Router.h +0 -1159
- data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
- data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
- data/ext/ice/cpp/include/Ice/Stream.h +0 -447
- data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
- data/ext/ice/cpp/include/Ice/Version.h +0 -262
- data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
- data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
- data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
- data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
- data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
- data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
- data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
- data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
- data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
- data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
- data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
- data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
- data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
- data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
- data/ext/ice/cpp/include/Slice/Util.h +0 -56
- data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
- data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
- data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
- data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
- data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
- data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
- data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
- data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
- data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
- data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
- data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
- data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
- data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
- data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
- data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
- data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
- data/lib/Ice/ObjectFactoryF.rb +0 -29
- data/lib/IceGrid/Locator.rb +0 -106
- data/lib/IceGrid/Observer.rb +0 -572
- data/lib/IceGrid/Query.rb +0 -169
- data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
- data/slice/Freeze/CatalogData.ice +0 -49
- data/slice/Freeze/Connection.ice +0 -121
- data/slice/Freeze/ConnectionF.ice +0 -20
- data/slice/Freeze/DB.ice +0 -37
- data/slice/Freeze/Evictor.ice +0 -346
- data/slice/Freeze/EvictorF.ice +0 -22
- data/slice/Freeze/EvictorStorage.ice +0 -72
- data/slice/Freeze/Exception.ice +0 -100
- data/slice/Freeze/Transaction.ice +0 -58
- data/slice/Freeze/TransactionalEvictor.ice +0 -50
- data/slice/Ice/ObjectFactoryF.ice +0 -21
- data/slice/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceSSL/PluginI.h>
|
11
6
|
#include <IceSSL/Instance.h>
|
@@ -15,93 +10,123 @@
|
|
15
10
|
#include <Ice/ProtocolPluginFacade.h>
|
16
11
|
#include <Ice/ProtocolInstance.h>
|
17
12
|
#include <Ice/LocalException.h>
|
13
|
+
#include <Ice/RegisterPlugins.h>
|
18
14
|
|
19
15
|
using namespace std;
|
20
16
|
using namespace Ice;
|
21
17
|
using namespace IceSSL;
|
22
18
|
|
23
|
-
|
24
|
-
|
25
|
-
//
|
26
|
-
extern "C"
|
27
|
-
{
|
28
|
-
|
29
|
-
ICE_SSL_API Ice::Plugin*
|
30
|
-
createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const StringSeq& /*args*/)
|
19
|
+
#ifndef ICE_CPP11_MAPPING
|
20
|
+
CertificateVerifier::~CertificateVerifier()
|
31
21
|
{
|
32
|
-
|
22
|
+
// Out of line to avoid weak vtable
|
33
23
|
}
|
34
24
|
|
35
|
-
|
36
|
-
|
37
|
-
namespace Ice
|
38
|
-
{
|
39
|
-
|
40
|
-
ICE_SSL_API void
|
41
|
-
registerIceSSL(bool loadOnInitialize)
|
25
|
+
PasswordPrompt::~PasswordPrompt()
|
42
26
|
{
|
43
|
-
|
27
|
+
// Out of line to avoid weak vtable
|
44
28
|
}
|
29
|
+
#endif
|
45
30
|
|
31
|
+
IceSSL::Plugin::~Plugin()
|
32
|
+
{
|
33
|
+
// Out of line to avoid weak vtable
|
46
34
|
}
|
47
35
|
|
48
36
|
//
|
49
37
|
// Plugin implementation.
|
50
38
|
//
|
51
|
-
|
39
|
+
PluginI::PluginI(const Ice::CommunicatorPtr& com, const SSLEnginePtr& engine) :
|
40
|
+
_engine(engine)
|
52
41
|
{
|
53
|
-
#if defined(ICE_USE_SECURE_TRANSPORT)
|
54
|
-
_engine = new SecureTransportEngine(com);
|
55
|
-
#elif defined(ICE_USE_SCHANNEL)
|
56
|
-
_engine = new SChannelEngine(com);
|
57
|
-
#else
|
58
|
-
_engine = new OpenSSLEngine(com);
|
59
|
-
#endif
|
60
|
-
|
61
42
|
//
|
62
43
|
// Register the endpoint factory. We have to do this now, rather
|
63
44
|
// than in initialize, because the communicator may need to
|
64
45
|
// interpret proxies before the plug-in is fully initialized.
|
65
46
|
//
|
66
|
-
|
67
|
-
IceInternal::getProtocolPluginFacade(com)->addEndpointFactory(
|
47
|
+
InstancePtr instance = new Instance(_engine, SSLEndpointType, "ssl"); // SSL based on TCP
|
48
|
+
IceInternal::getProtocolPluginFacade(com)->addEndpointFactory(new EndpointFactoryI(instance, TCPEndpointType));
|
68
49
|
}
|
69
50
|
|
70
51
|
void
|
71
|
-
|
52
|
+
PluginI::initialize()
|
72
53
|
{
|
73
54
|
_engine->initialize();
|
74
55
|
}
|
75
56
|
|
76
57
|
void
|
77
|
-
|
58
|
+
PluginI::destroy()
|
78
59
|
{
|
79
60
|
_engine->destroy();
|
80
61
|
_engine = 0;
|
81
62
|
}
|
82
63
|
|
64
|
+
#ifdef ICE_CPP11_MAPPING
|
83
65
|
void
|
84
|
-
|
66
|
+
PluginI::setCertificateVerifier(std::function<bool(const std::shared_ptr<IceSSL::ConnectionInfo>&)> verifier)
|
67
|
+
{
|
68
|
+
if(verifier)
|
69
|
+
{
|
70
|
+
_engine->setCertificateVerifier(make_shared<CertificateVerifier>(std::move(verifier)));
|
71
|
+
}
|
72
|
+
else
|
73
|
+
{
|
74
|
+
_engine->setCertificateVerifier(nullptr);
|
75
|
+
}
|
76
|
+
}
|
77
|
+
#else
|
78
|
+
void
|
79
|
+
PluginI::setCertificateVerifier(const CertificateVerifierPtr& verifier)
|
85
80
|
{
|
86
81
|
_engine->setCertificateVerifier(verifier);
|
87
82
|
}
|
83
|
+
#endif
|
88
84
|
|
85
|
+
#ifdef ICE_CPP11_MAPPING
|
89
86
|
void
|
90
|
-
|
87
|
+
PluginI::setPasswordPrompt(std::function<std::string()> prompt)
|
88
|
+
{
|
89
|
+
if(prompt)
|
90
|
+
{
|
91
|
+
_engine->setPasswordPrompt(make_shared<PasswordPrompt>(std::move(prompt)));
|
92
|
+
}
|
93
|
+
else
|
94
|
+
{
|
95
|
+
_engine->setPasswordPrompt(nullptr);
|
96
|
+
}
|
97
|
+
}
|
98
|
+
#else
|
99
|
+
void
|
100
|
+
PluginI::setPasswordPrompt(const PasswordPromptPtr& prompt)
|
91
101
|
{
|
92
102
|
_engine->setPasswordPrompt(prompt);
|
93
103
|
}
|
104
|
+
#endif
|
94
105
|
|
95
|
-
|
96
|
-
|
97
|
-
|
106
|
+
extern "C"
|
107
|
+
{
|
108
|
+
|
109
|
+
ICESSL_API Ice::Plugin*
|
110
|
+
createIceSSL(const CommunicatorPtr&, const string&, const StringSeq&);
|
111
|
+
|
112
|
+
}
|
113
|
+
|
114
|
+
namespace Ice
|
115
|
+
{
|
116
|
+
|
117
|
+
ICESSL_API void
|
118
|
+
registerIceSSL(bool loadOnInitialize)
|
98
119
|
{
|
99
|
-
|
120
|
+
Ice::registerPluginFactory("IceSSL", createIceSSL, loadOnInitialize);
|
100
121
|
}
|
101
122
|
|
102
|
-
|
103
|
-
|
123
|
+
}
|
124
|
+
|
125
|
+
//
|
126
|
+
// Objective-C function to allow Objective-C programs to register plugin.
|
127
|
+
//
|
128
|
+
extern "C" ICESSL_API void
|
129
|
+
ICEregisterIceSSL(bool loadOnInitialize)
|
104
130
|
{
|
105
|
-
|
131
|
+
Ice::registerIceSSL(loadOnInitialize);
|
106
132
|
}
|
107
|
-
#endif
|
@@ -1,14 +1,9 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
|
-
#ifndef
|
11
|
-
#define
|
5
|
+
#ifndef ICESSL_PLUGIN_I_H
|
6
|
+
#define ICESSL_PLUGIN_I_H
|
12
7
|
|
13
8
|
#include <IceSSL/Plugin.h>
|
14
9
|
#include <IceSSL/SSLEngineF.h>
|
@@ -17,12 +12,11 @@
|
|
17
12
|
namespace IceSSL
|
18
13
|
{
|
19
14
|
|
20
|
-
class PluginI : public IceSSL::Plugin
|
15
|
+
class ICESSL_API PluginI : public virtual IceSSL::Plugin
|
21
16
|
{
|
22
17
|
public:
|
23
18
|
|
24
|
-
PluginI(const Ice::CommunicatorPtr&);
|
25
|
-
|
19
|
+
PluginI(const Ice::CommunicatorPtr&, const IceSSL::SSLEnginePtr&);
|
26
20
|
//
|
27
21
|
// From Ice::Plugin.
|
28
22
|
//
|
@@ -32,23 +26,19 @@ public:
|
|
32
26
|
//
|
33
27
|
// From IceSSL::Plugin.
|
34
28
|
//
|
29
|
+
#ifdef ICE_CPP11_MAPPING
|
30
|
+
virtual void setCertificateVerifier(std::function<bool(const std::shared_ptr<ConnectionInfo>&)>);
|
31
|
+
virtual void setPasswordPrompt(std::function<std::string()>);
|
32
|
+
#else
|
35
33
|
virtual void setCertificateVerifier(const CertificateVerifierPtr&);
|
36
34
|
virtual void setPasswordPrompt(const PasswordPromptPtr&);
|
37
|
-
|
38
|
-
#ifdef ICE_USE_OPENSSL
|
39
|
-
virtual void setContext(SSL_CTX*);
|
40
|
-
virtual SSL_CTX* getContext();
|
41
35
|
#endif
|
42
36
|
|
43
|
-
|
37
|
+
virtual CertificatePtr load(const std::string&) const = 0;
|
38
|
+
virtual CertificatePtr decode(const std::string&) const = 0;
|
39
|
+
protected:
|
44
40
|
|
45
|
-
|
46
|
-
SecureTransportEnginePtr _engine;
|
47
|
-
#elif defined(ICE_USE_SCHANNEL)
|
48
|
-
SChannelEnginePtr _engine;
|
49
|
-
#else
|
50
|
-
OpenSSLEnginePtr _engine;
|
51
|
-
#endif
|
41
|
+
SSLEnginePtr _engine;
|
52
42
|
};
|
53
43
|
|
54
44
|
}
|
@@ -1,11 +1,6 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
5
|
#include <IceUtil/StringUtil.h>
|
11
6
|
|
@@ -37,8 +32,8 @@ static string parsePair(const string&, size_t&);
|
|
37
32
|
static string parseHexPair(const string&, size_t&, bool);
|
38
33
|
static void eatWhite(const string&, size_t&);
|
39
34
|
|
40
|
-
|
41
|
-
|
35
|
+
RFC2253::RDNEntrySeq
|
36
|
+
RFC2253::parse(const string& data)
|
42
37
|
{
|
43
38
|
RDNEntrySeq results;
|
44
39
|
RDNEntry current;
|
@@ -82,8 +77,8 @@ IceSSL::RFC2253::parse(const string& data)
|
|
82
77
|
return results;
|
83
78
|
}
|
84
79
|
|
85
|
-
|
86
|
-
|
80
|
+
RFC2253::RDNSeq
|
81
|
+
RFC2253::parseStrict(const string& data)
|
87
82
|
{
|
88
83
|
RDNSeq results;
|
89
84
|
size_t pos = 0;
|
@@ -104,7 +99,7 @@ IceSSL::RFC2253::parseStrict(const string& data)
|
|
104
99
|
}
|
105
100
|
|
106
101
|
string
|
107
|
-
|
102
|
+
RFC2253::unescape(const string& data)
|
108
103
|
{
|
109
104
|
if(data.size() == 0)
|
110
105
|
{
|
@@ -187,7 +182,6 @@ hexToInt(char v)
|
|
187
182
|
return 10 + (v - 'A');
|
188
183
|
}
|
189
184
|
throw ParseException(__FILE__, __LINE__, "unescape: invalid hex pair");
|
190
|
-
return 0; // To satisfy the compiler.
|
191
185
|
}
|
192
186
|
|
193
187
|
static char
|
@@ -271,7 +265,7 @@ parseAttributeType(const string& data, size_t& pos)
|
|
271
265
|
//
|
272
266
|
// Here we must also check for "oid." and "OID." before parsing
|
273
267
|
// according to the ALPHA KEYCHAR* rule.
|
274
|
-
//
|
268
|
+
//
|
275
269
|
// First the OID case.
|
276
270
|
//
|
277
271
|
if(IceUtilInternal::isDigit(data[pos]) ||
|
@@ -318,7 +312,7 @@ parseAttributeType(const string& data, size_t& pos)
|
|
318
312
|
result += data[pos];
|
319
313
|
++pos;
|
320
314
|
// 1* KEYCHAR
|
321
|
-
while(pos < data.size() &&
|
315
|
+
while(pos < data.size() &&
|
322
316
|
(IceUtilInternal::isAlpha(data[pos]) || IceUtilInternal::isDigit(data[pos]) || data[pos] == '-'))
|
323
317
|
{
|
324
318
|
result += data[pos];
|
@@ -448,7 +442,7 @@ parsePair(const string& data, size_t& pos)
|
|
448
442
|
}
|
449
443
|
return parseHexPair(data, pos, false);
|
450
444
|
}
|
451
|
-
|
445
|
+
|
452
446
|
//
|
453
447
|
// RFC 2253
|
454
448
|
// hexpair = hexchar hexchar
|
@@ -494,48 +488,3 @@ eatWhite(const string& data, size_t& pos)
|
|
494
488
|
++pos;
|
495
489
|
}
|
496
490
|
}
|
497
|
-
|
498
|
-
#ifdef never
|
499
|
-
void
|
500
|
-
print(const list< list<pair<string, string> > >& r)
|
501
|
-
{
|
502
|
-
if(r.size() > 1)
|
503
|
-
{
|
504
|
-
cout << "result: " << r.size() << " DNs" << endl;
|
505
|
-
}
|
506
|
-
for(list< list<pair<string, string> > >::const_iterator q = r.begin(); q != r.end(); ++q)
|
507
|
-
{
|
508
|
-
list<pair<string, string> > l = *q;
|
509
|
-
cout << "result: " << l.size() << " RDNs" << endl;
|
510
|
-
for(list<pair<string, string> >::const_iterator p = l.begin(); p != l.end(); ++p)
|
511
|
-
{
|
512
|
-
cout << "\t\"" << p->first << "\"=\"" << p->second << "\"" << endl;
|
513
|
-
}
|
514
|
-
}
|
515
|
-
}
|
516
|
-
|
517
|
-
int
|
518
|
-
main()
|
519
|
-
{
|
520
|
-
string examples[] = {
|
521
|
-
"CN=Steve Kille,O=Isode Limited,C=GB",
|
522
|
-
"OU=Sales+CN=J. Smith,O=Widget Inc.,C=US",
|
523
|
-
"CN=L. Eagle,O=Sue\\, Grabbit and Runn,C=GB",
|
524
|
-
"CN=Before\\0DAfter,O=Test,C=GB",
|
525
|
-
"1.3.6.1.4.1.1466.0=#04024869,O=Test,C=GB",
|
526
|
-
"SN=Lu\\C4\\8Di\\C4\\87",
|
527
|
-
};
|
528
|
-
try
|
529
|
-
{
|
530
|
-
for(int i = 0; i < sizeof(examples)/sizeof(examples[0]); ++i)
|
531
|
-
{
|
532
|
-
cout << "string: " << examples[i] << endl;
|
533
|
-
print(RFC2253::parse(examples[i]));
|
534
|
-
}
|
535
|
-
}
|
536
|
-
catch(const RFC2253::ParseException& e)
|
537
|
-
{
|
538
|
-
cout << "error: " << e.reason << endl;
|
539
|
-
}
|
540
|
-
}
|
541
|
-
#endif
|
@@ -1,14 +1,9 @@
|
|
1
|
-
// **********************************************************************
|
2
1
|
//
|
3
|
-
// Copyright (c)
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
4
3
|
//
|
5
|
-
// This copy of Ice is licensed to you under the terms described in the
|
6
|
-
// ICE_LICENSE file included in this distribution.
|
7
|
-
//
|
8
|
-
// **********************************************************************
|
9
4
|
|
10
|
-
#ifndef
|
11
|
-
#define
|
5
|
+
#ifndef ICESSL_RFC_2253_H
|
6
|
+
#define ICESSL_RFC_2253_H
|
12
7
|
|
13
8
|
#include <IceUtil/Config.h>
|
14
9
|
#include <list>
|
@@ -33,7 +28,7 @@ namespace RFC2253
|
|
33
28
|
|
34
29
|
typedef std::list< std::pair<std::string, std::string> > RDNSeq;
|
35
30
|
|
36
|
-
struct RDNEntry
|
31
|
+
struct ICESSL_API RDNEntry
|
37
32
|
{
|
38
33
|
RDNSeq rdn;
|
39
34
|
bool negate;
|
@@ -46,7 +41,7 @@ typedef std::list
|
|
46
41
|
// The function returns a list of RDNEntry structures. Any failure in
|
47
42
|
// parsing results in a ParseException being thrown.
|
48
43
|
//
|
49
|
-
RDNEntrySeq parse(const std::string&);
|
44
|
+
ICESSL_API RDNEntrySeq parse(const std::string&);
|
50
45
|
|
51
46
|
//
|
52
47
|
// RDNs are separated with ',' and ';'.
|
@@ -54,12 +49,12 @@ RDNEntrySeq parse(const std::string&);
|
|
54
49
|
// This function returns a list of RDN pairs. Any failure in parsing
|
55
50
|
// results in a ParseException being thrown.
|
56
51
|
//
|
57
|
-
RDNSeq parseStrict(const std::string&);
|
52
|
+
ICESSL_API RDNSeq parseStrict(const std::string&);
|
58
53
|
|
59
54
|
//
|
60
55
|
// Unescape the string.
|
61
56
|
//
|
62
|
-
std::string unescape(const std::string&);
|
57
|
+
ICESSL_API std::string unescape(const std::string&);
|
63
58
|
|
64
59
|
}
|
65
60
|
}
|
@@ -0,0 +1,580 @@
|
|
1
|
+
//
|
2
|
+
// Copyright (c) ZeroC, Inc. All rights reserved.
|
3
|
+
//
|
4
|
+
|
5
|
+
#include <IceSSL/Plugin.h>
|
6
|
+
#include <IceSSL/SChannel.h>
|
7
|
+
#include <IceSSL/CertificateI.h>
|
8
|
+
#include <IceSSL/Util.h>
|
9
|
+
#include <Ice/StringUtil.h>
|
10
|
+
#include <Ice/StringConverter.h>
|
11
|
+
|
12
|
+
#include <wincrypt.h>
|
13
|
+
|
14
|
+
#include <string>
|
15
|
+
#include <vector>
|
16
|
+
|
17
|
+
using namespace std;
|
18
|
+
using namespace Ice;
|
19
|
+
using namespace IceSSL;
|
20
|
+
|
21
|
+
namespace
|
22
|
+
{
|
23
|
+
|
24
|
+
class CertInfoHolder : public IceUtil::Shared
|
25
|
+
{
|
26
|
+
public:
|
27
|
+
|
28
|
+
CertInfoHolder(CERT_INFO* v) : _certInfo(v)
|
29
|
+
{
|
30
|
+
}
|
31
|
+
|
32
|
+
virtual ~CertInfoHolder()
|
33
|
+
{
|
34
|
+
LocalFree(_certInfo);
|
35
|
+
}
|
36
|
+
|
37
|
+
private:
|
38
|
+
|
39
|
+
CERT_INFO* _certInfo;
|
40
|
+
};
|
41
|
+
typedef IceUtil::Handle<CertInfoHolder> CertInfoHolderPtr;
|
42
|
+
|
43
|
+
class SCHannelX509ExtensionI : public X509Extension
|
44
|
+
{
|
45
|
+
|
46
|
+
public:
|
47
|
+
|
48
|
+
SCHannelX509ExtensionI(CERT_EXTENSION , const string&, const CertInfoHolderPtr&);
|
49
|
+
virtual bool isCritical() const;
|
50
|
+
virtual string getOID() const;
|
51
|
+
virtual vector<Ice::Byte> getData() const;
|
52
|
+
|
53
|
+
private:
|
54
|
+
|
55
|
+
CERT_EXTENSION _extension;
|
56
|
+
string _oid;
|
57
|
+
CertInfoHolderPtr _certInfo; // Keep a reference on the CERT_INFO struct that holds the extension
|
58
|
+
};
|
59
|
+
|
60
|
+
class SChannelCertificateI : public SChannel::Certificate,
|
61
|
+
public CertificateI,
|
62
|
+
public IceUtil::Mutex
|
63
|
+
{
|
64
|
+
public:
|
65
|
+
|
66
|
+
SChannelCertificateI(CERT_SIGNED_CONTENT_INFO*);
|
67
|
+
~SChannelCertificateI();
|
68
|
+
|
69
|
+
virtual bool operator==(const IceSSL::Certificate&) const;
|
70
|
+
|
71
|
+
virtual vector<Ice::Byte> getAuthorityKeyIdentifier() const;
|
72
|
+
virtual vector<Ice::Byte> getSubjectKeyIdentifier() const;
|
73
|
+
virtual bool verify(const CertificatePtr&) const;
|
74
|
+
virtual string encode() const;
|
75
|
+
|
76
|
+
#ifdef ICE_CPP11_MAPPING
|
77
|
+
virtual chrono::system_clock::time_point getNotAfter() const;
|
78
|
+
virtual chrono::system_clock::time_point getNotBefore() const;
|
79
|
+
#else
|
80
|
+
virtual IceUtil::Time getNotAfter() const;
|
81
|
+
virtual IceUtil::Time getNotBefore() const;
|
82
|
+
#endif
|
83
|
+
virtual string getSerialNumber() const;
|
84
|
+
virtual DistinguishedName getIssuerDN() const;
|
85
|
+
virtual vector<pair<int, string> > getIssuerAlternativeNames() const;
|
86
|
+
virtual DistinguishedName getSubjectDN() const;
|
87
|
+
virtual vector<pair<int, string> > getSubjectAlternativeNames() const;
|
88
|
+
virtual int getVersion() const;
|
89
|
+
virtual CERT_SIGNED_CONTENT_INFO* getCert() const;
|
90
|
+
|
91
|
+
protected:
|
92
|
+
|
93
|
+
virtual void loadX509Extensions() const;
|
94
|
+
|
95
|
+
private:
|
96
|
+
|
97
|
+
CERT_SIGNED_CONTENT_INFO* _cert;
|
98
|
+
CERT_INFO* _certInfo;
|
99
|
+
CertInfoHolderPtr _certInfoHolder;
|
100
|
+
};
|
101
|
+
|
102
|
+
const Ice::Long TICKS_PER_MSECOND = 10000LL;
|
103
|
+
const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
|
104
|
+
|
105
|
+
void
|
106
|
+
loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const char* buffer, DWORD length)
|
107
|
+
{
|
108
|
+
DWORD outLength = length;
|
109
|
+
vector<BYTE> outBuffer;
|
110
|
+
outBuffer.resize(outLength);
|
111
|
+
|
112
|
+
if(!CryptStringToBinary(buffer, length, CRYPT_STRING_BASE64HEADER, &outBuffer[0], &outLength, 0, 0))
|
113
|
+
{
|
114
|
+
//
|
115
|
+
// Base64 data should always be bigger than binary
|
116
|
+
//
|
117
|
+
assert(GetLastError() != ERROR_MORE_DATA);
|
118
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
119
|
+
}
|
120
|
+
|
121
|
+
DWORD decodedLeng = 0;
|
122
|
+
if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT, &outBuffer[0], outLength, CRYPT_DECODE_ALLOC_FLAG, 0,
|
123
|
+
cert, &decodedLeng))
|
124
|
+
{
|
125
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
126
|
+
}
|
127
|
+
}
|
128
|
+
|
129
|
+
void
|
130
|
+
loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const string& file)
|
131
|
+
{
|
132
|
+
vector<char> buffer;
|
133
|
+
readFile(file, buffer);
|
134
|
+
if(buffer.empty())
|
135
|
+
{
|
136
|
+
throw CertificateReadException(__FILE__, __LINE__, "certificate file " + file + " is empty");
|
137
|
+
}
|
138
|
+
loadCertificate(cert, &buffer[0], static_cast<DWORD>(buffer.size()));
|
139
|
+
}
|
140
|
+
|
141
|
+
# ifdef ICE_CPP11_MAPPING
|
142
|
+
chrono::system_clock::time_point
|
143
|
+
# else
|
144
|
+
IceUtil::Time
|
145
|
+
# endif
|
146
|
+
filetimeToTime(FILETIME ftime)
|
147
|
+
{
|
148
|
+
Ice::Long value = 0;
|
149
|
+
DWORD* dest = reinterpret_cast<DWORD*>(&value);
|
150
|
+
*dest++ = ftime.dwLowDateTime;
|
151
|
+
*dest = ftime.dwHighDateTime;
|
152
|
+
|
153
|
+
IceUtil::Time time = IceUtil::Time::milliSeconds((value / TICKS_PER_MSECOND) - MSECS_TO_EPOCH);
|
154
|
+
|
155
|
+
# ifdef ICE_CPP11_MAPPING
|
156
|
+
return chrono::system_clock::time_point(chrono::microseconds(time.toMicroSeconds()));
|
157
|
+
# else
|
158
|
+
return time;
|
159
|
+
# endif
|
160
|
+
}
|
161
|
+
|
162
|
+
string
|
163
|
+
certNameToString(CERT_NAME_BLOB* certName)
|
164
|
+
{
|
165
|
+
assert(certName);
|
166
|
+
DWORD length = 0;
|
167
|
+
if((length = CertNameToStr(X509_ASN_ENCODING, certName, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, 0, 0)) == 0)
|
168
|
+
{
|
169
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
170
|
+
}
|
171
|
+
|
172
|
+
vector<char> buffer(length);
|
173
|
+
if(!CertNameToStr(X509_ASN_ENCODING, certName, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, &buffer[0], length))
|
174
|
+
{
|
175
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
176
|
+
}
|
177
|
+
|
178
|
+
string s(&buffer[0]);
|
179
|
+
for(int i = 0; i < certificateOIDSSize; ++i)
|
180
|
+
{
|
181
|
+
const CertificateOID* certificateOID = &certificateOIDS[i];
|
182
|
+
assert(certificateOID);
|
183
|
+
const string name = string(certificateOID->name) + "=";
|
184
|
+
const string alias = string(certificateOID->alias) + "=";
|
185
|
+
size_t pos = 0;
|
186
|
+
while((pos = s.find(name, pos)) != string::npos)
|
187
|
+
{
|
188
|
+
s.replace(pos, name.size(), alias);
|
189
|
+
}
|
190
|
+
}
|
191
|
+
return s;
|
192
|
+
}
|
193
|
+
|
194
|
+
vector<pair<int, string> >
|
195
|
+
certificateAltNames(CERT_INFO* certInfo, LPCSTR altNameOID)
|
196
|
+
{
|
197
|
+
vector<pair<int, string> > altNames;
|
198
|
+
|
199
|
+
PCERT_EXTENSION extension = CertFindExtension(altNameOID, certInfo->cExtension, certInfo->rgExtension);
|
200
|
+
if(extension)
|
201
|
+
{
|
202
|
+
CERT_ALT_NAME_INFO* altName;
|
203
|
+
DWORD length = 0;
|
204
|
+
if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, extension->Value.pbData,
|
205
|
+
extension->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &altName, &length))
|
206
|
+
{
|
207
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
208
|
+
}
|
209
|
+
|
210
|
+
for(DWORD i = 0; i < altName->cAltEntry; ++i)
|
211
|
+
{
|
212
|
+
CERT_ALT_NAME_ENTRY* entry = &altName->rgAltEntry[i];
|
213
|
+
|
214
|
+
switch(entry->dwAltNameChoice)
|
215
|
+
{
|
216
|
+
case CERT_ALT_NAME_RFC822_NAME:
|
217
|
+
{
|
218
|
+
altNames.push_back(make_pair(AltNameEmail, Ice::wstringToString(entry->pwszRfc822Name)));
|
219
|
+
break;
|
220
|
+
}
|
221
|
+
case CERT_ALT_NAME_DNS_NAME:
|
222
|
+
{
|
223
|
+
altNames.push_back(make_pair(AltNameDNS, Ice::wstringToString(entry->pwszDNSName)));
|
224
|
+
break;
|
225
|
+
}
|
226
|
+
case CERT_ALT_NAME_DIRECTORY_NAME:
|
227
|
+
{
|
228
|
+
altNames.push_back(make_pair(AltNameDirectory, certNameToString(&entry->DirectoryName)));
|
229
|
+
break;
|
230
|
+
}
|
231
|
+
case CERT_ALT_NAME_URL:
|
232
|
+
{
|
233
|
+
altNames.push_back(make_pair(AltNameURL, Ice::wstringToString(entry->pwszURL)));
|
234
|
+
break;
|
235
|
+
}
|
236
|
+
case CERT_ALT_NAME_IP_ADDRESS:
|
237
|
+
{
|
238
|
+
if(entry->IPAddress.cbData == 4)
|
239
|
+
{
|
240
|
+
//
|
241
|
+
// IPv4 address
|
242
|
+
//
|
243
|
+
ostringstream os;
|
244
|
+
Byte* src = reinterpret_cast<Byte*>(entry->IPAddress.pbData);
|
245
|
+
for(int j = 0; j < 4;)
|
246
|
+
{
|
247
|
+
int value = 0;
|
248
|
+
Byte* dest = reinterpret_cast<Byte*>(&value);
|
249
|
+
*dest = *src++;
|
250
|
+
os << value;
|
251
|
+
if(++j < 4)
|
252
|
+
{
|
253
|
+
os << ".";
|
254
|
+
}
|
255
|
+
}
|
256
|
+
altNames.push_back(make_pair(AltNAmeIP, os.str()));
|
257
|
+
}
|
258
|
+
//
|
259
|
+
// TODO IPv6 Address support.
|
260
|
+
//
|
261
|
+
break;
|
262
|
+
}
|
263
|
+
default:
|
264
|
+
{
|
265
|
+
// Not supported
|
266
|
+
break;
|
267
|
+
}
|
268
|
+
}
|
269
|
+
}
|
270
|
+
LocalFree(altName);
|
271
|
+
}
|
272
|
+
return altNames;
|
273
|
+
}
|
274
|
+
|
275
|
+
} // End anonymous namespace
|
276
|
+
|
277
|
+
SCHannelX509ExtensionI::SCHannelX509ExtensionI(CERT_EXTENSION extension, const string& oid, const CertInfoHolderPtr& ci) :
|
278
|
+
_extension(extension),
|
279
|
+
_oid(oid),
|
280
|
+
_certInfo(ci)
|
281
|
+
{
|
282
|
+
}
|
283
|
+
|
284
|
+
bool
|
285
|
+
SCHannelX509ExtensionI::isCritical() const
|
286
|
+
{
|
287
|
+
return _extension.fCritical != 0;
|
288
|
+
}
|
289
|
+
|
290
|
+
string
|
291
|
+
SCHannelX509ExtensionI::getOID() const
|
292
|
+
{
|
293
|
+
return _oid;
|
294
|
+
}
|
295
|
+
|
296
|
+
vector<Ice::Byte>
|
297
|
+
SCHannelX509ExtensionI::getData() const
|
298
|
+
{
|
299
|
+
vector<Ice::Byte> data;
|
300
|
+
data.resize(_extension.Value.cbData);
|
301
|
+
memcpy(&data[0], _extension.Value.pbData, _extension.Value.cbData);
|
302
|
+
return data;
|
303
|
+
}
|
304
|
+
|
305
|
+
SChannelCertificateI::SChannelCertificateI(CERT_SIGNED_CONTENT_INFO* cert) :
|
306
|
+
_cert(cert)
|
307
|
+
{
|
308
|
+
if(!_cert)
|
309
|
+
{
|
310
|
+
#ifdef ICE_CPP11_MAPPING
|
311
|
+
throw invalid_argument("Invalid certificate reference");
|
312
|
+
#else
|
313
|
+
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference");
|
314
|
+
#endif
|
315
|
+
}
|
316
|
+
|
317
|
+
try
|
318
|
+
{
|
319
|
+
//
|
320
|
+
// Decode certificate info
|
321
|
+
//
|
322
|
+
DWORD length = 0;
|
323
|
+
if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, _cert->ToBeSigned.pbData,
|
324
|
+
_cert->ToBeSigned.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &_certInfo, &length))
|
325
|
+
{
|
326
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
327
|
+
}
|
328
|
+
_certInfoHolder = new CertInfoHolder(_certInfo);
|
329
|
+
}
|
330
|
+
catch(...)
|
331
|
+
{
|
332
|
+
LocalFree(_cert);
|
333
|
+
_cert = 0;
|
334
|
+
throw;
|
335
|
+
}
|
336
|
+
}
|
337
|
+
|
338
|
+
SChannelCertificateI::~SChannelCertificateI()
|
339
|
+
{
|
340
|
+
if(_cert)
|
341
|
+
{
|
342
|
+
LocalFree(_cert);
|
343
|
+
}
|
344
|
+
}
|
345
|
+
|
346
|
+
bool
|
347
|
+
SChannelCertificateI::operator==(const IceSSL::Certificate& r) const
|
348
|
+
{
|
349
|
+
const SChannelCertificateI* p = dynamic_cast<const SChannelCertificateI*>(&r);
|
350
|
+
if(!p)
|
351
|
+
{
|
352
|
+
return false;
|
353
|
+
}
|
354
|
+
|
355
|
+
return CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, p->_certInfo) != 0;
|
356
|
+
}
|
357
|
+
|
358
|
+
vector<Ice::Byte>
|
359
|
+
SChannelCertificateI::getAuthorityKeyIdentifier() const
|
360
|
+
{
|
361
|
+
vector<Ice::Byte> keyid;
|
362
|
+
PCERT_EXTENSION extension = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, _certInfo->cExtension,
|
363
|
+
_certInfo->rgExtension);
|
364
|
+
if(extension)
|
365
|
+
{
|
366
|
+
CERT_AUTHORITY_KEY_ID2_INFO* decoded;
|
367
|
+
DWORD length = 0;
|
368
|
+
if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_AUTHORITY_KEY_ID2, extension->Value.pbData,
|
369
|
+
extension->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &decoded, &length))
|
370
|
+
{
|
371
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
372
|
+
}
|
373
|
+
|
374
|
+
if(decoded->KeyId.pbData && decoded->KeyId.cbData)
|
375
|
+
{
|
376
|
+
keyid.resize(decoded->KeyId.cbData);
|
377
|
+
memcpy(&keyid[0], decoded->KeyId.pbData, decoded->KeyId.cbData);
|
378
|
+
LocalFree(decoded);
|
379
|
+
}
|
380
|
+
}
|
381
|
+
return keyid;
|
382
|
+
}
|
383
|
+
|
384
|
+
vector<Ice::Byte>
|
385
|
+
SChannelCertificateI::getSubjectKeyIdentifier() const
|
386
|
+
{
|
387
|
+
vector<Ice::Byte> keyid;
|
388
|
+
PCERT_EXTENSION extension = CertFindExtension(szOID_SUBJECT_KEY_IDENTIFIER, _certInfo->cExtension,
|
389
|
+
_certInfo->rgExtension);
|
390
|
+
if(extension)
|
391
|
+
{
|
392
|
+
CRYPT_DATA_BLOB* decoded;
|
393
|
+
DWORD length = 0;
|
394
|
+
if(!CryptDecodeObjectEx(X509_ASN_ENCODING, szOID_SUBJECT_KEY_IDENTIFIER, extension->Value.pbData,
|
395
|
+
extension->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &decoded, &length))
|
396
|
+
{
|
397
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
398
|
+
}
|
399
|
+
|
400
|
+
if(decoded->pbData && decoded->cbData)
|
401
|
+
{
|
402
|
+
keyid.resize(decoded->cbData);
|
403
|
+
memcpy(&keyid[0], decoded->pbData, decoded->cbData);
|
404
|
+
LocalFree(decoded);
|
405
|
+
}
|
406
|
+
}
|
407
|
+
return keyid;
|
408
|
+
}
|
409
|
+
|
410
|
+
bool
|
411
|
+
SChannelCertificateI::verify(const CertificatePtr& cert) const
|
412
|
+
{
|
413
|
+
bool result = false;
|
414
|
+
SChannelCertificateI* c = dynamic_cast<SChannelCertificateI*>(cert.get());
|
415
|
+
if(c)
|
416
|
+
{
|
417
|
+
BYTE* buffer = 0;
|
418
|
+
DWORD length = 0;
|
419
|
+
if(!CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, _cert, CRYPT_ENCODE_ALLOC_FLAG , 0, &buffer, &length))
|
420
|
+
{
|
421
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
422
|
+
}
|
423
|
+
result = CryptVerifyCertificateSignature(0, X509_ASN_ENCODING, buffer, length, &c->_certInfo->SubjectPublicKeyInfo) != 0;
|
424
|
+
LocalFree(buffer);
|
425
|
+
}
|
426
|
+
return result;
|
427
|
+
}
|
428
|
+
|
429
|
+
string
|
430
|
+
SChannelCertificateI::encode() const
|
431
|
+
{
|
432
|
+
string s;
|
433
|
+
DWORD length = 0;
|
434
|
+
BYTE* buffer = 0;
|
435
|
+
try
|
436
|
+
{
|
437
|
+
if(!CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, _cert, CRYPT_ENCODE_ALLOC_FLAG , 0, &buffer, &length))
|
438
|
+
{
|
439
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
440
|
+
}
|
441
|
+
|
442
|
+
DWORD encodedLength = 0;
|
443
|
+
if(!CryptBinaryToString(buffer, length, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, 0, &encodedLength))
|
444
|
+
{
|
445
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
446
|
+
}
|
447
|
+
|
448
|
+
std::vector<char> encoded;
|
449
|
+
encoded.resize(encodedLength);
|
450
|
+
if(!CryptBinaryToString(buffer, length, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, &encoded[0],
|
451
|
+
&encodedLength))
|
452
|
+
{
|
453
|
+
throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
|
454
|
+
}
|
455
|
+
LocalFree(buffer);
|
456
|
+
buffer = 0;
|
457
|
+
s.assign(&encoded[0]);
|
458
|
+
}
|
459
|
+
catch(...)
|
460
|
+
{
|
461
|
+
if(buffer)
|
462
|
+
{
|
463
|
+
LocalFree(buffer);
|
464
|
+
}
|
465
|
+
throw;
|
466
|
+
}
|
467
|
+
return s;
|
468
|
+
}
|
469
|
+
|
470
|
+
# ifdef ICE_CPP11_MAPPING
|
471
|
+
chrono::system_clock::time_point
|
472
|
+
# else
|
473
|
+
IceUtil::Time
|
474
|
+
# endif
|
475
|
+
SChannelCertificateI::getNotAfter() const
|
476
|
+
{
|
477
|
+
return filetimeToTime(_certInfo->NotAfter);
|
478
|
+
}
|
479
|
+
|
480
|
+
# ifdef ICE_CPP11_MAPPING
|
481
|
+
chrono::system_clock::time_point
|
482
|
+
# else
|
483
|
+
IceUtil::Time
|
484
|
+
# endif
|
485
|
+
SChannelCertificateI::getNotBefore() const
|
486
|
+
{
|
487
|
+
return filetimeToTime(_certInfo->NotBefore);
|
488
|
+
}
|
489
|
+
|
490
|
+
string
|
491
|
+
SChannelCertificateI::getSerialNumber() const
|
492
|
+
{
|
493
|
+
ostringstream os;
|
494
|
+
for(int i = _certInfo->SerialNumber.cbData - 1; i >= 0; --i)
|
495
|
+
{
|
496
|
+
unsigned char c = _certInfo->SerialNumber.pbData[i];
|
497
|
+
os.fill('0');
|
498
|
+
os.width(2);
|
499
|
+
os << hex << static_cast<int>(c);
|
500
|
+
if(i)
|
501
|
+
{
|
502
|
+
os << ' ';
|
503
|
+
}
|
504
|
+
}
|
505
|
+
return IceUtilInternal::toUpper(os.str());
|
506
|
+
}
|
507
|
+
|
508
|
+
DistinguishedName
|
509
|
+
SChannelCertificateI::getIssuerDN() const
|
510
|
+
{
|
511
|
+
return DistinguishedName(certNameToString(&_certInfo->Issuer));
|
512
|
+
}
|
513
|
+
|
514
|
+
vector<pair<int, string> >
|
515
|
+
SChannelCertificateI::getIssuerAlternativeNames() const
|
516
|
+
{
|
517
|
+
return certificateAltNames(_certInfo, szOID_ISSUER_ALT_NAME2);
|
518
|
+
}
|
519
|
+
|
520
|
+
DistinguishedName
|
521
|
+
SChannelCertificateI::getSubjectDN() const
|
522
|
+
{
|
523
|
+
return DistinguishedName(certNameToString(&_certInfo->Subject));
|
524
|
+
}
|
525
|
+
|
526
|
+
vector<pair<int, string> >
|
527
|
+
SChannelCertificateI::getSubjectAlternativeNames() const
|
528
|
+
{
|
529
|
+
return certificateAltNames(_certInfo, szOID_SUBJECT_ALT_NAME2);
|
530
|
+
}
|
531
|
+
|
532
|
+
int
|
533
|
+
SChannelCertificateI::getVersion() const
|
534
|
+
{
|
535
|
+
return _certInfo->dwVersion;
|
536
|
+
}
|
537
|
+
|
538
|
+
CERT_SIGNED_CONTENT_INFO*
|
539
|
+
SChannelCertificateI::getCert() const
|
540
|
+
{
|
541
|
+
return _cert;
|
542
|
+
}
|
543
|
+
|
544
|
+
void
|
545
|
+
SChannelCertificateI::loadX509Extensions() const
|
546
|
+
{
|
547
|
+
IceUtil::Mutex::Lock sync(*this);
|
548
|
+
if(_extensions.empty())
|
549
|
+
{
|
550
|
+
for(size_t i = 0; i < _certInfo->cExtension; ++i)
|
551
|
+
{
|
552
|
+
CERT_EXTENSION ext = _certInfo->rgExtension[i];
|
553
|
+
_extensions.push_back(ICE_DYNAMIC_CAST(X509Extension,
|
554
|
+
ICE_MAKE_SHARED(SCHannelX509ExtensionI, ext, ext.pszObjId,
|
555
|
+
_certInfoHolder)));
|
556
|
+
}
|
557
|
+
}
|
558
|
+
}
|
559
|
+
|
560
|
+
SChannel::CertificatePtr
|
561
|
+
SChannel::Certificate::create(CERT_SIGNED_CONTENT_INFO* cert)
|
562
|
+
{
|
563
|
+
return ICE_MAKE_SHARED(SChannelCertificateI, cert);
|
564
|
+
}
|
565
|
+
|
566
|
+
SChannel::CertificatePtr
|
567
|
+
SChannel::Certificate::load(const std::string& file)
|
568
|
+
{
|
569
|
+
CERT_SIGNED_CONTENT_INFO* cert;
|
570
|
+
loadCertificate(&cert, file);
|
571
|
+
return ICE_MAKE_SHARED(SChannelCertificateI, cert);
|
572
|
+
}
|
573
|
+
|
574
|
+
SChannel::CertificatePtr
|
575
|
+
SChannel::Certificate::decode(const std::string& encoding)
|
576
|
+
{
|
577
|
+
CERT_SIGNED_CONTENT_INFO* cert;
|
578
|
+
loadCertificate(&cert, encoding.c_str(), static_cast<DWORD>(encoding.size()));
|
579
|
+
return ICE_MAKE_SHARED(SChannelCertificateI, cert);
|
580
|
+
}
|