zeroc-ice 3.6.5 → 3.7.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/BZIP2_LICENSE +42 -0
- data/ICE_LICENSE +17 -17
- data/LICENSE +12 -12
- data/bin/slice2rb +1 -1
- data/ext/Communicator.cpp +150 -53
- data/ext/Communicator.h +1 -1
- data/ext/Config.h +2 -12
- data/ext/Connection.cpp +89 -68
- data/ext/Connection.h +1 -1
- data/ext/Endpoint.cpp +16 -45
- data/ext/Endpoint.h +1 -1
- data/ext/ImplicitContext.cpp +1 -5
- data/ext/ImplicitContext.h +1 -1
- data/ext/Init.cpp +4 -1
- data/ext/Logger.cpp +1 -1
- data/ext/Logger.h +1 -1
- data/ext/Operation.cpp +33 -44
- data/ext/Operation.h +1 -1
- data/ext/Properties.cpp +1 -1
- data/ext/Properties.h +1 -1
- data/ext/Proxy.cpp +22 -57
- data/ext/Proxy.h +1 -1
- data/ext/Slice.cpp +5 -5
- data/ext/Slice.h +1 -1
- data/ext/Types.cpp +244 -171
- data/ext/Types.h +118 -66
- data/ext/Util.cpp +13 -9
- data/ext/Util.h +10 -10
- data/ext/ValueFactoryManager.cpp +445 -0
- data/ext/ValueFactoryManager.h +100 -0
- data/ext/extconf.rb +47 -45
- data/ext/ice/bzip2/blocksort.c +1094 -0
- data/ext/ice/bzip2/bzlib.c +1572 -0
- data/ext/ice/bzip2/bzlib.h +282 -0
- data/ext/ice/bzip2/bzlib_private.h +509 -0
- data/ext/ice/bzip2/compress.c +672 -0
- data/ext/ice/bzip2/crctable.c +104 -0
- data/ext/ice/bzip2/decompress.c +646 -0
- data/ext/ice/bzip2/huffman.c +205 -0
- data/ext/ice/bzip2/randtable.c +84 -0
- data/ext/ice/cpp/include/Ice/Application.h +77 -60
- data/ext/ice/cpp/include/Ice/AsyncResult.h +34 -318
- data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -2
- data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +5 -10
- data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -1
- data/ext/ice/cpp/include/Ice/Buffer.h +10 -10
- data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +14 -12
- data/ext/ice/cpp/include/Ice/Comparable.h +130 -0
- data/ext/ice/cpp/include/Ice/Config.h +7 -36
- data/ext/ice/cpp/include/Ice/ConnectionAsync.h +107 -11
- data/ext/ice/cpp/include/Ice/ConnectionIF.h +5 -1
- data/ext/ice/cpp/include/Ice/ConsoleUtil.h +28 -0
- data/ext/ice/cpp/include/Ice/{DefaultObjectFactory.h → DefaultValueFactory.h} +28 -14
- data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +4 -6
- data/ext/ice/cpp/include/Ice/Dispatcher.h +14 -13
- data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -5
- data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -1
- data/ext/ice/cpp/include/Ice/Exception.h +66 -56
- data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +69 -0
- data/ext/ice/cpp/include/Ice/FactoryTable.h +11 -12
- data/ext/ice/cpp/include/Ice/FactoryTableInit.h +27 -25
- data/ext/ice/cpp/include/Ice/Format.h +6 -1
- data/ext/ice/cpp/include/Ice/Functional.h +33 -33
- data/ext/ice/cpp/include/Ice/GCObject.h +9 -5
- data/ext/ice/cpp/include/Ice/Handle.h +6 -11
- data/ext/ice/cpp/include/Ice/Ice.h +9 -5
- data/ext/ice/cpp/include/{IceUtil → Ice}/IconvStringConverter.h +108 -62
- data/ext/ice/cpp/include/Ice/Incoming.h +109 -33
- data/ext/ice/cpp/include/Ice/IncomingAsync.h +63 -23
- data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -1
- data/ext/ice/cpp/include/Ice/Initialize.h +178 -38
- data/ext/ice/cpp/include/Ice/InputStream.h +994 -0
- data/ext/ice/cpp/include/Ice/InstanceF.h +1 -2
- data/ext/ice/cpp/include/Ice/InterfaceByValue.h +46 -0
- data/ext/ice/cpp/include/Ice/LocalObject.h +9 -9
- data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -1
- data/ext/ice/cpp/include/Ice/LoggerUtil.h +20 -14
- data/ext/ice/cpp/include/Ice/MetricsAdminI.h +114 -65
- data/ext/ice/cpp/include/Ice/MetricsFunctional.h +23 -5
- data/ext/ice/cpp/include/Ice/MetricsObserverI.h +99 -26
- data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +17 -4
- data/ext/ice/cpp/include/Ice/Object.h +105 -56
- data/ext/ice/cpp/include/Ice/ObjectF.h +8 -3
- data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -8
- data/ext/ice/cpp/include/Ice/Optional.h +1084 -0
- data/ext/ice/cpp/include/Ice/OutgoingAsync.h +655 -84
- data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -6
- data/ext/ice/cpp/include/Ice/OutputStream.h +753 -0
- data/ext/ice/cpp/include/Ice/Protocol.h +19 -12
- data/ext/ice/cpp/include/Ice/Proxy.h +1329 -717
- data/ext/ice/cpp/include/Ice/ProxyF.h +11 -33
- data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -1
- data/ext/ice/cpp/include/Ice/ProxyHandle.h +34 -50
- data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -1
- data/ext/ice/cpp/include/Ice/RegisterPlugins.h +22 -3
- data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -4
- data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -1
- data/ext/ice/cpp/include/{IceUtil → Ice}/SHA1.h +16 -16
- data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -1
- data/ext/ice/cpp/include/Ice/Service.h +13 -18
- data/ext/ice/cpp/include/Ice/SliceChecksums.h +1 -1
- data/ext/ice/cpp/include/Ice/SlicedData.h +46 -20
- data/ext/ice/cpp/include/Ice/SlicedDataF.h +14 -6
- data/ext/ice/cpp/include/Ice/StreamHelpers.h +159 -49
- data/ext/ice/cpp/include/Ice/StringConverter.h +52 -0
- data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -1
- data/{slice/Ice/ObjectFactoryF.ice → ext/ice/cpp/include/Ice/UUID.h} +9 -7
- data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +21 -22
- data/ext/ice/cpp/include/Ice/UniqueRef.h +98 -0
- data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +40 -8
- data/ext/ice/cpp/include/Ice/Value.h +104 -0
- data/{slice/Freeze/ConnectionF.ice → ext/ice/cpp/include/Ice/ValueF.h} +11 -7
- data/ext/ice/cpp/include/IceSSL/Config.h +8 -23
- data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -6
- data/ext/ice/cpp/include/IceSSL/OpenSSL.h +130 -0
- data/ext/ice/cpp/include/IceSSL/Plugin.h +172 -259
- data/ext/ice/cpp/include/IceSSL/SChannel.h +66 -0
- data/ext/ice/cpp/include/IceSSL/SecureTransport.h +66 -0
- data/ext/ice/cpp/include/IceSSL/UWP.h +58 -0
- data/ext/ice/cpp/include/IceUtil/Atomic.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Cond.h +17 -18
- data/ext/ice/cpp/include/IceUtil/Config.h +138 -39
- data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +97 -0
- data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -5
- data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +23 -17
- data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +1 -3
- data/ext/ice/cpp/include/IceUtil/Exception.h +157 -67
- data/ext/ice/cpp/include/IceUtil/FileUtil.h +148 -0
- data/ext/ice/cpp/include/IceUtil/Functional.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Handle.h +11 -11
- data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -10
- data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -2
- data/ext/ice/cpp/include/IceUtil/Lock.h +8 -10
- data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -2
- data/ext/ice/cpp/include/IceUtil/Mutex.h +17 -11
- data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -2
- data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -4
- data/ext/ice/cpp/include/IceUtil/Optional.h +32 -18
- data/ext/ice/cpp/include/IceUtil/Options.h +17 -18
- data/ext/ice/cpp/include/IceUtil/OutputUtil.h +55 -29
- data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -6
- data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +11 -10
- data/ext/ice/cpp/include/IceUtil/Random.h +3 -3
- data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -8
- data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +58 -0
- data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +1 -9
- data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -2
- data/ext/ice/cpp/include/IceUtil/Shared.h +5 -7
- data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -2
- data/ext/ice/cpp/include/IceUtil/StringConverter.h +77 -72
- data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -21
- data/ext/ice/cpp/include/IceUtil/Thread.h +10 -12
- data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -42
- data/ext/ice/cpp/include/IceUtil/Time.h +3 -3
- data/ext/ice/cpp/include/IceUtil/Timer.h +14 -13
- data/ext/ice/cpp/include/IceUtil/UUID.h +2 -2
- data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -1
- data/ext/ice/cpp/include/{Ice → generated/Ice}/BuiltinSequences.h +41 -8
- data/ext/ice/cpp/include/generated/Ice/Communicator.h +364 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Connection.h +872 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ConnectionF.h +46 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Current.h +71 -8
- data/ext/ice/cpp/include/generated/Ice/Endpoint.h +582 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointF.h +62 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/EndpointTypes.h +31 -16
- data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/Identity.h +221 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContext.h +72 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +602 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/InstrumentationF.h +54 -8
- data/ext/ice/cpp/include/generated/Ice/LocalException.h +2802 -0
- data/ext/ice/cpp/include/generated/Ice/Locator.h +2036 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LocatorF.h +53 -12
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Logger.h +71 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/Metrics.h +2649 -0
- data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +302 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +40 -8
- data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +142 -0
- data/ext/ice/cpp/include/generated/Ice/Plugin.h +197 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PluginF.h +43 -8
- data/ext/ice/cpp/include/generated/Ice/Process.h +536 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ProcessF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/Properties.h +88 -21
- data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +749 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/PropertiesF.h +48 -10
- data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +1449 -0
- data/ext/ice/cpp/include/generated/Ice/Router.h +1032 -0
- data/ext/ice/cpp/include/{Ice → generated/Ice}/RouterF.h +45 -10
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocator.h +65 -13
- data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +40 -8
- data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +23 -8
- data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +169 -0
- data/ext/ice/cpp/include/generated/Ice/Version.h +334 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +172 -0
- data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +98 -0
- data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +156 -0
- data/ext/ice/cpp/src/Ice/ACM.cpp +18 -14
- data/ext/ice/cpp/src/Ice/ACM.h +9 -2
- data/ext/ice/cpp/{include → src}/Ice/ACMF.h +10 -5
- data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Acceptor.h +4 -3
- data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.cpp +9 -9
- data/ext/ice/cpp/src/{IceUtil → Ice}/ArgVector.h +7 -7
- data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -538
- data/ext/ice/cpp/src/Ice/Base64.cpp +11 -11
- data/ext/ice/cpp/src/Ice/Base64.h +1 -1
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +40 -12
- data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -10
- data/ext/ice/cpp/src/Ice/Buffer.cpp +74 -12
- data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +20 -6
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +85 -190
- data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -18
- data/ext/ice/cpp/src/Ice/Communicator.cpp +39 -8
- data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +271 -104
- data/ext/ice/cpp/src/Ice/CommunicatorI.h +84 -28
- data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -3
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +58 -125
- data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +11 -22
- data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -2
- data/ext/ice/cpp/src/Ice/Connection.cpp +88 -8
- data/ext/ice/cpp/src/Ice/ConnectionF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +158 -80
- data/ext/ice/cpp/src/Ice/ConnectionFactory.h +41 -23
- data/ext/ice/cpp/{include → src}/Ice/ConnectionFactoryF.h +8 -3
- data/ext/ice/cpp/src/Ice/ConnectionI.cpp +707 -653
- data/ext/ice/cpp/src/Ice/ConnectionI.h +97 -69
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -15
- data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +4 -3
- data/ext/ice/cpp/src/Ice/Connector.cpp +6 -1
- data/ext/ice/cpp/src/Ice/Connector.h +4 -3
- data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -4
- data/ext/ice/cpp/src/Ice/Current.cpp +29 -6
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +6 -5
- data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -1
- data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -1
- data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +5 -25
- data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +29 -19
- data/ext/ice/cpp/src/Ice/Endpoint.cpp +85 -6
- data/ext/ice/cpp/src/Ice/EndpointF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -1
- data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -6
- data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +35 -19
- data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -4
- data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -1
- data/ext/ice/cpp/src/Ice/EndpointI.cpp +17 -1
- data/ext/ice/cpp/src/Ice/EndpointI.h +35 -9
- data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -5
- data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +18 -6
- data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -4
- data/ext/ice/cpp/src/Ice/EventHandler.h +13 -8
- data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -2
- data/ext/ice/cpp/src/Ice/Exception.cpp +95 -86
- data/ext/ice/cpp/src/Ice/FacetMap.cpp +20 -6
- data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -28
- data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -4
- data/ext/ice/cpp/src/Ice/GCObject.cpp +28 -25
- data/ext/ice/cpp/src/Ice/HashUtil.h +2 -3
- data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -2
- data/ext/ice/cpp/src/Ice/HttpParser.h +1 -1
- data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +92 -53
- data/ext/ice/cpp/src/Ice/IPEndpointI.h +19 -10
- data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -2
- data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +56 -0
- data/ext/ice/cpp/src/Ice/Identity.cpp +24 -10
- data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +14 -14
- data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -5
- data/ext/ice/cpp/src/Ice/Incoming.cpp +276 -245
- data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -209
- data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -4
- data/ext/ice/cpp/src/Ice/Initialize.cpp +299 -172
- data/ext/ice/cpp/src/Ice/InputStream.cpp +2773 -0
- data/ext/ice/cpp/src/Ice/Instance.cpp +191 -231
- data/ext/ice/cpp/src/Ice/Instance.h +30 -18
- data/ext/ice/cpp/src/Ice/Instrumentation.cpp +106 -7
- data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +117 -99
- data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -31
- data/ext/ice/cpp/src/Ice/LocalException.cpp +1190 -416
- data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Locator.cpp +1167 -1215
- data/ext/ice/cpp/src/Ice/LocatorF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +129 -163
- data/ext/ice/cpp/src/Ice/LocatorInfo.h +29 -29
- data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -1
- data/ext/ice/cpp/src/Ice/Logger.cpp +35 -5
- data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +178 -73
- data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -4
- data/ext/ice/cpp/src/Ice/LoggerF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/LoggerI.cpp +14 -44
- data/ext/ice/cpp/src/Ice/LoggerI.h +7 -13
- data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -12
- data/ext/ice/cpp/src/Ice/Metrics.cpp +1059 -1069
- data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +49 -19
- data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Network.cpp +534 -170
- data/ext/ice/cpp/src/Ice/Network.h +100 -23
- data/ext/ice/cpp/src/Ice/NetworkF.h +2 -2
- data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +21 -14
- data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -2
- data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -1
- data/ext/ice/cpp/src/Ice/Object.cpp +217 -221
- data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +41 -6
- data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +35 -14
- data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -7
- data/ext/ice/cpp/{include → src}/Ice/ObjectAdapterFactoryF.h +5 -1
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +184 -58
- data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +32 -26
- data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -32
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +40 -18
- data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +14 -5
- data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +803 -365
- data/ext/ice/cpp/src/Ice/OutputStream.cpp +1399 -0
- data/ext/ice/cpp/src/Ice/Plugin.cpp +45 -6
- data/ext/ice/cpp/src/Ice/PluginF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +13 -13
- data/ext/ice/cpp/src/Ice/PluginManagerI.h +5 -6
- data/ext/ice/cpp/src/Ice/Process.cpp +256 -114
- data/ext/ice/cpp/src/Ice/ProcessF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/Properties.cpp +38 -8
- data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +340 -328
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +81 -17
- data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -5
- data/ext/ice/cpp/src/Ice/PropertiesF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/PropertiesI.cpp +25 -26
- data/ext/ice/cpp/src/Ice/PropertiesI.h +8 -11
- data/ext/ice/cpp/src/Ice/PropertyNames.cpp +107 -50
- data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -2
- data/ext/ice/cpp/src/Ice/Protocol.cpp +2 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -2
- data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -20
- data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -1
- data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -1
- data/ext/ice/cpp/src/Ice/Proxy.cpp +690 -964
- data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +23 -32
- data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -11
- data/ext/ice/cpp/src/Ice/Reference.cpp +75 -69
- data/ext/ice/cpp/src/Ice/Reference.h +27 -22
- data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +18 -21
- data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -12
- data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -1
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +18 -4
- data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -1
- data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +672 -552
- data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -1
- data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -3
- data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -13
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -6
- data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -2
- data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -6
- data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -7
- data/ext/ice/cpp/src/Ice/RetryQueue.cpp +6 -12
- data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -6
- data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -1
- data/ext/ice/cpp/src/Ice/Router.cpp +523 -474
- data/ext/ice/cpp/src/Ice/RouterF.cpp +29 -6
- data/ext/ice/cpp/src/Ice/RouterInfo.cpp +91 -70
- data/ext/ice/cpp/src/Ice/RouterInfo.h +43 -32
- data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -1
- data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +21 -21
- data/ext/ice/cpp/src/Ice/Selector.cpp +989 -923
- data/ext/ice/cpp/src/Ice/Selector.h +100 -147
- data/ext/ice/cpp/src/Ice/ServantLocator.cpp +37 -6
- data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +27 -5
- data/ext/ice/cpp/src/Ice/ServantManager.cpp +9 -9
- data/ext/ice/cpp/src/Ice/ServantManager.h +1 -1
- data/ext/ice/cpp/src/Ice/SharedContext.h +2 -2
- data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +20 -6
- data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -2
- data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -20
- data/ext/ice/cpp/src/Ice/StreamSocket.cpp +173 -18
- data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -4
- data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +48 -17
- data/ext/ice/cpp/src/Ice/StringUtil.h +35 -0
- data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +8 -4
- data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -3
- data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +158 -32
- data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -5
- data/ext/ice/cpp/src/Ice/TcpConnector.cpp +1 -7
- data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +40 -32
- data/ext/ice/cpp/src/Ice/TcpEndpointI.h +11 -8
- data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +12 -27
- data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -10
- data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +24 -41
- data/ext/ice/cpp/src/Ice/ThreadPool.cpp +175 -267
- data/ext/ice/cpp/src/Ice/ThreadPool.h +38 -43
- data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +28 -21
- data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -2
- data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -1
- data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -2
- data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -31
- data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -6
- data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -2
- data/ext/ice/cpp/src/Ice/Transceiver.h +8 -7
- data/ext/ice/cpp/src/Ice/TransceiverF.h +1 -1
- data/ext/ice/cpp/src/Ice/UdpConnector.cpp +2 -8
- data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -2
- data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +92 -31
- data/ext/ice/cpp/src/Ice/UdpEndpointI.h +12 -4
- data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +150 -179
- data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -17
- data/ext/ice/cpp/src/Ice/Value.cpp +81 -0
- data/ext/ice/cpp/src/Ice/ValueFactory.cpp +84 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +70 -0
- data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +42 -0
- data/ext/ice/cpp/src/Ice/Version.cpp +24 -14
- data/ext/ice/cpp/src/Ice/VirtualShared.h +43 -0
- data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -9
- data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -7
- data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -11
- data/ext/ice/cpp/src/Ice/WSConnector.h +3 -6
- data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +185 -80
- data/ext/ice/cpp/src/Ice/WSEndpoint.h +21 -31
- data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +41 -37
- data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -21
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +526 -264
- data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +341 -455
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +86 -26
- data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -23
- data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -61
- data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -36
- data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -59
- data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -3
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +396 -159
- data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +251 -355
- data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +52 -0
- data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +526 -131
- data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +19 -165
- data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -17
- data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +284 -0
- data/ext/ice/cpp/src/IceSSL/CertificateI.h +69 -0
- data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +39 -11
- data/ext/ice/cpp/src/{Ice/ObjectFactoryF.cpp → IceSSL/ConnectionInfoF.cpp} +31 -9
- data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +14 -56
- data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -13
- data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +205 -197
- data/ext/ice/cpp/src/IceSSL/EndpointI.h +41 -33
- data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +39 -10
- data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -6
- data/ext/ice/cpp/src/IceSSL/Instance.h +7 -7
- data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -7
- data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +588 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +117 -152
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +64 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +132 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +400 -89
- data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +36 -21
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +291 -0
- data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +63 -0
- data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -41
- data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -18
- data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -54
- data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -7
- data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +585 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +491 -75
- data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +126 -0
- data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +32 -0
- data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +78 -0
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +126 -169
- data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +19 -22
- data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +79 -74
- data/ext/ice/cpp/src/IceSSL/SSLEngine.h +24 -187
- data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -19
- data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +862 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +56 -214
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +60 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +31 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +80 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +137 -144
- data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +25 -28
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +857 -0
- data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +46 -0
- data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +9 -13
- data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -4
- data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -3
- data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +271 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +343 -0
- data/ext/ice/cpp/src/IceSSL/UWPEngine.h +46 -0
- data/ext/ice/cpp/{include/Ice/ObjectFactoryManagerF.h → src/IceSSL/UWPEngineF.h} +13 -8
- data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +94 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +388 -0
- data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +76 -0
- data/ext/ice/cpp/src/IceSSL/Util.cpp +66 -1256
- data/ext/ice/cpp/src/IceSSL/Util.h +48 -137
- data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +162 -0
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -22
- data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -26
- data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +20 -31
- data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +25 -116
- data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/Options.cpp +23 -46
- data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +7 -6
- data/ext/ice/cpp/src/IceUtil/Random.cpp +13 -13
- data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +3 -9
- data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -3
- data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -264
- data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +540 -235
- data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -74
- data/ext/ice/cpp/src/IceUtil/Time.cpp +1 -1
- data/ext/ice/cpp/src/IceUtil/UUID.cpp +10 -10
- data/ext/ice/cpp/src/IceUtil/Unicode.cpp +98 -97
- data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -35
- data/ext/ice/cpp/src/IceUtil/UtilException.cpp +838 -0
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +815 -163
- data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +76 -0
- data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -2
- data/ext/ice/cpp/{include → src}/Slice/Checksum.h +2 -2
- data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -78
- data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -9
- data/ext/ice/cpp/src/Slice/Grammar.cpp +1994 -1943
- data/ext/ice/cpp/src/Slice/Grammar.h +44 -24
- data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -14
- data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2658 -1927
- data/ext/ice/cpp/{include → src}/Slice/JavaUtil.h +178 -59
- data/ext/ice/cpp/src/Slice/MD5.cpp +1 -1
- data/ext/ice/cpp/src/Slice/MD5.h +1 -1
- data/ext/ice/cpp/src/Slice/MD5I.cpp +0 -1
- data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
- data/ext/ice/cpp/src/Slice/PHPUtil.cpp +12 -15
- data/ext/ice/cpp/{include → src}/Slice/PHPUtil.h +6 -15
- data/ext/ice/cpp/src/Slice/Parser.cpp +802 -307
- data/ext/ice/cpp/{include → src}/Slice/Parser.h +76 -84
- data/ext/ice/cpp/src/Slice/Preprocessor.cpp +43 -21
- data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +7 -12
- data/ext/ice/cpp/src/Slice/Python.cpp +207 -86
- data/ext/ice/cpp/src/Slice/PythonUtil.cpp +683 -679
- data/ext/ice/cpp/{include → src}/Slice/PythonUtil.h +19 -8
- data/ext/ice/cpp/src/Slice/Ruby.cpp +38 -34
- data/ext/ice/cpp/src/Slice/RubyUtil.cpp +177 -445
- data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -6
- data/ext/ice/cpp/src/Slice/Scanner.cpp +218 -306
- data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +37 -64
- data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +374 -0
- data/ext/ice/cpp/src/Slice/Util.h +54 -0
- data/ext/ice/mcpp/Makefile +5 -2
- data/ice.gemspec +2 -7
- data/lib/Glacier2.rb +1 -1
- data/lib/Glacier2/Metrics.rb +7 -46
- data/lib/Glacier2/PermissionsVerifier.rb +24 -95
- data/lib/Glacier2/PermissionsVerifierF.rb +3 -3
- data/lib/Glacier2/Router.rb +32 -74
- data/lib/Glacier2/RouterF.rb +3 -3
- data/lib/Glacier2/SSLInfo.rb +4 -7
- data/lib/Glacier2/Session.rb +88 -307
- data/lib/Ice.rb +83 -52
- data/lib/Ice/BuiltinSequences.rb +4 -4
- data/lib/Ice/Communicator.rb +56 -58
- data/lib/Ice/CommunicatorF.rb +3 -3
- data/lib/Ice/Connection.rb +153 -162
- data/lib/Ice/ConnectionF.rb +3 -3
- data/lib/Ice/Current.rb +4 -11
- data/lib/Ice/Endpoint.rb +57 -133
- data/lib/Ice/EndpointF.rb +3 -3
- data/lib/Ice/EndpointTypes.rb +3 -7
- data/lib/Ice/FacetMap.rb +4 -4
- data/lib/Ice/Identity.rb +5 -8
- data/lib/Ice/ImplicitContext.rb +5 -34
- data/lib/Ice/ImplicitContextF.rb +3 -3
- data/lib/Ice/Instrumentation.rb +23 -275
- data/lib/Ice/InstrumentationF.rb +3 -3
- data/lib/Ice/LocalException.rb +95 -141
- data/lib/Ice/Locator.rb +51 -165
- data/lib/Ice/LocatorF.rb +3 -3
- data/lib/Ice/Logger.rb +5 -34
- data/lib/Ice/LoggerF.rb +3 -3
- data/lib/Ice/Metrics.rb +61 -416
- data/lib/Ice/ObjectAdapter.rb +34 -0
- data/lib/Ice/ObjectAdapterF.rb +3 -3
- data/lib/Ice/ObjectFactory.rb +5 -30
- data/lib/Ice/Plugin.rb +7 -60
- data/lib/Ice/PluginF.rb +3 -3
- data/lib/Ice/Process.rb +16 -52
- data/lib/Ice/ProcessF.rb +3 -3
- data/lib/Ice/Properties.rb +5 -41
- data/lib/Ice/PropertiesAdmin.rb +19 -56
- data/lib/Ice/PropertiesF.rb +3 -3
- data/lib/Ice/RemoteLogger.rb +34 -115
- data/lib/Ice/Router.rb +29 -101
- data/lib/Ice/RouterF.rb +3 -3
- data/lib/Ice/ServantLocator.rb +31 -0
- data/lib/Ice/{ObjectFactoryF.rb → ServantLocatorF.rb} +6 -6
- data/lib/Ice/SliceChecksumDict.rb +3 -3
- data/lib/Ice/ValueFactory.rb +33 -0
- data/lib/Ice/Version.rb +5 -11
- data/lib/IceBox.rb +1 -1
- data/lib/IceBox/IceBox.rb +44 -148
- data/lib/IceGrid.rb +1 -4
- data/lib/IceGrid/Admin.rb +551 -427
- data/lib/IceGrid/Descriptor.rb +62 -529
- data/lib/IceGrid/Exception.rb +24 -45
- data/lib/IceGrid/FileParser.rb +14 -50
- data/lib/IceGrid/PluginFacade.rb +40 -0
- data/lib/IceGrid/Registry.rb +151 -58
- data/lib/IceGrid/Session.rb +25 -64
- data/lib/IceGrid/UserAccountMapper.rb +14 -50
- data/lib/IcePatch2.rb +1 -1
- data/lib/IcePatch2/FileInfo.rb +5 -11
- data/lib/IcePatch2/FileServer.rb +33 -76
- data/lib/IceStorm.rb +1 -1
- data/lib/IceStorm/IceStorm.rb +79 -206
- data/lib/IceStorm/Metrics.rb +11 -89
- data/slice/Glacier2/Metrics.ice +8 -4
- data/slice/Glacier2/PermissionsVerifier.ice +10 -7
- data/slice/Glacier2/PermissionsVerifierF.ice +7 -4
- data/slice/Glacier2/Router.ice +10 -8
- data/slice/Glacier2/RouterF.ice +7 -4
- data/slice/Glacier2/SSLInfo.ice +8 -5
- data/slice/Glacier2/Session.ice +15 -13
- data/slice/Ice/BuiltinSequences.ice +7 -4
- data/slice/Ice/Communicator.ice +141 -66
- data/slice/Ice/CommunicatorF.ice +7 -4
- data/slice/Ice/Connection.ice +183 -86
- data/slice/Ice/ConnectionF.ice +7 -4
- data/slice/Ice/Current.ice +13 -9
- data/slice/Ice/Endpoint.ice +63 -14
- data/slice/Ice/EndpointF.ice +7 -4
- data/slice/Ice/EndpointTypes.ice +8 -6
- data/slice/Ice/FacetMap.ice +7 -4
- data/slice/Ice/Identity.ice +13 -5
- data/slice/Ice/ImplicitContext.ice +20 -18
- data/slice/Ice/ImplicitContextF.ice +7 -4
- data/slice/Ice/Instrumentation.ice +20 -19
- data/slice/Ice/InstrumentationF.ice +8 -5
- data/slice/Ice/LocalException.ice +87 -87
- data/slice/Ice/Locator.ice +19 -18
- data/slice/Ice/LocatorF.ice +7 -4
- data/slice/Ice/Logger.ice +9 -7
- data/slice/Ice/LoggerF.ice +7 -4
- data/slice/Ice/Metrics.ice +18 -14
- data/slice/Ice/ObjectAdapter.ice +30 -13
- data/slice/Ice/ObjectAdapterF.ice +7 -4
- data/slice/Ice/ObjectFactory.ice +15 -12
- data/slice/Ice/Plugin.ice +9 -6
- data/slice/Ice/PluginF.ice +8 -5
- data/slice/Ice/Process.ice +9 -6
- data/slice/Ice/ProcessF.ice +7 -4
- data/slice/Ice/Properties.ice +15 -12
- data/slice/Ice/PropertiesAdmin.ice +9 -5
- data/slice/Ice/PropertiesF.ice +7 -4
- data/slice/Ice/RemoteLogger.ice +33 -24
- data/slice/Ice/Router.ice +16 -7
- data/slice/Ice/RouterF.ice +7 -4
- data/slice/Ice/ServantLocator.ice +13 -10
- data/slice/Ice/ServantLocatorF.ice +7 -4
- data/slice/Ice/SliceChecksumDict.ice +7 -4
- data/slice/Ice/ValueFactory.ice +127 -0
- data/slice/Ice/Version.ice +9 -5
- data/slice/IceBT/ConnectionInfo.ice +53 -0
- data/slice/IceBT/EndpointInfo.ice +51 -0
- data/slice/IceBT/Types.ice +39 -0
- data/slice/IceBox/IceBox.ice +20 -21
- data/slice/IceDiscovery/IceDiscovery.ice +9 -5
- data/slice/IceGrid/Admin.ice +390 -30
- data/slice/IceGrid/Descriptor.ice +37 -29
- data/slice/IceGrid/Exception.ice +33 -27
- data/slice/IceGrid/FileParser.ice +9 -6
- data/slice/IceGrid/PluginFacade.ice +11 -9
- data/slice/IceGrid/Registry.ice +139 -16
- data/slice/IceGrid/Session.ice +10 -8
- data/slice/IceGrid/UserAccountMapper.ice +9 -6
- data/slice/IceIAP/ConnectionInfo.ice +70 -0
- data/slice/IceIAP/EndpointInfo.ice +64 -0
- data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +9 -7
- data/slice/IcePatch2/FileInfo.ice +9 -8
- data/slice/IcePatch2/FileServer.ice +17 -13
- data/slice/IceSSL/ConnectionInfo.ice +14 -17
- data/slice/IceSSL/ConnectionInfoF.ice +24 -0
- data/slice/IceSSL/EndpointInfo.ice +9 -30
- data/slice/IceStorm/IceStorm.ice +22 -18
- data/slice/IceStorm/Metrics.ice +9 -5
- metadata +154 -120
- data/ext/ObjectFactory.cpp +0 -140
- data/ext/ObjectFactory.h +0 -50
- data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
- 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/DeprecatedStringConverter.h +0 -62
- data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
- data/ext/ice/cpp/include/Ice/Identity.h +0 -168
- data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
- 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/Metrics.h +0 -2974
- data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
- 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/Outgoing.h +0 -225
- data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
- data/ext/ice/cpp/include/Ice/Process.h +0 -574
- data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
- 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/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/Slice/CPlusPlusUtil.h +0 -65
- 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/ObjCUtil.h +0 -127
- 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/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/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/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/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/IceGrid/Locator.ice +0 -57
- data/slice/IceGrid/Observer.ice +0 -395
- data/slice/IceGrid/Query.ice +0 -131
@@ -0,0 +1,46 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
|
+
//
|
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
|
+
|
10
|
+
#ifndef ICESSL_SECURE_TRANSPORT_UTIL_H
|
11
|
+
#define ICESSL_SECURE_TRANSPORT_UTIL_H
|
12
|
+
|
13
|
+
#include <IceSSL/SecureTransport.h>
|
14
|
+
#include <IceSSL/Util.h>
|
15
|
+
|
16
|
+
namespace IceSSL
|
17
|
+
{
|
18
|
+
|
19
|
+
namespace SecureTransport
|
20
|
+
{
|
21
|
+
|
22
|
+
std::string sslErrorToString(CFErrorRef);
|
23
|
+
std::string sslErrorToString(OSStatus);
|
24
|
+
|
25
|
+
# if defined(ICE_USE_SECURE_TRANSPORT_MACOS)
|
26
|
+
//
|
27
|
+
// Retrieve a certificate property
|
28
|
+
//
|
29
|
+
CFDictionaryRef getCertificateProperty(SecCertificateRef, CFTypeRef);
|
30
|
+
# endif
|
31
|
+
|
32
|
+
//
|
33
|
+
// Read certificate from a file.
|
34
|
+
//
|
35
|
+
CFArrayRef loadCertificateChain(const std::string&, const std::string&, const std::string&, const std::string&,
|
36
|
+
const std::string&, const PasswordPromptPtr&, int);
|
37
|
+
|
38
|
+
SecCertificateRef loadCertificate(const std::string&);
|
39
|
+
CFArrayRef loadCACertificates(const std::string&);
|
40
|
+
CFArrayRef findCertificateChain(const std::string&, const std::string&, const std::string&);
|
41
|
+
|
42
|
+
} // SecureTransport namespace end
|
43
|
+
|
44
|
+
} // IceSSL namespace end
|
45
|
+
|
46
|
+
#endif
|
@@ -1,6 +1,6 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
@@ -9,6 +9,7 @@
|
|
9
9
|
|
10
10
|
#include <IceSSL/TrustManager.h>
|
11
11
|
#include <IceSSL/RFC2253.h>
|
12
|
+
#include <IceSSL/ConnectionInfo.h>
|
12
13
|
|
13
14
|
#include <Ice/Properties.h>
|
14
15
|
#include <Ice/Communicator.h>
|
@@ -62,7 +63,7 @@ TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
|
|
62
63
|
}
|
63
64
|
|
64
65
|
bool
|
65
|
-
TrustManager::verify(const
|
66
|
+
TrustManager::verify(const ConnectionInfoPtr& info, const std::string& desc)
|
66
67
|
{
|
67
68
|
list<list<DistinguishedName> > reject, accept;
|
68
69
|
|
@@ -131,27 +132,22 @@ TrustManager::verify(const NativeConnectionInfoPtr& info)
|
|
131
132
|
//
|
132
133
|
// If there is no certificate then we match false.
|
133
134
|
//
|
134
|
-
if(info->
|
135
|
+
if(info->certs.size() != 0)
|
135
136
|
{
|
136
|
-
DistinguishedName subject = info->
|
137
|
+
DistinguishedName subject = info->certs[0]->getSubjectDN();
|
137
138
|
if(_traceLevel > 0)
|
138
139
|
{
|
139
140
|
Ice::Trace trace(_communicator->getLogger(), "Security");
|
140
141
|
if(info->incoming)
|
141
142
|
{
|
142
|
-
trace << "trust manager evaluating client:\n"
|
143
|
-
<< "
|
144
|
-
<< "adapter = " << info->adapterName << '\n'
|
145
|
-
<< "local addr = " << info->localAddress << ":" << info->localPort << '\n'
|
146
|
-
<< "remote addr = " << info->remoteAddress << ":" << info->remotePort;
|
143
|
+
trace << "trust manager evaluating client:\n" << "subject = " << string(subject) << '\n'
|
144
|
+
<< "adapter = " << info->adapterName << '\n';
|
147
145
|
}
|
148
146
|
else
|
149
147
|
{
|
150
|
-
trace << "trust manager evaluating server:\n"
|
151
|
-
<< "subject = " << string(subject) << '\n'
|
152
|
-
<< "local addr = " << info->localAddress << ":" << info->localPort << '\n'
|
153
|
-
<< "remote addr = " << info->remoteAddress << ":" << info->remotePort;
|
148
|
+
trace << "trust manager evaluating server:\n" << "subject = " << string(subject) << '\n';
|
154
149
|
}
|
150
|
+
trace << desc;
|
155
151
|
}
|
156
152
|
|
157
153
|
//
|
@@ -1,14 +1,14 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
|
10
|
-
#ifndef
|
11
|
-
#define
|
10
|
+
#ifndef ICESSL_TRUST_MANAGER_H
|
11
|
+
#define ICESSL_TRUST_MANAGER_H
|
12
12
|
|
13
13
|
#include <Ice/CommunicatorF.h>
|
14
14
|
#include <IceSSL/TrustManagerF.h>
|
@@ -25,7 +25,7 @@ public:
|
|
25
25
|
|
26
26
|
TrustManager(const Ice::CommunicatorPtr&);
|
27
27
|
|
28
|
-
bool verify(const
|
28
|
+
bool verify(const ConnectionInfoPtr&, const std::string&);
|
29
29
|
|
30
30
|
private:
|
31
31
|
|
@@ -1,14 +1,14 @@
|
|
1
1
|
// **********************************************************************
|
2
2
|
//
|
3
|
-
// Copyright (c) 2003-
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
4
|
//
|
5
5
|
// This copy of Ice is licensed to you under the terms described in the
|
6
6
|
// ICE_LICENSE file included in this distribution.
|
7
7
|
//
|
8
8
|
// **********************************************************************
|
9
9
|
|
10
|
-
#ifndef
|
11
|
-
#define
|
10
|
+
#ifndef ICESSL_TRUST_MANAGER_F_H
|
11
|
+
#define ICESSL_TRUST_MANAGER_F_H
|
12
12
|
|
13
13
|
#include <IceUtil/Shared.h>
|
14
14
|
|
@@ -0,0 +1,271 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
|
+
//
|
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
|
+
|
10
|
+
//
|
11
|
+
// UWP Certificate implementation
|
12
|
+
//
|
13
|
+
|
14
|
+
#include <IceSSL/UWP.h>
|
15
|
+
#include <IceSSL/CertificateI.h>
|
16
|
+
#include <IceSSL/Util.h>
|
17
|
+
|
18
|
+
#include <Ice/LocalException.h>
|
19
|
+
#include <Ice/StringConverter.h>
|
20
|
+
#include <Ice/Base64.h>
|
21
|
+
#include <Ice/StringUtil.h>
|
22
|
+
|
23
|
+
#include <ppltasks.h>
|
24
|
+
#include <nserror.h>
|
25
|
+
|
26
|
+
using namespace concurrency;
|
27
|
+
using namespace Platform;
|
28
|
+
using namespace Windows::Foundation;
|
29
|
+
using namespace Windows::Storage;
|
30
|
+
using namespace Windows::Storage::Streams;
|
31
|
+
using namespace Windows::Security::Cryptography;
|
32
|
+
|
33
|
+
using namespace Ice;
|
34
|
+
using namespace IceSSL;
|
35
|
+
|
36
|
+
using namespace std;
|
37
|
+
|
38
|
+
namespace
|
39
|
+
{
|
40
|
+
|
41
|
+
class UWPCertificateI : public UWP::Certificate,
|
42
|
+
public CertificateI
|
43
|
+
{
|
44
|
+
public:
|
45
|
+
|
46
|
+
UWPCertificateI(Windows::Security::Cryptography::Certificates::Certificate^);
|
47
|
+
|
48
|
+
virtual bool operator==(const IceSSL::Certificate&) const;
|
49
|
+
|
50
|
+
virtual vector<Ice::Byte> getAuthorityKeyIdentifier() const;
|
51
|
+
virtual vector<Ice::Byte> getSubjectKeyIdentifier() const;
|
52
|
+
virtual bool verify(const CertificatePtr&) const;
|
53
|
+
virtual string encode() const;
|
54
|
+
|
55
|
+
virtual chrono::system_clock::time_point getNotAfter() const;
|
56
|
+
virtual chrono::system_clock::time_point getNotBefore() const;
|
57
|
+
virtual string getSerialNumber() const;
|
58
|
+
virtual DistinguishedName getIssuerDN() const;
|
59
|
+
virtual vector<pair<int, string> > getIssuerAlternativeNames() const;
|
60
|
+
virtual DistinguishedName getSubjectDN() const;
|
61
|
+
virtual vector<pair<int, string> > getSubjectAlternativeNames() const;
|
62
|
+
virtual int getVersion() const;
|
63
|
+
virtual Windows::Security::Cryptography::Certificates::Certificate^ getCert() const;
|
64
|
+
|
65
|
+
private:
|
66
|
+
|
67
|
+
Windows::Security::Cryptography::Certificates::Certificate^ _cert;
|
68
|
+
};
|
69
|
+
|
70
|
+
const Ice::Long TICKS_PER_MSECOND = 10000LL;
|
71
|
+
const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
|
72
|
+
|
73
|
+
vector<pair<int, string> >
|
74
|
+
certificateAltNames(Windows::Security::Cryptography::Certificates::SubjectAlternativeNameInfo^ subAltNames)
|
75
|
+
{
|
76
|
+
vector<pair<int, string> > altNames;
|
77
|
+
if(subAltNames)
|
78
|
+
{
|
79
|
+
for(auto iter = subAltNames->EmailName->First(); iter->HasCurrent; iter->MoveNext())
|
80
|
+
{
|
81
|
+
altNames.push_back(make_pair(AltNameEmail, wstringToString(iter->Current->Data())));
|
82
|
+
}
|
83
|
+
for(auto iter = subAltNames->DnsName->First(); iter->HasCurrent; iter->MoveNext())
|
84
|
+
{
|
85
|
+
altNames.push_back(make_pair(AltNameDNS, wstringToString(iter->Current->Data())));
|
86
|
+
}
|
87
|
+
for(auto iter = subAltNames->Url->First(); iter->HasCurrent; iter->MoveNext())
|
88
|
+
{
|
89
|
+
altNames.push_back(make_pair(AltNameURL, wstringToString(iter->Current->Data())));
|
90
|
+
}
|
91
|
+
for(auto iter = subAltNames->IPAddress->First(); iter->HasCurrent; iter->MoveNext())
|
92
|
+
{
|
93
|
+
altNames.push_back(make_pair(AltNAmeIP, wstringToString(iter->Current->Data())));
|
94
|
+
}
|
95
|
+
}
|
96
|
+
return altNames;
|
97
|
+
}
|
98
|
+
|
99
|
+
} // end anonymous namespace
|
100
|
+
|
101
|
+
UWPCertificateI::UWPCertificateI(Windows::Security::Cryptography::Certificates::Certificate^ cert) : _cert(cert)
|
102
|
+
{
|
103
|
+
if(!_cert)
|
104
|
+
{
|
105
|
+
throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference");
|
106
|
+
}
|
107
|
+
}
|
108
|
+
|
109
|
+
bool
|
110
|
+
UWPCertificateI::operator==(const IceSSL::Certificate& r) const
|
111
|
+
{
|
112
|
+
const UWPCertificateI* p = dynamic_cast<const UWPCertificateI*>(&r);
|
113
|
+
if(!p)
|
114
|
+
{
|
115
|
+
return false;
|
116
|
+
}
|
117
|
+
|
118
|
+
return CryptographicBuffer::Compare(_cert->GetCertificateBlob(), p->_cert->GetCertificateBlob());
|
119
|
+
}
|
120
|
+
|
121
|
+
vector<Ice::Byte>
|
122
|
+
UWPCertificateI::getAuthorityKeyIdentifier() const
|
123
|
+
{
|
124
|
+
throw FeatureNotSupportedException(__FILE__, __LINE__);
|
125
|
+
}
|
126
|
+
|
127
|
+
vector<Ice::Byte>
|
128
|
+
UWPCertificateI::getSubjectKeyIdentifier() const
|
129
|
+
{
|
130
|
+
throw FeatureNotSupportedException(__FILE__, __LINE__);
|
131
|
+
}
|
132
|
+
|
133
|
+
bool
|
134
|
+
UWPCertificateI::verify(const CertificatePtr&) const
|
135
|
+
{
|
136
|
+
throw FeatureNotSupportedException(__FILE__, __LINE__);
|
137
|
+
}
|
138
|
+
|
139
|
+
string
|
140
|
+
UWPCertificateI::encode() const
|
141
|
+
{
|
142
|
+
auto reader = Windows::Storage::Streams::DataReader::FromBuffer(_cert->GetCertificateBlob());
|
143
|
+
std::vector<unsigned char> data(reader->UnconsumedBufferLength);
|
144
|
+
if(!data.empty())
|
145
|
+
{
|
146
|
+
reader->ReadBytes(Platform::ArrayReference<unsigned char>(&data[0], static_cast<unsigned int>(data.size())));
|
147
|
+
}
|
148
|
+
ostringstream os;
|
149
|
+
os << "-----BEGIN CERTIFICATE-----\n";
|
150
|
+
os << IceInternal::Base64::encode(data);
|
151
|
+
os << "-----END CERTIFICATE-----\n";
|
152
|
+
return os.str();
|
153
|
+
}
|
154
|
+
|
155
|
+
chrono::system_clock::time_point
|
156
|
+
UWPCertificateI::getNotAfter() const
|
157
|
+
{
|
158
|
+
// Convert 100ns time from January 1, 1601 to ms from January 1, 1970
|
159
|
+
return chrono::system_clock::time_point(
|
160
|
+
chrono::milliseconds(_cert->ValidTo.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH));
|
161
|
+
}
|
162
|
+
|
163
|
+
chrono::system_clock::time_point
|
164
|
+
UWPCertificateI::getNotBefore() const
|
165
|
+
{
|
166
|
+
// Convert 100ns time from January 1, 1601 to ms from January 1, 1970
|
167
|
+
return chrono::system_clock::time_point(
|
168
|
+
chrono::milliseconds(_cert->ValidFrom.UniversalTime / TICKS_PER_MSECOND - MSECS_TO_EPOCH));
|
169
|
+
}
|
170
|
+
|
171
|
+
string
|
172
|
+
UWPCertificateI::getSerialNumber() const
|
173
|
+
{
|
174
|
+
ostringstream os;
|
175
|
+
os.fill(0);
|
176
|
+
os.width(2);
|
177
|
+
for(unsigned int i = 0; i < _cert->SerialNumber->Length; i++)
|
178
|
+
{
|
179
|
+
os << hex << static_cast<int>(_cert->SerialNumber[i]);
|
180
|
+
}
|
181
|
+
return IceUtilInternal::toUpper(os.str());
|
182
|
+
}
|
183
|
+
|
184
|
+
DistinguishedName
|
185
|
+
UWPCertificateI::getIssuerDN() const
|
186
|
+
{
|
187
|
+
return DistinguishedName("CN=" + wstringToString(_cert->Issuer->Data()));
|
188
|
+
}
|
189
|
+
|
190
|
+
vector<pair<int, string> >
|
191
|
+
UWPCertificateI::getIssuerAlternativeNames() const
|
192
|
+
{
|
193
|
+
throw FeatureNotSupportedException(__FILE__, __LINE__);
|
194
|
+
}
|
195
|
+
|
196
|
+
DistinguishedName
|
197
|
+
UWPCertificateI::getSubjectDN() const
|
198
|
+
{
|
199
|
+
return DistinguishedName("CN=" + wstringToString(_cert->Subject->Data()));
|
200
|
+
}
|
201
|
+
|
202
|
+
vector<pair<int, string> >
|
203
|
+
UWPCertificateI::getSubjectAlternativeNames() const
|
204
|
+
{
|
205
|
+
return certificateAltNames(_cert->SubjectAlternativeName);
|
206
|
+
}
|
207
|
+
|
208
|
+
int
|
209
|
+
UWPCertificateI::getVersion() const
|
210
|
+
{
|
211
|
+
throw FeatureNotSupportedException(__FILE__, __LINE__);
|
212
|
+
}
|
213
|
+
|
214
|
+
Windows::Security::Cryptography::Certificates::Certificate^
|
215
|
+
UWPCertificateI::getCert() const
|
216
|
+
{
|
217
|
+
return _cert;
|
218
|
+
}
|
219
|
+
|
220
|
+
UWP::CertificatePtr
|
221
|
+
UWP::Certificate::create(Windows::Security::Cryptography::Certificates::Certificate^ cert)
|
222
|
+
{
|
223
|
+
return ICE_MAKE_SHARED(UWPCertificateI, cert);
|
224
|
+
}
|
225
|
+
|
226
|
+
UWP::CertificatePtr
|
227
|
+
UWP::Certificate::load(const std::string& file)
|
228
|
+
{
|
229
|
+
try
|
230
|
+
{
|
231
|
+
auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
|
232
|
+
auto file = create_task(StorageFile::GetFileFromApplicationUriAsync(uri)).get();
|
233
|
+
auto buffer = create_task(FileIO::ReadTextAsync(file)).get();
|
234
|
+
return UWP::Certificate::decode(wstringToString(buffer->Data()));
|
235
|
+
}
|
236
|
+
catch(Platform::Exception^ ex)
|
237
|
+
{
|
238
|
+
if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
|
239
|
+
{
|
240
|
+
throw CertificateReadException(__FILE__, __LINE__, "error opening file :" + file);
|
241
|
+
}
|
242
|
+
else
|
243
|
+
{
|
244
|
+
throw Ice::SyscallException(__FILE__, __LINE__, ex->HResult);
|
245
|
+
}
|
246
|
+
}
|
247
|
+
}
|
248
|
+
|
249
|
+
UWP::CertificatePtr
|
250
|
+
UWP::Certificate::decode(const std::string& encoding)
|
251
|
+
{
|
252
|
+
string::size_type size, startpos, endpos = 0;
|
253
|
+
startpos = encoding.find("-----BEGIN CERTIFICATE-----", endpos);
|
254
|
+
if (startpos != string::npos)
|
255
|
+
{
|
256
|
+
startpos += sizeof("-----BEGIN CERTIFICATE-----");
|
257
|
+
endpos = encoding.find("-----END CERTIFICATE-----", startpos);
|
258
|
+
size = endpos - startpos;
|
259
|
+
}
|
260
|
+
else
|
261
|
+
{
|
262
|
+
startpos = 0;
|
263
|
+
endpos = string::npos;
|
264
|
+
size = encoding.size();
|
265
|
+
}
|
266
|
+
|
267
|
+
vector<unsigned char> data(IceInternal::Base64::decode(string(&encoding[startpos], size)));
|
268
|
+
auto writer = ref new DataWriter();
|
269
|
+
writer->WriteBytes(Platform::ArrayReference<unsigned char>(&data[0], static_cast<unsigned int>(data.size())));
|
270
|
+
return make_shared<UWPCertificateI>(ref new Certificates::Certificate(writer->DetachBuffer()));
|
271
|
+
}
|
@@ -0,0 +1,343 @@
|
|
1
|
+
// **********************************************************************
|
2
|
+
//
|
3
|
+
// Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
|
4
|
+
//
|
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
|
+
|
10
|
+
#include <IceSSL/Config.h>
|
11
|
+
|
12
|
+
#include <IceSSL/UWPEngineF.h>
|
13
|
+
#include <IceSSL/UWPEngine.h>
|
14
|
+
#include <IceSSL/UWPTransceiverI.h>
|
15
|
+
#include <IceSSL/Util.h>
|
16
|
+
|
17
|
+
#include <Ice/Communicator.h>
|
18
|
+
#include <Ice/StringConverter.h>
|
19
|
+
#include <Ice/StringUtil.h>
|
20
|
+
#include <Ice/Properties.h>
|
21
|
+
#include <Ice/Network.h>
|
22
|
+
#include <IceUtil/Shared.h>
|
23
|
+
|
24
|
+
#include <string>
|
25
|
+
|
26
|
+
using namespace std;
|
27
|
+
using namespace Ice;
|
28
|
+
using namespace IceUtil;
|
29
|
+
using namespace IceSSL;
|
30
|
+
|
31
|
+
using namespace concurrency;
|
32
|
+
using namespace Platform;
|
33
|
+
using namespace Windows::Foundation;
|
34
|
+
using namespace Windows::Foundation::Collections;
|
35
|
+
using namespace Windows::Storage;
|
36
|
+
using namespace Windows::Storage::Streams;
|
37
|
+
using namespace Windows::Security::Cryptography;
|
38
|
+
using namespace Windows::Security::Cryptography::Core;
|
39
|
+
using namespace Windows::Security::Cryptography::Certificates;
|
40
|
+
|
41
|
+
IceUtil::Shared* UWP::upCast(UWP::SSLEngine* p) { return p; }
|
42
|
+
|
43
|
+
namespace
|
44
|
+
{
|
45
|
+
|
46
|
+
//
|
47
|
+
// Find a certificate in the Application Personal certificate store
|
48
|
+
// with the given friendly name. Returns the matching certificate or
|
49
|
+
// nullptr if none is found.
|
50
|
+
//
|
51
|
+
Certificates::Certificate^
|
52
|
+
findPersonalCertificate(String^ friendlyName)
|
53
|
+
{
|
54
|
+
CertificateQuery^ query = ref new CertificateQuery();
|
55
|
+
query->IncludeDuplicates = true;
|
56
|
+
query->IncludeExpiredCertificates = true;
|
57
|
+
query->FriendlyName = friendlyName;
|
58
|
+
query->StoreName = StandardCertificateStoreNames::Personal;
|
59
|
+
|
60
|
+
try
|
61
|
+
{
|
62
|
+
auto certificates = IceInternal::runSync(CertificateStores::FindAllAsync(query));
|
63
|
+
return certificates->Size > 0 ? certificates->GetAt(0) : nullptr;
|
64
|
+
}
|
65
|
+
catch(Platform::Exception^ ex)
|
66
|
+
{
|
67
|
+
throw PluginInitializationException(__FILE__, __LINE__,
|
68
|
+
"IceSSL: certificate error:\n" + wstringToString(ex->Message->Data()));
|
69
|
+
}
|
70
|
+
}
|
71
|
+
|
72
|
+
//
|
73
|
+
// Import a certificate in the Application Personal certificate store
|
74
|
+
// with the given friendly name. Returns true if there was a password
|
75
|
+
// error and false otherwise. If the import fails because a different
|
76
|
+
// error PluginInitializationException exception is throw.
|
77
|
+
//
|
78
|
+
bool
|
79
|
+
importPfxData(String^ friendlyName, String^ data, String^ password)
|
80
|
+
{
|
81
|
+
try
|
82
|
+
{
|
83
|
+
IceInternal::runSync(CertificateEnrollmentManager::ImportPfxDataAsync(
|
84
|
+
data,
|
85
|
+
password,
|
86
|
+
ExportOption::NotExportable,
|
87
|
+
KeyProtectionLevel::NoConsent,
|
88
|
+
InstallOptions::None,
|
89
|
+
friendlyName));
|
90
|
+
return false; // The import succcess
|
91
|
+
}
|
92
|
+
catch(Platform::Exception^ ex)
|
93
|
+
{
|
94
|
+
if(HRESULT_CODE(ex->HResult) == ERROR_DECRYPTION_FAILED)
|
95
|
+
{
|
96
|
+
return true; // Password error
|
97
|
+
}
|
98
|
+
else
|
99
|
+
{
|
100
|
+
throw PluginInitializationException(__FILE__, __LINE__,
|
101
|
+
"IceSSL: certificate error:\n" + wstringToString(ex->Message->Data()));
|
102
|
+
}
|
103
|
+
}
|
104
|
+
}
|
105
|
+
|
106
|
+
Certificates::Certificate^
|
107
|
+
importPersonalCertificate(const string& file, function<string ()> password, bool passwordPrompt,
|
108
|
+
int passwordRetryMax)
|
109
|
+
{
|
110
|
+
auto uri = ref new Uri(ref new String(stringToWstring(file).c_str()));
|
111
|
+
try
|
112
|
+
{
|
113
|
+
auto file = IceInternal::runSync(StorageFile::GetFileFromApplicationUriAsync(uri));
|
114
|
+
auto buffer = IceInternal::runSync(FileIO::ReadBufferAsync(file));
|
115
|
+
|
116
|
+
//
|
117
|
+
// Create a hash of the certificate to use as a friendly name, this will allow us
|
118
|
+
// to uniquely identify the certificate in the store.
|
119
|
+
//
|
120
|
+
auto hasher = HashAlgorithmProvider::OpenAlgorithm(HashAlgorithmNames::Sha1);
|
121
|
+
auto hash = hasher->CreateHash();
|
122
|
+
|
123
|
+
hash->Append(buffer);
|
124
|
+
String^ friendlyName = CryptographicBuffer::EncodeToBase64String(hash->GetValueAndReset());
|
125
|
+
|
126
|
+
//
|
127
|
+
// If the certificate is already in the store we avoid importing it.
|
128
|
+
//
|
129
|
+
Certificates::Certificate^ cert = findPersonalCertificate(friendlyName);
|
130
|
+
if(cert)
|
131
|
+
{
|
132
|
+
return cert;
|
133
|
+
}
|
134
|
+
else
|
135
|
+
{
|
136
|
+
String^ data = CryptographicBuffer::EncodeToBase64String(buffer);
|
137
|
+
int count = 0;
|
138
|
+
bool passwordErr = false;
|
139
|
+
do
|
140
|
+
{
|
141
|
+
passwordErr = importPfxData(friendlyName, data,
|
142
|
+
ref new String(stringToWstring(password()).c_str()));
|
143
|
+
}
|
144
|
+
while(passwordPrompt && passwordErr && ++count < passwordRetryMax);
|
145
|
+
if(passwordErr)
|
146
|
+
{
|
147
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: error decoding certificate");
|
148
|
+
}
|
149
|
+
return findPersonalCertificate(friendlyName);
|
150
|
+
}
|
151
|
+
}
|
152
|
+
catch(Platform::Exception^ ex)
|
153
|
+
{
|
154
|
+
if(HRESULT_CODE(ex->HResult) == ERROR_FILE_NOT_FOUND)
|
155
|
+
{
|
156
|
+
throw PluginInitializationException(__FILE__, __LINE__, "certificate file not found:\n" + file);
|
157
|
+
}
|
158
|
+
else
|
159
|
+
{
|
160
|
+
throw PluginInitializationException(__FILE__, __LINE__,
|
161
|
+
"IceSSL: certificate error:\n" + wstringToString(ex->Message->Data()));
|
162
|
+
}
|
163
|
+
}
|
164
|
+
}
|
165
|
+
|
166
|
+
IVectorView<Certificates::Certificate^>^
|
167
|
+
findCertificates(const string& name, const string& value)
|
168
|
+
{
|
169
|
+
CertificateQuery^ query = ref new CertificateQuery();
|
170
|
+
query->StoreName = ref new String(stringToWstring(name).c_str());
|
171
|
+
query->IncludeDuplicates = true;
|
172
|
+
query->IncludeExpiredCertificates = true;
|
173
|
+
|
174
|
+
if(value != "*")
|
175
|
+
{
|
176
|
+
if(value.find(':', 0) == string::npos)
|
177
|
+
{
|
178
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: no key in `" + value + "'");
|
179
|
+
}
|
180
|
+
size_t start = 0;
|
181
|
+
size_t pos;
|
182
|
+
while((pos = value.find(':', start)) != string::npos)
|
183
|
+
{
|
184
|
+
string field = IceUtilInternal::toUpper(IceUtilInternal::trim(value.substr(start, pos - start)));
|
185
|
+
if(field != "ISSUER" && field != "THUMBPRINT" && field != "FRIENDLYNAME")
|
186
|
+
{
|
187
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unknown key in `" + value + "'");
|
188
|
+
}
|
189
|
+
|
190
|
+
start = pos + 1;
|
191
|
+
while(start < value.size() && (value[start] == ' ' || value[start] == '\t'))
|
192
|
+
{
|
193
|
+
++start;
|
194
|
+
}
|
195
|
+
|
196
|
+
if(start == value.size())
|
197
|
+
{
|
198
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: missing argument in `" + value + "'");
|
199
|
+
}
|
200
|
+
|
201
|
+
string arg;
|
202
|
+
if(value[start] == '"' || value[start] == '\'')
|
203
|
+
{
|
204
|
+
size_t end = start;
|
205
|
+
++end;
|
206
|
+
while(end < value.size())
|
207
|
+
{
|
208
|
+
if(value[end] == value[start] && value[end - 1] != '\\')
|
209
|
+
{
|
210
|
+
break;
|
211
|
+
}
|
212
|
+
++end;
|
213
|
+
}
|
214
|
+
if(end == value.size() || value[end] != value[start])
|
215
|
+
{
|
216
|
+
throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: unmatched quote in `" + value + "'");
|
217
|
+
}
|
218
|
+
++start;
|
219
|
+
arg = value.substr(start, end - start);
|
220
|
+
start = end + 1;
|
221
|
+
}
|
222
|
+
else
|
223
|
+
{
|
224
|
+
size_t end = value.find_first_of(" \t", start);
|
225
|
+
if(end == string::npos)
|
226
|
+
{
|
227
|
+
arg = value.substr(start);
|
228
|
+
start = value.size();
|
229
|
+
}
|
230
|
+
else
|
231
|
+
{
|
232
|
+
arg = value.substr(start, end - start);
|
233
|
+
start = end + 1;
|
234
|
+
}
|
235
|
+
}
|
236
|
+
|
237
|
+
if(field == "ISSUER")
|
238
|
+
{
|
239
|
+
query->IssuerName = ref new String(stringToWstring(arg).c_str());
|
240
|
+
}
|
241
|
+
else if(field == "FRIENDLYNAME")
|
242
|
+
{
|
243
|
+
query->FriendlyName = ref new String(stringToWstring(arg).c_str());
|
244
|
+
}
|
245
|
+
else if(field == "THUMBPRINT")
|
246
|
+
{
|
247
|
+
vector<BYTE> buffer;
|
248
|
+
if(!parseBytes(arg, buffer))
|
249
|
+
{
|
250
|
+
throw PluginInitializationException(__FILE__, __LINE__,
|
251
|
+
"IceSSL: invalid `IceSSL.FindCert' property: can't decode the value");
|
252
|
+
}
|
253
|
+
query->Thumbprint = ref new Array<unsigned char>(&buffer[0], static_cast<unsigned int>(buffer.size()));
|
254
|
+
}
|
255
|
+
}
|
256
|
+
}
|
257
|
+
|
258
|
+
try
|
259
|
+
{
|
260
|
+
return IceInternal::runSync(CertificateStores::FindAllAsync(query));
|
261
|
+
}
|
262
|
+
catch(Platform::Exception^ ex)
|
263
|
+
{
|
264
|
+
throw PluginInitializationException(__FILE__, __LINE__,
|
265
|
+
"IceSSL: certificate error:\n" + wstringToString(ex->Message->Data()));
|
266
|
+
}
|
267
|
+
}
|
268
|
+
|
269
|
+
} // anonymous namespace end
|
270
|
+
|
271
|
+
UWP::SSLEngine::SSLEngine(const Ice::CommunicatorPtr& communicator) : IceSSL::SSLEngine(communicator)
|
272
|
+
{
|
273
|
+
}
|
274
|
+
|
275
|
+
void
|
276
|
+
UWP::SSLEngine::initialize()
|
277
|
+
{
|
278
|
+
Mutex::Lock lock(_mutex);
|
279
|
+
if(_initialized)
|
280
|
+
{
|
281
|
+
return;
|
282
|
+
}
|
283
|
+
|
284
|
+
IceSSL::SSLEngine::initialize();
|
285
|
+
|
286
|
+
const auto properties = communicator()->getProperties();
|
287
|
+
|
288
|
+
//
|
289
|
+
// Load client certificate
|
290
|
+
//
|
291
|
+
const int passwordRetryMax = properties->getPropertyAsIntWithDefault("IceSSL.PasswordRetryMax", 3);
|
292
|
+
setPassword(properties->getProperty("IceSSL.Password"));
|
293
|
+
|
294
|
+
string certFile = properties->getProperty("IceSSL.CertFile");
|
295
|
+
string findCert = properties->getProperty("IceSSL.FindCert");
|
296
|
+
if(!certFile.empty())
|
297
|
+
{
|
298
|
+
_certificate = dynamic_pointer_cast<UWP::Certificate>(UWP::Certificate::create(importPersonalCertificate(
|
299
|
+
certFile,
|
300
|
+
[this]()
|
301
|
+
{
|
302
|
+
return password(false);
|
303
|
+
},
|
304
|
+
getPasswordPrompt() != nullptr,
|
305
|
+
passwordRetryMax)));
|
306
|
+
}
|
307
|
+
else if(!findCert.empty())
|
308
|
+
{
|
309
|
+
auto certs = findCertificates(properties->getPropertyWithDefault("IceSSL.CertStore", "My"), findCert);
|
310
|
+
if(certs->Size == 0)
|
311
|
+
{
|
312
|
+
throw Ice::PluginInitializationException(__FILE__, __LINE__, "IceSSL: no certificates found");
|
313
|
+
}
|
314
|
+
_certificate = dynamic_pointer_cast<UWP::Certificate>(UWP::Certificate::create(certs->GetAt(0)));
|
315
|
+
}
|
316
|
+
_initialized = true;
|
317
|
+
}
|
318
|
+
|
319
|
+
bool
|
320
|
+
UWP::SSLEngine::initialized() const
|
321
|
+
{
|
322
|
+
return _initialized;
|
323
|
+
}
|
324
|
+
|
325
|
+
shared_ptr<UWP::Certificate>
|
326
|
+
UWP::SSLEngine::certificate()
|
327
|
+
{
|
328
|
+
return _certificate;
|
329
|
+
}
|
330
|
+
|
331
|
+
void
|
332
|
+
UWP::SSLEngine::destroy()
|
333
|
+
{
|
334
|
+
}
|
335
|
+
|
336
|
+
IceInternal::TransceiverPtr
|
337
|
+
UWP::SSLEngine::createTransceiver(const InstancePtr& instance,
|
338
|
+
const IceInternal::TransceiverPtr& delegate,
|
339
|
+
const string& hostOrAdapterName,
|
340
|
+
bool incoming)
|
341
|
+
{
|
342
|
+
return new UWP::TransceiverI(instance, delegate, hostOrAdapterName, incoming);
|
343
|
+
}
|