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.
Files changed (777) hide show
  1. checksums.yaml +5 -5
  2. data/ICE_LICENSE +17 -17
  3. data/LICENSE +12 -12
  4. data/bin/slice2rb +1 -6
  5. data/ext/Communicator.cpp +223 -61
  6. data/ext/Communicator.h +1 -6
  7. data/ext/Config.h +23 -7
  8. data/ext/Connection.cpp +108 -76
  9. data/ext/Connection.h +4 -6
  10. data/ext/Endpoint.cpp +16 -54
  11. data/ext/Endpoint.h +1 -6
  12. data/ext/ImplicitContext.cpp +1 -10
  13. data/ext/ImplicitContext.h +1 -6
  14. data/ext/Init.cpp +4 -6
  15. data/ext/Logger.cpp +1 -6
  16. data/ext/Logger.h +1 -6
  17. data/ext/Operation.cpp +38 -54
  18. data/ext/Operation.h +1 -6
  19. data/ext/Properties.cpp +3 -8
  20. data/ext/Properties.h +1 -6
  21. data/ext/Proxy.cpp +111 -70
  22. data/ext/Proxy.h +1 -6
  23. data/ext/Slice.cpp +5 -20
  24. data/ext/Slice.h +1 -6
  25. data/ext/Types.cpp +313 -224
  26. data/ext/Types.h +118 -71
  27. data/ext/Util.cpp +69 -36
  28. data/ext/Util.h +117 -42
  29. data/ext/ValueFactoryManager.cpp +440 -0
  30. data/ext/ValueFactoryManager.h +95 -0
  31. data/ext/extconf.rb +52 -48
  32. data/ext/ice/cpp/include/Ice/Application.h +275 -105
  33. data/ext/ice/cpp/include/Ice/AsyncResult.h +124 -337
  34. data/ext/ice/cpp/include/Ice/AsyncResultF.h +4 -7
  35. data/ext/ice/cpp/include/Ice/BatchRequestInterceptor.h +39 -16
  36. data/ext/ice/cpp/include/Ice/BatchRequestQueueF.h +1 -6
  37. data/ext/ice/cpp/include/Ice/Buffer.h +10 -15
  38. data/ext/ice/cpp/include/Ice/CommunicatorAsync.h +56 -17
  39. data/ext/ice/cpp/include/Ice/Comparable.h +205 -0
  40. data/ext/ice/cpp/include/Ice/Config.h +16 -39
  41. data/ext/ice/cpp/include/Ice/ConnectionAsync.h +203 -16
  42. data/ext/ice/cpp/include/Ice/ConnectionIF.h +7 -6
  43. data/ext/ice/cpp/include/Ice/ConsoleUtil.h +23 -0
  44. data/ext/ice/cpp/include/Ice/DefaultValueFactory.h +57 -0
  45. data/ext/ice/cpp/include/Ice/DispatchInterceptor.h +20 -12
  46. data/ext/ice/cpp/include/Ice/Dispatcher.h +35 -19
  47. data/ext/ice/cpp/include/Ice/DynamicLibrary.h +7 -10
  48. data/ext/ice/cpp/include/Ice/DynamicLibraryF.h +1 -6
  49. data/ext/ice/cpp/include/Ice/Exception.h +110 -63
  50. data/ext/ice/cpp/include/Ice/ExceptionHelpers.h +74 -0
  51. data/ext/ice/cpp/include/Ice/FactoryTable.h +22 -18
  52. data/ext/ice/cpp/include/Ice/FactoryTableInit.h +28 -31
  53. data/ext/ice/cpp/include/Ice/Format.h +17 -18
  54. data/ext/ice/cpp/include/Ice/Functional.h +38 -38
  55. data/ext/ice/cpp/include/Ice/GCObject.h +9 -10
  56. data/ext/ice/cpp/include/Ice/Handle.h +6 -16
  57. data/ext/ice/cpp/include/Ice/Ice.h +9 -10
  58. data/ext/ice/cpp/include/Ice/IconvStringConverter.h +377 -0
  59. data/ext/ice/cpp/include/Ice/Incoming.h +132 -38
  60. data/ext/ice/cpp/include/Ice/IncomingAsync.h +109 -31
  61. data/ext/ice/cpp/include/Ice/IncomingAsyncF.h +7 -6
  62. data/ext/ice/cpp/include/Ice/Initialize.h +872 -60
  63. data/ext/ice/cpp/include/Ice/InputStream.h +1514 -0
  64. data/ext/ice/cpp/include/Ice/InstanceF.h +1 -7
  65. data/ext/ice/cpp/include/Ice/InterfaceByValue.h +57 -0
  66. data/ext/ice/cpp/include/Ice/LocalObject.h +13 -14
  67. data/ext/ice/cpp/include/Ice/LocalObjectF.h +1 -6
  68. data/ext/ice/cpp/include/Ice/LoggerUtil.h +56 -24
  69. data/ext/ice/cpp/include/Ice/MetricsAdminI.h +124 -71
  70. data/ext/ice/cpp/include/Ice/MetricsFunctional.h +25 -10
  71. data/ext/ice/cpp/include/Ice/MetricsObserverI.h +116 -32
  72. data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.h +61 -30
  73. data/ext/ice/cpp/include/Ice/Object.h +413 -78
  74. data/ext/ice/cpp/include/Ice/ObjectF.h +12 -8
  75. data/ext/ice/cpp/include/Ice/ObserverHelper.h +18 -13
  76. data/ext/ice/cpp/include/Ice/Optional.h +1114 -0
  77. data/ext/ice/cpp/include/Ice/OutgoingAsync.h +684 -89
  78. data/ext/ice/cpp/include/Ice/OutgoingAsyncF.h +12 -11
  79. data/ext/ice/cpp/include/Ice/OutputStream.h +1092 -0
  80. data/ext/ice/cpp/include/Ice/Protocol.h +49 -17
  81. data/ext/ice/cpp/include/Ice/Proxy.h +3438 -745
  82. data/ext/ice/cpp/include/Ice/ProxyF.h +13 -38
  83. data/ext/ice/cpp/include/Ice/ProxyFactoryF.h +1 -6
  84. data/ext/ice/cpp/include/Ice/ProxyHandle.h +43 -55
  85. data/ext/ice/cpp/include/Ice/ReferenceF.h +1 -6
  86. data/ext/ice/cpp/include/Ice/RegisterPlugins.h +84 -12
  87. data/ext/ice/cpp/include/Ice/RequestHandlerF.h +10 -9
  88. data/ext/ice/cpp/include/Ice/ResponseHandlerF.h +6 -6
  89. data/ext/ice/cpp/include/Ice/SHA1.h +42 -0
  90. data/ext/ice/cpp/include/Ice/ServantManagerF.h +1 -6
  91. data/ext/ice/cpp/include/Ice/Service.h +273 -154
  92. data/ext/ice/cpp/include/Ice/SliceChecksums.h +5 -6
  93. data/ext/ice/cpp/include/Ice/SlicedData.h +121 -53
  94. data/ext/ice/cpp/include/Ice/SlicedDataF.h +17 -11
  95. data/ext/ice/cpp/include/Ice/StreamHelpers.h +453 -140
  96. data/ext/ice/cpp/include/Ice/StringConverter.h +78 -0
  97. data/ext/ice/cpp/include/Ice/ThreadPoolF.h +1 -6
  98. data/ext/ice/cpp/include/Ice/UUID.h +19 -0
  99. data/ext/ice/cpp/include/{IceUtil → Ice}/UniquePtr.h +22 -28
  100. data/ext/ice/cpp/include/Ice/UniqueRef.h +97 -0
  101. data/ext/ice/cpp/include/Ice/UserExceptionFactory.h +45 -13
  102. data/ext/ice/cpp/include/Ice/Value.h +139 -0
  103. data/ext/ice/cpp/include/Ice/ValueF.h +21 -0
  104. data/ext/ice/cpp/include/IceSSL/Config.h +8 -28
  105. data/ext/ice/cpp/include/IceSSL/IceSSL.h +17 -11
  106. data/ext/ice/cpp/include/IceSSL/OpenSSL.h +147 -0
  107. data/ext/ice/cpp/include/IceSSL/Plugin.h +461 -448
  108. data/ext/ice/cpp/include/IceSSL/SChannel.h +72 -0
  109. data/ext/ice/cpp/include/IceSSL/SecureTransport.h +72 -0
  110. data/ext/ice/cpp/include/IceSSL/UWP.h +62 -0
  111. data/ext/ice/cpp/include/IceUtil/Atomic.h +7 -14
  112. data/ext/ice/cpp/include/IceUtil/Cond.h +17 -23
  113. data/ext/ice/cpp/include/IceUtil/Config.h +166 -46
  114. data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h +92 -0
  115. data/ext/ice/cpp/include/IceUtil/CountDownLatch.h +5 -10
  116. data/ext/ice/cpp/include/IceUtil/CtrlCHandler.h +63 -41
  117. data/ext/ice/cpp/include/IceUtil/DisableWarnings.h +5 -13
  118. data/ext/ice/cpp/include/IceUtil/Exception.h +284 -75
  119. data/ext/ice/cpp/include/IceUtil/FileUtil.h +143 -0
  120. data/ext/ice/cpp/include/IceUtil/Functional.h +4 -6
  121. data/ext/ice/cpp/include/IceUtil/Handle.h +11 -16
  122. data/ext/ice/cpp/include/IceUtil/IceUtil.h +4 -15
  123. data/ext/ice/cpp/include/IceUtil/InputUtil.h +3 -8
  124. data/ext/ice/cpp/include/IceUtil/Iterator.h +2 -7
  125. data/ext/ice/cpp/include/IceUtil/Lock.h +8 -15
  126. data/ext/ice/cpp/include/IceUtil/Monitor.h +1 -7
  127. data/ext/ice/cpp/include/IceUtil/Mutex.h +19 -23
  128. data/ext/ice/cpp/include/IceUtil/MutexProtocol.h +2 -7
  129. data/ext/ice/cpp/include/IceUtil/MutexPtrLock.h +4 -9
  130. data/ext/ice/cpp/include/IceUtil/MutexPtrTryLock.h +4 -9
  131. data/ext/ice/cpp/include/IceUtil/Optional.h +134 -23
  132. data/ext/ice/cpp/include/IceUtil/Options.h +17 -23
  133. data/ext/ice/cpp/include/IceUtil/OutputUtil.h +61 -37
  134. data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h +6 -11
  135. data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h +18 -15
  136. data/ext/ice/cpp/include/IceUtil/Random.h +39 -8
  137. data/ext/ice/cpp/include/IceUtil/RecMutex.h +7 -13
  138. data/ext/ice/cpp/include/IceUtil/ResourceConfig.h +53 -0
  139. data/ext/ice/cpp/include/IceUtil/ScannerConfig.h +10 -15
  140. data/ext/ice/cpp/include/IceUtil/ScopedArray.h +8 -7
  141. data/ext/ice/cpp/include/IceUtil/Shared.h +5 -12
  142. data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h +2 -7
  143. data/ext/ice/cpp/include/IceUtil/StringConverter.h +146 -126
  144. data/ext/ice/cpp/include/IceUtil/StringUtil.h +32 -26
  145. data/ext/ice/cpp/include/IceUtil/Thread.h +10 -17
  146. data/ext/ice/cpp/include/IceUtil/ThreadException.h +33 -47
  147. data/ext/ice/cpp/include/IceUtil/Time.h +3 -8
  148. data/ext/ice/cpp/include/IceUtil/Timer.h +18 -18
  149. data/ext/ice/cpp/include/IceUtil/UUID.h +6 -7
  150. data/ext/ice/cpp/include/IceUtil/UndefSysMacros.h +1 -6
  151. data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.h +170 -0
  152. data/ext/ice/cpp/include/generated/Ice/Communicator.h +1156 -0
  153. data/ext/ice/cpp/include/{Ice → generated/Ice}/CommunicatorF.h +51 -16
  154. data/ext/ice/cpp/include/generated/Ice/Connection.h +1660 -0
  155. data/ext/ice/cpp/include/generated/Ice/ConnectionF.h +119 -0
  156. data/ext/ice/cpp/include/generated/Ice/Current.h +322 -0
  157. data/ext/ice/cpp/include/generated/Ice/Endpoint.h +943 -0
  158. data/ext/ice/cpp/include/generated/Ice/EndpointF.h +166 -0
  159. data/ext/ice/cpp/include/generated/Ice/EndpointTypes.h +118 -0
  160. data/ext/ice/cpp/include/{Ice → generated/Ice}/FacetMap.h +31 -15
  161. data/ext/ice/cpp/include/generated/Ice/Identity.h +264 -0
  162. data/ext/ice/cpp/include/generated/Ice/ImplicitContext.h +278 -0
  163. data/ext/ice/cpp/include/{Ice → generated/Ice}/ImplicitContextF.h +51 -16
  164. data/ext/ice/cpp/include/generated/Ice/Instrumentation.h +1143 -0
  165. data/ext/ice/cpp/include/generated/Ice/InstrumentationF.h +128 -0
  166. data/ext/ice/cpp/include/generated/Ice/LocalException.h +7041 -0
  167. data/ext/ice/cpp/include/generated/Ice/Locator.h +3850 -0
  168. data/ext/ice/cpp/include/generated/Ice/LocatorF.h +147 -0
  169. data/ext/ice/cpp/include/generated/Ice/Logger.h +231 -0
  170. data/ext/ice/cpp/include/{Ice → generated/Ice}/LoggerF.h +51 -16
  171. data/ext/ice/cpp/include/generated/Ice/Metrics.h +4717 -0
  172. data/ext/ice/cpp/include/generated/Ice/ObjectAdapter.h +1175 -0
  173. data/ext/ice/cpp/include/{Ice → generated/Ice}/ObjectAdapterF.h +51 -16
  174. data/ext/ice/cpp/include/generated/Ice/ObjectFactory.h +197 -0
  175. data/ext/ice/cpp/include/generated/Ice/Plugin.h +306 -0
  176. data/ext/ice/cpp/include/generated/Ice/PluginF.h +110 -0
  177. data/ext/ice/cpp/include/generated/Ice/Process.h +971 -0
  178. data/ext/ice/cpp/include/generated/Ice/ProcessF.h +125 -0
  179. data/ext/ice/cpp/include/generated/Ice/Properties.h +446 -0
  180. data/ext/ice/cpp/include/generated/Ice/PropertiesAdmin.h +1360 -0
  181. data/ext/ice/cpp/include/generated/Ice/PropertiesF.h +134 -0
  182. data/ext/ice/cpp/include/generated/Ice/RemoteLogger.h +2689 -0
  183. data/ext/ice/cpp/include/generated/Ice/Router.h +1838 -0
  184. data/ext/ice/cpp/include/generated/Ice/RouterF.h +125 -0
  185. data/ext/ice/cpp/include/generated/Ice/ServantLocator.h +299 -0
  186. data/ext/ice/cpp/include/{Ice → generated/Ice}/ServantLocatorF.h +51 -16
  187. data/ext/ice/cpp/include/{Ice → generated/Ice}/SliceChecksumDict.h +34 -14
  188. data/ext/ice/cpp/include/generated/Ice/ValueFactory.h +318 -0
  189. data/ext/ice/cpp/include/generated/Ice/Version.h +357 -0
  190. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfo.h +223 -0
  191. data/ext/ice/cpp/include/generated/IceSSL/ConnectionInfoF.h +101 -0
  192. data/ext/ice/cpp/include/generated/IceSSL/EndpointInfo.h +181 -0
  193. data/ext/ice/cpp/src/Ice/ACM.cpp +38 -27
  194. data/ext/ice/cpp/src/Ice/ACM.h +9 -7
  195. data/ext/ice/cpp/src/Ice/ACMF.h +30 -0
  196. data/ext/ice/cpp/src/Ice/Acceptor.cpp +6 -6
  197. data/ext/ice/cpp/src/Ice/Acceptor.h +4 -8
  198. data/ext/ice/cpp/src/Ice/AcceptorF.h +1 -6
  199. data/ext/ice/cpp/src/Ice/ArgVector.cpp +59 -0
  200. data/ext/ice/cpp/src/Ice/ArgVector.h +36 -0
  201. data/ext/ice/cpp/src/Ice/AsyncResult.cpp +15 -544
  202. data/ext/ice/cpp/src/Ice/Base64.cpp +22 -28
  203. data/ext/ice/cpp/src/Ice/Base64.h +1 -6
  204. data/ext/ice/cpp/src/Ice/BatchRequestQueue.cpp +41 -18
  205. data/ext/ice/cpp/src/Ice/BatchRequestQueue.h +15 -15
  206. data/ext/ice/cpp/src/Ice/Buffer.cpp +75 -18
  207. data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp +21 -12
  208. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.cpp +86 -197
  209. data/ext/ice/cpp/src/Ice/CollocatedRequestHandler.h +17 -23
  210. data/ext/ice/cpp/src/Ice/Communicator.cpp +43 -15
  211. data/ext/ice/cpp/src/Ice/CommunicatorF.cpp +28 -11
  212. data/ext/ice/cpp/src/Ice/CommunicatorI.cpp +318 -117
  213. data/ext/ice/cpp/src/Ice/CommunicatorI.h +95 -40
  214. data/ext/ice/cpp/src/{IceUtil → Ice}/Cond.cpp +3 -8
  215. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.cpp +55 -122
  216. data/ext/ice/cpp/src/Ice/ConnectRequestHandler.h +15 -31
  217. data/ext/ice/cpp/src/Ice/ConnectRequestHandlerF.h +6 -7
  218. data/ext/ice/cpp/src/Ice/Connection.cpp +111 -20
  219. data/ext/ice/cpp/src/Ice/ConnectionF.cpp +28 -11
  220. data/ext/ice/cpp/src/Ice/ConnectionFactory.cpp +300 -107
  221. data/ext/ice/cpp/src/Ice/ConnectionFactory.h +44 -28
  222. data/ext/ice/cpp/src/Ice/ConnectionFactoryF.h +30 -0
  223. data/ext/ice/cpp/src/Ice/ConnectionI.cpp +785 -713
  224. data/ext/ice/cpp/src/Ice/ConnectionI.h +105 -80
  225. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.cpp +2 -20
  226. data/ext/ice/cpp/src/Ice/ConnectionRequestHandler.h +5 -9
  227. data/ext/ice/cpp/src/Ice/Connector.cpp +6 -6
  228. data/ext/ice/cpp/src/Ice/Connector.h +4 -8
  229. data/ext/ice/cpp/src/Ice/ConnectorF.h +1 -6
  230. data/ext/ice/cpp/src/{IceUtil → Ice}/CountDownLatch.cpp +4 -9
  231. data/ext/ice/cpp/src/Ice/Current.cpp +30 -12
  232. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.cpp +10 -16
  233. data/ext/ice/cpp/src/Ice/DefaultsAndOverrides.h +1 -6
  234. data/ext/ice/cpp/src/Ice/DefaultsAndOverridesF.h +1 -6
  235. data/ext/ice/cpp/src/Ice/DispatchInterceptor.cpp +13 -25
  236. data/ext/ice/cpp/src/Ice/DynamicLibrary.cpp +34 -28
  237. data/ext/ice/cpp/src/Ice/Endpoint.cpp +107 -19
  238. data/ext/ice/cpp/src/Ice/EndpointF.cpp +28 -11
  239. data/ext/ice/cpp/src/Ice/EndpointFactory.cpp +152 -6
  240. data/ext/ice/cpp/src/Ice/EndpointFactory.h +72 -11
  241. data/ext/ice/cpp/src/Ice/EndpointFactoryF.h +1 -6
  242. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.cpp +41 -36
  243. data/ext/ice/cpp/src/Ice/EndpointFactoryManager.h +10 -9
  244. data/ext/ice/cpp/src/Ice/EndpointFactoryManagerF.h +1 -6
  245. data/ext/ice/cpp/src/Ice/EndpointI.cpp +18 -7
  246. data/ext/ice/cpp/src/Ice/EndpointI.h +39 -18
  247. data/ext/ice/cpp/src/Ice/EndpointIF.h +18 -10
  248. data/ext/ice/cpp/src/Ice/EndpointTypes.cpp +19 -12
  249. data/ext/ice/cpp/src/Ice/EventHandler.cpp +6 -9
  250. data/ext/ice/cpp/src/Ice/EventHandler.h +13 -13
  251. data/ext/ice/cpp/src/Ice/EventHandlerF.h +5 -7
  252. data/ext/ice/cpp/src/Ice/Exception.cpp +102 -98
  253. data/ext/ice/cpp/src/Ice/FacetMap.cpp +21 -12
  254. data/ext/ice/cpp/src/Ice/FactoryTable.cpp +37 -33
  255. data/ext/ice/cpp/src/Ice/FactoryTableInit.cpp +2 -9
  256. data/ext/ice/cpp/src/Ice/GCObject.cpp +29 -31
  257. data/ext/ice/cpp/src/Ice/HashUtil.h +3 -9
  258. data/ext/ice/cpp/src/Ice/HttpParser.cpp +1 -7
  259. data/ext/ice/cpp/src/Ice/HttpParser.h +1 -6
  260. data/ext/ice/cpp/src/Ice/IPEndpointI.cpp +128 -111
  261. data/ext/ice/cpp/src/Ice/IPEndpointI.h +23 -19
  262. data/ext/ice/cpp/src/Ice/IPEndpointIF.h +6 -7
  263. data/ext/ice/cpp/src/Ice/IconvStringConverter.cpp +51 -0
  264. data/ext/ice/cpp/src/Ice/Identity.cpp +25 -16
  265. data/ext/ice/cpp/src/Ice/ImplicitContext.cpp +41 -13
  266. data/ext/ice/cpp/src/Ice/ImplicitContextF.cpp +28 -11
  267. data/ext/ice/cpp/src/Ice/ImplicitContextI.cpp +11 -28
  268. data/ext/ice/cpp/src/Ice/ImplicitContextI.h +7 -10
  269. data/ext/ice/cpp/src/Ice/Incoming.cpp +284 -255
  270. data/ext/ice/cpp/src/Ice/IncomingAsync.cpp +104 -214
  271. data/ext/ice/cpp/src/Ice/IncomingRequest.h +5 -9
  272. data/ext/ice/cpp/src/Ice/Initialize.cpp +309 -193
  273. data/ext/ice/cpp/src/Ice/InputStream.cpp +2726 -0
  274. data/ext/ice/cpp/src/Ice/Instance.cpp +243 -262
  275. data/ext/ice/cpp/src/Ice/Instance.h +30 -23
  276. data/ext/ice/cpp/src/Ice/Instrumentation.cpp +137 -23
  277. data/ext/ice/cpp/src/Ice/InstrumentationF.cpp +28 -11
  278. data/ext/ice/cpp/src/Ice/InstrumentationI.cpp +118 -105
  279. data/ext/ice/cpp/src/Ice/InstrumentationI.h +30 -36
  280. data/ext/ice/cpp/src/Ice/LocalException.cpp +1191 -422
  281. data/ext/ice/cpp/src/Ice/LocalObject.cpp +1 -7
  282. data/ext/ice/cpp/src/Ice/Locator.cpp +1282 -1222
  283. data/ext/ice/cpp/src/Ice/LocatorF.cpp +30 -12
  284. data/ext/ice/cpp/src/Ice/LocatorInfo.cpp +150 -186
  285. data/ext/ice/cpp/src/Ice/LocatorInfo.h +31 -36
  286. data/ext/ice/cpp/src/Ice/LocatorInfoF.h +1 -6
  287. data/ext/ice/cpp/src/Ice/Logger.cpp +39 -12
  288. data/ext/ice/cpp/src/Ice/LoggerAdminI.cpp +182 -88
  289. data/ext/ice/cpp/src/Ice/LoggerAdminI.h +4 -9
  290. data/ext/ice/cpp/src/Ice/LoggerF.cpp +28 -11
  291. data/ext/ice/cpp/src/Ice/LoggerI.cpp +26 -55
  292. data/ext/ice/cpp/src/Ice/LoggerI.h +7 -18
  293. data/ext/ice/cpp/src/Ice/LoggerUtil.cpp +10 -17
  294. data/ext/ice/cpp/src/Ice/Metrics.cpp +1280 -1107
  295. data/ext/ice/cpp/src/Ice/MetricsAdminI.cpp +58 -33
  296. data/ext/ice/cpp/src/Ice/MetricsObserverI.cpp +1 -7
  297. data/ext/ice/cpp/src/Ice/Network.cpp +753 -408
  298. data/ext/ice/cpp/src/Ice/Network.h +99 -36
  299. data/ext/ice/cpp/src/Ice/NetworkF.h +2 -7
  300. data/ext/ice/cpp/src/Ice/NetworkProxy.cpp +20 -19
  301. data/ext/ice/cpp/src/Ice/NetworkProxy.h +5 -7
  302. data/ext/ice/cpp/src/Ice/NetworkProxyF.h +1 -6
  303. data/ext/ice/cpp/src/Ice/OSLogLoggerI.cpp +57 -0
  304. data/ext/ice/cpp/src/Ice/OSLogLoggerI.h +40 -0
  305. data/ext/ice/cpp/src/Ice/Object.cpp +227 -232
  306. data/ext/ice/cpp/src/Ice/ObjectAdapter.cpp +45 -13
  307. data/ext/ice/cpp/src/Ice/ObjectAdapterF.cpp +28 -11
  308. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.cpp +83 -33
  309. data/ext/ice/cpp/src/Ice/ObjectAdapterFactory.h +13 -12
  310. data/ext/ice/cpp/src/Ice/ObjectAdapterFactoryF.h +25 -0
  311. data/ext/ice/cpp/src/Ice/ObjectAdapterI.cpp +298 -191
  312. data/ext/ice/cpp/src/Ice/ObjectAdapterI.h +44 -39
  313. data/ext/ice/cpp/src/Ice/ObjectFactory.cpp +41 -13
  314. data/ext/ice/cpp/src/Ice/ObserverHelper.cpp +9 -37
  315. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.cpp +67 -67
  316. data/ext/ice/cpp/src/Ice/OpaqueEndpointI.h +15 -11
  317. data/ext/ice/cpp/src/Ice/OutgoingAsync.cpp +801 -366
  318. data/ext/ice/cpp/src/Ice/OutputStream.cpp +1367 -0
  319. data/ext/ice/cpp/src/Ice/Plugin.cpp +52 -14
  320. data/ext/ice/cpp/src/Ice/PluginF.cpp +28 -11
  321. data/ext/ice/cpp/src/Ice/PluginManagerI.cpp +27 -51
  322. data/ext/ice/cpp/src/Ice/PluginManagerI.h +7 -13
  323. data/ext/ice/cpp/src/Ice/Process.cpp +294 -128
  324. data/ext/ice/cpp/src/Ice/ProcessF.cpp +30 -12
  325. data/ext/ice/cpp/src/Ice/Properties.cpp +42 -15
  326. data/ext/ice/cpp/src/Ice/PropertiesAdmin.cpp +382 -340
  327. data/ext/ice/cpp/src/Ice/PropertiesAdminI.cpp +83 -24
  328. data/ext/ice/cpp/src/Ice/PropertiesAdminI.h +29 -10
  329. data/ext/ice/cpp/src/Ice/PropertiesF.cpp +30 -12
  330. data/ext/ice/cpp/src/Ice/PropertiesI.cpp +46 -57
  331. data/ext/ice/cpp/src/Ice/PropertiesI.h +18 -26
  332. data/ext/ice/cpp/src/Ice/PropertyNames.cpp +112 -19
  333. data/ext/ice/cpp/src/Ice/PropertyNames.h +4 -7
  334. data/ext/ice/cpp/src/Ice/Protocol.cpp +6 -19
  335. data/ext/ice/cpp/src/Ice/ProtocolInstance.cpp +37 -7
  336. data/ext/ice/cpp/src/Ice/ProtocolInstance.h +9 -25
  337. data/ext/ice/cpp/src/Ice/ProtocolInstanceF.h +1 -6
  338. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.cpp +6 -6
  339. data/ext/ice/cpp/src/Ice/ProtocolPluginFacade.h +3 -6
  340. data/ext/ice/cpp/src/Ice/ProtocolPluginFacadeF.h +1 -6
  341. data/ext/ice/cpp/src/Ice/Proxy.cpp +729 -957
  342. data/ext/ice/cpp/src/Ice/ProxyFactory.cpp +33 -38
  343. data/ext/ice/cpp/src/Ice/ProxyFactory.h +16 -16
  344. data/ext/ice/cpp/src/Ice/Reference.cpp +190 -106
  345. data/ext/ice/cpp/src/Ice/Reference.h +39 -28
  346. data/ext/ice/cpp/src/Ice/ReferenceFactory.cpp +69 -118
  347. data/ext/ice/cpp/src/Ice/ReferenceFactory.h +12 -17
  348. data/ext/ice/cpp/src/Ice/ReferenceFactoryF.h +1 -6
  349. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.cpp +19 -9
  350. data/ext/ice/cpp/src/Ice/RegisterPluginsInit.h +1 -6
  351. data/ext/ice/cpp/src/Ice/RemoteLogger.cpp +766 -565
  352. data/ext/ice/cpp/src/Ice/ReplyStatus.h +1 -6
  353. data/ext/ice/cpp/src/Ice/RequestHandler.cpp +5 -8
  354. data/ext/ice/cpp/src/Ice/RequestHandler.h +10 -18
  355. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.cpp +10 -11
  356. data/ext/ice/cpp/src/Ice/RequestHandlerFactory.h +2 -7
  357. data/ext/ice/cpp/src/Ice/ResponseHandler.cpp +3 -11
  358. data/ext/ice/cpp/src/Ice/ResponseHandler.h +16 -12
  359. data/ext/ice/cpp/src/Ice/RetryQueue.cpp +12 -20
  360. data/ext/ice/cpp/src/Ice/RetryQueue.h +7 -11
  361. data/ext/ice/cpp/src/Ice/RetryQueueF.h +1 -6
  362. data/ext/ice/cpp/src/Ice/Router.cpp +614 -492
  363. data/ext/ice/cpp/src/Ice/RouterF.cpp +30 -12
  364. data/ext/ice/cpp/src/Ice/RouterInfo.cpp +93 -99
  365. data/ext/ice/cpp/src/Ice/RouterInfo.h +42 -38
  366. data/ext/ice/cpp/src/Ice/RouterInfoF.h +1 -6
  367. data/ext/ice/cpp/src/{IceUtil → Ice}/SHA1.cpp +23 -28
  368. data/ext/ice/cpp/src/Ice/Selector.cpp +948 -855
  369. data/ext/ice/cpp/src/Ice/Selector.h +100 -152
  370. data/ext/ice/cpp/src/Ice/ServantLocator.cpp +41 -13
  371. data/ext/ice/cpp/src/Ice/ServantLocatorF.cpp +28 -11
  372. data/ext/ice/cpp/src/Ice/ServantManager.cpp +24 -45
  373. data/ext/ice/cpp/src/Ice/ServantManager.h +1 -6
  374. data/ext/ice/cpp/src/Ice/SharedContext.h +2 -7
  375. data/ext/ice/cpp/src/Ice/SliceChecksumDict.cpp +21 -12
  376. data/ext/ice/cpp/src/Ice/SliceChecksums.cpp +2 -7
  377. data/ext/ice/cpp/src/Ice/SlicedData.cpp +72 -25
  378. data/ext/ice/cpp/src/Ice/StreamSocket.cpp +208 -76
  379. data/ext/ice/cpp/src/Ice/StreamSocket.h +13 -9
  380. data/ext/ice/cpp/src/Ice/StringConverterPlugin.cpp +57 -22
  381. data/ext/ice/cpp/src/Ice/StringUtil.h +30 -0
  382. data/ext/ice/cpp/src/Ice/SysLoggerI.cpp +6 -7
  383. data/ext/ice/cpp/src/Ice/SysLoggerI.h +2 -8
  384. data/ext/ice/cpp/src/Ice/SystemdJournalI.cpp +66 -0
  385. data/ext/ice/cpp/src/Ice/SystemdJournalI.h +39 -0
  386. data/ext/ice/cpp/src/Ice/TcpAcceptor.cpp +169 -49
  387. data/ext/ice/cpp/src/Ice/TcpAcceptor.h +12 -10
  388. data/ext/ice/cpp/src/Ice/TcpConnector.cpp +6 -12
  389. data/ext/ice/cpp/src/Ice/TcpConnector.h +1 -7
  390. data/ext/ice/cpp/src/Ice/TcpEndpointI.cpp +51 -46
  391. data/ext/ice/cpp/src/Ice/TcpEndpointI.h +12 -14
  392. data/ext/ice/cpp/src/Ice/TcpTransceiver.cpp +17 -32
  393. data/ext/ice/cpp/src/Ice/TcpTransceiver.h +7 -15
  394. data/ext/ice/cpp/src/{IceUtil → Ice}/Thread.cpp +41 -54
  395. data/ext/ice/cpp/src/Ice/ThreadPool.cpp +242 -274
  396. data/ext/ice/cpp/src/Ice/ThreadPool.h +46 -48
  397. data/ext/ice/cpp/src/{IceUtil → Ice}/Timer.cpp +38 -26
  398. data/ext/ice/cpp/src/Ice/TraceLevels.cpp +2 -7
  399. data/ext/ice/cpp/src/Ice/TraceLevels.h +1 -6
  400. data/ext/ice/cpp/src/Ice/TraceLevelsF.h +2 -7
  401. data/ext/ice/cpp/src/Ice/TraceUtil.cpp +53 -36
  402. data/ext/ice/cpp/src/Ice/TraceUtil.h +13 -11
  403. data/ext/ice/cpp/src/Ice/Transceiver.cpp +1 -7
  404. data/ext/ice/cpp/src/Ice/Transceiver.h +8 -12
  405. data/ext/ice/cpp/src/Ice/TransceiverF.h +3 -8
  406. data/ext/ice/cpp/src/Ice/UdpConnector.cpp +5 -13
  407. data/ext/ice/cpp/src/Ice/UdpConnector.h +1 -7
  408. data/ext/ice/cpp/src/Ice/UdpEndpointI.cpp +118 -60
  409. data/ext/ice/cpp/src/Ice/UdpEndpointI.h +13 -10
  410. data/ext/ice/cpp/src/Ice/UdpTransceiver.cpp +177 -236
  411. data/ext/ice/cpp/src/Ice/UdpTransceiver.h +15 -22
  412. data/ext/ice/cpp/src/Ice/Value.cpp +76 -0
  413. data/ext/ice/cpp/src/Ice/ValueFactory.cpp +83 -0
  414. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.cpp +61 -0
  415. data/ext/ice/cpp/src/Ice/ValueFactoryManagerI.h +37 -0
  416. data/ext/ice/cpp/src/Ice/Version.cpp +25 -20
  417. data/ext/ice/cpp/src/Ice/VirtualShared.h +38 -0
  418. data/ext/ice/cpp/src/Ice/WSAcceptor.cpp +3 -14
  419. data/ext/ice/cpp/src/Ice/WSAcceptor.h +3 -12
  420. data/ext/ice/cpp/src/Ice/WSConnector.cpp +5 -16
  421. data/ext/ice/cpp/src/Ice/WSConnector.h +3 -11
  422. data/ext/ice/cpp/src/Ice/WSEndpoint.cpp +188 -89
  423. data/ext/ice/cpp/src/Ice/WSEndpoint.h +22 -37
  424. data/ext/ice/cpp/src/Ice/WSTransceiver.cpp +65 -66
  425. data/ext/ice/cpp/src/Ice/WSTransceiver.h +7 -27
  426. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.cpp +596 -281
  427. data/ext/ice/cpp/src/IceDiscovery/IceDiscovery.h +1383 -543
  428. data/ext/ice/cpp/src/IceDiscovery/LocatorI.cpp +89 -32
  429. data/ext/ice/cpp/src/IceDiscovery/LocatorI.h +59 -28
  430. data/ext/ice/cpp/src/IceDiscovery/LookupI.cpp +315 -66
  431. data/ext/ice/cpp/src/IceDiscovery/LookupI.h +83 -41
  432. data/ext/ice/cpp/src/IceDiscovery/PluginI.cpp +57 -64
  433. data/ext/ice/cpp/src/IceDiscovery/PluginI.h +3 -8
  434. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.cpp +450 -172
  435. data/ext/ice/cpp/src/IceLocatorDiscovery/IceLocatorDiscovery.h +863 -406
  436. data/ext/ice/cpp/src/IceLocatorDiscovery/Plugin.h +47 -0
  437. data/ext/ice/cpp/src/IceLocatorDiscovery/PluginI.cpp +636 -144
  438. data/ext/ice/cpp/src/IceSSL/AcceptorI.cpp +20 -173
  439. data/ext/ice/cpp/src/IceSSL/AcceptorI.h +8 -22
  440. data/ext/ice/cpp/src/IceSSL/CertificateI.cpp +279 -0
  441. data/ext/ice/cpp/src/IceSSL/CertificateI.h +64 -0
  442. data/ext/ice/cpp/src/IceSSL/ConnectionInfo.cpp +42 -17
  443. data/ext/ice/cpp/src/IceSSL/ConnectionInfoF.cpp +61 -0
  444. data/ext/ice/cpp/src/IceSSL/ConnectorI.cpp +15 -64
  445. data/ext/ice/cpp/src/IceSSL/ConnectorI.h +6 -18
  446. data/ext/ice/cpp/src/IceSSL/EndpointI.cpp +207 -204
  447. data/ext/ice/cpp/src/IceSSL/EndpointI.h +43 -40
  448. data/ext/ice/cpp/src/IceSSL/EndpointInfo.cpp +42 -16
  449. data/ext/ice/cpp/src/IceSSL/Instance.cpp +1 -11
  450. data/ext/ice/cpp/src/IceSSL/Instance.h +7 -12
  451. data/ext/ice/cpp/src/IceSSL/InstanceF.h +11 -12
  452. data/ext/ice/cpp/src/IceSSL/OpenSSLCertificateI.cpp +583 -0
  453. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.cpp +134 -115
  454. data/ext/ice/cpp/src/IceSSL/OpenSSLEngine.h +59 -0
  455. data/ext/ice/cpp/src/IceSSL/OpenSSLEngineF.h +27 -0
  456. data/ext/ice/cpp/src/IceSSL/OpenSSLPluginI.cpp +127 -0
  457. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.cpp +477 -182
  458. data/ext/ice/cpp/src/IceSSL/OpenSSLTransceiverI.h +32 -26
  459. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.cpp +286 -0
  460. data/ext/ice/cpp/src/IceSSL/OpenSSLUtil.h +58 -0
  461. data/ext/ice/cpp/src/IceSSL/PluginI.cpp +71 -46
  462. data/ext/ice/cpp/src/IceSSL/PluginI.h +13 -23
  463. data/ext/ice/cpp/src/IceSSL/RFC2253.cpp +9 -60
  464. data/ext/ice/cpp/src/IceSSL/RFC2253.h +7 -12
  465. data/ext/ice/cpp/src/IceSSL/SChannelCertificateI.cpp +580 -0
  466. data/ext/ice/cpp/src/IceSSL/SChannelEngine.cpp +523 -74
  467. data/ext/ice/cpp/src/IceSSL/SChannelEngine.h +123 -0
  468. data/ext/ice/cpp/src/IceSSL/SChannelEngineF.h +31 -0
  469. data/ext/ice/cpp/src/IceSSL/SChannelPluginI.cpp +73 -0
  470. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.cpp +187 -221
  471. data/ext/ice/cpp/src/IceSSL/SChannelTransceiverI.h +24 -26
  472. data/ext/ice/cpp/src/IceSSL/SSLEngine.cpp +97 -94
  473. data/ext/ice/cpp/src/IceSSL/SSLEngine.h +26 -192
  474. data/ext/ice/cpp/src/IceSSL/SSLEngineF.h +4 -24
  475. data/ext/ice/cpp/src/IceSSL/SecureTransportCertificateI.cpp +868 -0
  476. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.cpp +69 -201
  477. data/ext/ice/cpp/src/IceSSL/SecureTransportEngine.h +59 -0
  478. data/ext/ice/cpp/src/IceSSL/SecureTransportEngineF.h +29 -0
  479. data/ext/ice/cpp/src/IceSSL/SecureTransportPluginI.cpp +75 -0
  480. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.cpp +174 -161
  481. data/ext/ice/cpp/src/IceSSL/SecureTransportTransceiverI.h +29 -33
  482. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.cpp +864 -0
  483. data/ext/ice/cpp/src/IceSSL/SecureTransportUtil.h +45 -0
  484. data/ext/ice/cpp/src/IceSSL/TrustManager.cpp +12 -22
  485. data/ext/ice/cpp/src/IceSSL/TrustManager.h +4 -9
  486. data/ext/ice/cpp/src/IceSSL/TrustManagerF.h +3 -8
  487. data/ext/ice/cpp/src/IceSSL/UWPCertificateI.cpp +266 -0
  488. data/ext/ice/cpp/src/IceSSL/UWPEngine.cpp +338 -0
  489. data/ext/ice/cpp/src/IceSSL/UWPEngine.h +41 -0
  490. data/ext/ice/cpp/src/IceSSL/UWPEngineF.h +26 -0
  491. data/ext/ice/cpp/src/IceSSL/UWPPluginI.cpp +89 -0
  492. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.cpp +383 -0
  493. data/ext/ice/cpp/src/IceSSL/UWPTransceiverI.h +71 -0
  494. data/ext/ice/cpp/src/IceSSL/Util.cpp +71 -1260
  495. data/ext/ice/cpp/src/IceSSL/Util.h +48 -142
  496. data/ext/ice/cpp/src/IceUtil/ConsoleUtil.cpp +157 -0
  497. data/ext/ice/cpp/src/IceUtil/ConvertUTF.cpp +22 -27
  498. data/ext/ice/cpp/src/IceUtil/ConvertUTF.h +34 -31
  499. data/ext/ice/cpp/src/IceUtil/CtrlCHandler.cpp +22 -36
  500. data/ext/ice/cpp/src/IceUtil/FileUtil.cpp +30 -126
  501. data/ext/ice/cpp/src/IceUtil/InputUtil.cpp +1 -6
  502. data/ext/ice/cpp/src/IceUtil/MutexProtocol.cpp +1 -6
  503. data/ext/ice/cpp/src/IceUtil/Options.cpp +20 -33
  504. data/ext/ice/cpp/src/IceUtil/OutputUtil.cpp +47 -21
  505. data/ext/ice/cpp/src/IceUtil/Random.cpp +15 -20
  506. data/ext/ice/cpp/src/IceUtil/RecMutex.cpp +4 -19
  507. data/ext/ice/cpp/src/IceUtil/Shared.cpp +8 -8
  508. data/ext/ice/cpp/src/IceUtil/StringConverter.cpp +501 -269
  509. data/ext/ice/cpp/src/IceUtil/StringUtil.cpp +582 -244
  510. data/ext/ice/cpp/src/IceUtil/ThreadException.cpp +37 -79
  511. data/ext/ice/cpp/src/IceUtil/Time.cpp +6 -11
  512. data/ext/ice/cpp/src/IceUtil/UUID.cpp +17 -22
  513. data/ext/ice/cpp/src/IceUtil/Unicode.cpp +97 -101
  514. data/ext/ice/cpp/src/IceUtil/Unicode.h +21 -40
  515. data/ext/ice/cpp/src/IceUtil/UtilException.cpp +839 -0
  516. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.cpp +894 -234
  517. data/ext/ice/cpp/src/Slice/CPlusPlusUtil.h +72 -0
  518. data/ext/ice/cpp/src/Slice/Checksum.cpp +2 -7
  519. data/ext/ice/cpp/src/Slice/Checksum.h +21 -0
  520. data/ext/ice/cpp/src/Slice/FileTracker.cpp +25 -83
  521. data/ext/ice/cpp/{include → src}/Slice/FileTracker.h +9 -14
  522. data/ext/ice/cpp/src/Slice/Grammar.cpp +1981 -1944
  523. data/ext/ice/cpp/src/Slice/Grammar.h +39 -19
  524. data/ext/ice/cpp/src/Slice/GrammarUtil.h +14 -20
  525. data/ext/ice/cpp/src/Slice/JavaUtil.cpp +2752 -1948
  526. data/ext/ice/cpp/src/Slice/JavaUtil.h +398 -0
  527. data/ext/ice/cpp/src/Slice/MD5.cpp +1 -6
  528. data/ext/ice/cpp/src/Slice/MD5.h +1 -6
  529. data/ext/ice/cpp/src/Slice/MD5I.cpp +8 -1
  530. data/ext/ice/cpp/src/Slice/MD5I.h +1 -1
  531. data/ext/ice/cpp/src/Slice/PHPUtil.cpp +17 -20
  532. data/ext/ice/cpp/src/Slice/PHPUtil.h +36 -0
  533. data/ext/ice/cpp/src/Slice/Parser.cpp +1190 -426
  534. data/ext/ice/cpp/{include → src}/Slice/Parser.h +143 -91
  535. data/ext/ice/cpp/src/Slice/Preprocessor.cpp +67 -36
  536. data/ext/ice/cpp/{include → src}/Slice/Preprocessor.h +8 -18
  537. data/ext/ice/cpp/src/Slice/Python.cpp +218 -111
  538. data/ext/ice/cpp/src/Slice/PythonUtil.cpp +787 -699
  539. data/ext/ice/cpp/src/Slice/PythonUtil.h +70 -0
  540. data/ext/ice/cpp/src/Slice/Ruby.cpp +42 -43
  541. data/ext/ice/cpp/src/Slice/RubyUtil.cpp +175 -445
  542. data/ext/ice/cpp/{include → src}/Slice/RubyUtil.h +6 -11
  543. data/ext/ice/cpp/src/Slice/Scanner.cpp +390 -399
  544. data/ext/ice/cpp/src/Slice/{Util.cpp → SliceUtil.cpp} +36 -69
  545. data/ext/ice/cpp/src/Slice/StringLiteralUtil.cpp +456 -0
  546. data/ext/ice/cpp/src/Slice/Util.h +50 -0
  547. data/ice.gemspec +2 -9
  548. data/lib/Glacier2.rb +1 -6
  549. data/lib/Glacier2/Metrics.rb +6 -50
  550. data/lib/Glacier2/PermissionsVerifier.rb +23 -99
  551. data/lib/Glacier2/PermissionsVerifierF.rb +2 -7
  552. data/lib/Glacier2/Router.rb +31 -78
  553. data/lib/Glacier2/RouterF.rb +2 -7
  554. data/lib/Glacier2/SSLInfo.rb +3 -11
  555. data/lib/Glacier2/Session.rb +87 -311
  556. data/lib/Ice.rb +84 -58
  557. data/lib/Ice/BuiltinSequences.rb +3 -8
  558. data/lib/Ice/Communicator.rb +54 -61
  559. data/lib/Ice/CommunicatorF.rb +2 -7
  560. data/lib/Ice/Connection.rb +152 -166
  561. data/lib/Ice/ConnectionF.rb +2 -7
  562. data/lib/Ice/Current.rb +3 -15
  563. data/lib/Ice/Endpoint.rb +56 -137
  564. data/lib/Ice/EndpointF.rb +2 -7
  565. data/lib/Ice/EndpointTypes.rb +2 -11
  566. data/lib/Ice/FacetMap.rb +3 -8
  567. data/lib/Ice/Identity.rb +4 -12
  568. data/lib/Ice/ImplicitContext.rb +4 -38
  569. data/lib/Ice/ImplicitContextF.rb +2 -7
  570. data/lib/Ice/Instrumentation.rb +22 -279
  571. data/lib/Ice/InstrumentationF.rb +2 -7
  572. data/lib/Ice/LocalException.rb +94 -145
  573. data/lib/Ice/Locator.rb +50 -169
  574. data/lib/Ice/LocatorF.rb +2 -7
  575. data/lib/Ice/Logger.rb +4 -38
  576. data/lib/Ice/LoggerF.rb +2 -7
  577. data/lib/Ice/Metrics.rb +60 -420
  578. data/lib/Ice/ObjectAdapter.rb +29 -0
  579. data/lib/Ice/ObjectAdapterF.rb +2 -7
  580. data/lib/Ice/ObjectFactory.rb +4 -34
  581. data/lib/Ice/Plugin.rb +6 -64
  582. data/lib/Ice/PluginF.rb +2 -7
  583. data/lib/Ice/Process.rb +15 -56
  584. data/lib/Ice/ProcessF.rb +2 -7
  585. data/lib/Ice/Properties.rb +4 -45
  586. data/lib/Ice/PropertiesAdmin.rb +18 -60
  587. data/lib/Ice/PropertiesF.rb +2 -7
  588. data/lib/Ice/RemoteLogger.rb +33 -119
  589. data/lib/Ice/Router.rb +28 -105
  590. data/lib/Ice/RouterF.rb +2 -7
  591. data/lib/Ice/ServantLocator.rb +26 -0
  592. data/lib/Ice/ServantLocatorF.rb +24 -0
  593. data/lib/Ice/SliceChecksumDict.rb +2 -7
  594. data/lib/Ice/ValueFactory.rb +28 -0
  595. data/lib/Ice/Version.rb +4 -15
  596. data/lib/IceBox.rb +1 -6
  597. data/lib/IceBox/IceBox.rb +43 -152
  598. data/lib/IceGrid.rb +1 -9
  599. data/lib/IceGrid/Admin.rb +550 -431
  600. data/lib/IceGrid/Descriptor.rb +61 -533
  601. data/lib/IceGrid/Exception.rb +23 -49
  602. data/lib/IceGrid/FileParser.rb +13 -54
  603. data/lib/IceGrid/PluginFacade.rb +35 -0
  604. data/lib/IceGrid/Registry.rb +150 -62
  605. data/lib/IceGrid/Session.rb +24 -68
  606. data/lib/IceGrid/UserAccountMapper.rb +13 -54
  607. data/lib/IcePatch2.rb +1 -6
  608. data/lib/IcePatch2/FileInfo.rb +4 -15
  609. data/lib/IcePatch2/FileServer.rb +32 -80
  610. data/lib/IceStorm.rb +1 -6
  611. data/lib/IceStorm/IceStorm.rb +78 -210
  612. data/lib/IceStorm/Metrics.rb +10 -93
  613. data/slice/Glacier2/Metrics.ice +20 -10
  614. data/slice/Glacier2/PermissionsVerifier.ice +19 -12
  615. data/slice/Glacier2/PermissionsVerifierF.ice +16 -9
  616. data/slice/Glacier2/Router.ice +19 -13
  617. data/slice/Glacier2/RouterF.ice +16 -9
  618. data/slice/Glacier2/SSLInfo.ice +17 -10
  619. data/slice/Glacier2/Session.ice +24 -18
  620. data/slice/Ice/BuiltinSequences.ice +18 -9
  621. data/slice/Ice/Communicator.ice +180 -64
  622. data/slice/Ice/CommunicatorF.ice +18 -9
  623. data/slice/Ice/Connection.ice +208 -75
  624. data/slice/Ice/ConnectionF.ice +18 -9
  625. data/slice/Ice/Current.ice +37 -28
  626. data/slice/Ice/Endpoint.ice +73 -21
  627. data/slice/Ice/EndpointF.ice +19 -10
  628. data/slice/Ice/EndpointTypes.ice +21 -13
  629. data/slice/Ice/FacetMap.ice +19 -10
  630. data/slice/Ice/Identity.ice +24 -10
  631. data/slice/Ice/ImplicitContext.ice +41 -33
  632. data/slice/Ice/ImplicitContextF.ice +17 -9
  633. data/slice/Ice/Instrumentation.ice +37 -30
  634. data/slice/Ice/InstrumentationF.ice +19 -10
  635. data/slice/Ice/LocalException.ice +118 -112
  636. data/slice/Ice/Locator.ice +28 -21
  637. data/slice/Ice/LocatorF.ice +18 -9
  638. data/slice/Ice/Logger.ice +26 -18
  639. data/slice/Ice/LoggerF.ice +18 -9
  640. data/slice/Ice/Metrics.ice +42 -30
  641. data/slice/Ice/ObjectAdapter.ice +88 -53
  642. data/slice/Ice/ObjectAdapterF.ice +18 -9
  643. data/slice/Ice/ObjectFactory.ice +28 -17
  644. data/slice/Ice/Plugin.ice +25 -13
  645. data/slice/Ice/PluginF.ice +22 -9
  646. data/slice/Ice/Process.ice +20 -11
  647. data/slice/Ice/ProcessF.ice +18 -9
  648. data/slice/Ice/Properties.ice +42 -28
  649. data/slice/Ice/PropertiesAdmin.ice +20 -10
  650. data/slice/Ice/PropertiesF.ice +18 -9
  651. data/slice/Ice/RemoteLogger.ice +23 -19
  652. data/slice/Ice/Router.ice +28 -13
  653. data/slice/Ice/RouterF.ice +18 -9
  654. data/slice/Ice/ServantLocator.ice +40 -29
  655. data/slice/Ice/ServantLocatorF.ice +18 -9
  656. data/slice/Ice/SliceChecksumDict.ice +18 -9
  657. data/slice/Ice/ValueFactory.ice +132 -0
  658. data/slice/Ice/Version.ice +20 -10
  659. data/slice/IceBT/ConnectionInfo.ice +58 -0
  660. data/slice/IceBT/EndpointInfo.ice +56 -0
  661. data/slice/IceBT/Types.ice +44 -0
  662. data/slice/IceBox/IceBox.ice +45 -27
  663. data/slice/IceDiscovery/IceDiscovery.ice +75 -10
  664. data/slice/IceGrid/Admin.ice +410 -44
  665. data/slice/IceGrid/Descriptor.ice +47 -34
  666. data/slice/IceGrid/Exception.ice +43 -32
  667. data/slice/IceGrid/FileParser.ice +21 -12
  668. data/slice/IceGrid/PluginFacade.ice +26 -18
  669. data/slice/IceGrid/Registry.ice +150 -21
  670. data/slice/IceGrid/Session.ice +25 -17
  671. data/slice/IceGrid/UserAccountMapper.ice +23 -14
  672. data/slice/IceIAP/ConnectionInfo.ice +73 -0
  673. data/slice/IceIAP/EndpointInfo.ice +67 -0
  674. data/slice/IceLocatorDiscovery/IceLocatorDiscovery.ice +19 -12
  675. data/slice/IcePatch2/FileInfo.ice +19 -13
  676. data/slice/IcePatch2/FileServer.ice +27 -18
  677. data/slice/IceSSL/ConnectionInfo.ice +27 -23
  678. data/slice/IceSSL/ConnectionInfoF.ice +30 -0
  679. data/slice/IceSSL/EndpointInfo.ice +21 -36
  680. data/slice/IceStorm/IceStorm.ice +33 -24
  681. data/slice/IceStorm/Metrics.ice +19 -11
  682. metadata +148 -120
  683. data/ext/ObjectFactory.cpp +0 -140
  684. data/ext/ObjectFactory.h +0 -50
  685. data/ext/ice/cpp/include/Ice/ACMF.h +0 -30
  686. data/ext/ice/cpp/include/Ice/BasicStream.h +0 -1335
  687. data/ext/ice/cpp/include/Ice/BuiltinSequences.h +0 -82
  688. data/ext/ice/cpp/include/Ice/Communicator.h +0 -200
  689. data/ext/ice/cpp/include/Ice/Connection.h +0 -497
  690. data/ext/ice/cpp/include/Ice/ConnectionF.h +0 -74
  691. data/ext/ice/cpp/include/Ice/ConnectionFactoryF.h +0 -30
  692. data/ext/ice/cpp/include/Ice/Current.h +0 -102
  693. data/ext/ice/cpp/include/Ice/DefaultObjectFactory.h +0 -48
  694. data/ext/ice/cpp/include/Ice/DeprecatedStringConverter.h +0 -62
  695. data/ext/ice/cpp/include/Ice/Endpoint.h +0 -341
  696. data/ext/ice/cpp/include/Ice/EndpointF.h +0 -93
  697. data/ext/ice/cpp/include/Ice/EndpointTypes.h +0 -82
  698. data/ext/ice/cpp/include/Ice/Identity.h +0 -168
  699. data/ext/ice/cpp/include/Ice/ImplicitContext.h +0 -102
  700. data/ext/ice/cpp/include/Ice/Instrumentation.h +0 -365
  701. data/ext/ice/cpp/include/Ice/InstrumentationF.h +0 -75
  702. data/ext/ice/cpp/include/Ice/LocalException.h +0 -1030
  703. data/ext/ice/cpp/include/Ice/Locator.h +0 -2193
  704. data/ext/ice/cpp/include/Ice/LocatorF.h +0 -93
  705. data/ext/ice/cpp/include/Ice/Logger.h +0 -100
  706. data/ext/ice/cpp/include/Ice/Metrics.h +0 -2974
  707. data/ext/ice/cpp/include/Ice/ObjectAdapter.h +0 -168
  708. data/ext/ice/cpp/include/Ice/ObjectAdapterFactoryF.h +0 -26
  709. data/ext/ice/cpp/include/Ice/ObjectFactory.h +0 -92
  710. data/ext/ice/cpp/include/Ice/ObjectFactoryF.h +0 -66
  711. data/ext/ice/cpp/include/Ice/ObjectFactoryManagerF.h +0 -26
  712. data/ext/ice/cpp/include/Ice/Outgoing.h +0 -225
  713. data/ext/ice/cpp/include/Ice/Plugin.h +0 -125
  714. data/ext/ice/cpp/include/Ice/PluginF.h +0 -70
  715. data/ext/ice/cpp/include/Ice/Process.h +0 -574
  716. data/ext/ice/cpp/include/Ice/ProcessF.h +0 -83
  717. data/ext/ice/cpp/include/Ice/Properties.h +0 -136
  718. data/ext/ice/cpp/include/Ice/PropertiesAdmin.h +0 -830
  719. data/ext/ice/cpp/include/Ice/PropertiesF.h +0 -87
  720. data/ext/ice/cpp/include/Ice/RemoteLogger.h +0 -1500
  721. data/ext/ice/cpp/include/Ice/Router.h +0 -1159
  722. data/ext/ice/cpp/include/Ice/RouterF.h +0 -83
  723. data/ext/ice/cpp/include/Ice/ServantLocator.h +0 -96
  724. data/ext/ice/cpp/include/Ice/Stream.h +0 -447
  725. data/ext/ice/cpp/include/Ice/StreamF.h +0 -30
  726. data/ext/ice/cpp/include/Ice/Version.h +0 -262
  727. data/ext/ice/cpp/include/IceSSL/ConnectionInfo.h +0 -158
  728. data/ext/ice/cpp/include/IceSSL/EndpointInfo.h +0 -142
  729. data/ext/ice/cpp/include/IceUtil/AbstractMutex.h +0 -119
  730. data/ext/ice/cpp/include/IceUtil/Cache.h +0 -362
  731. data/ext/ice/cpp/include/IceUtil/IconvStringConverter.h +0 -302
  732. data/ext/ice/cpp/include/IceUtil/SHA1.h +0 -47
  733. data/ext/ice/cpp/include/Slice/CPlusPlusUtil.h +0 -65
  734. data/ext/ice/cpp/include/Slice/Checksum.h +0 -26
  735. data/ext/ice/cpp/include/Slice/CsUtil.h +0 -92
  736. data/ext/ice/cpp/include/Slice/DotNetNames.h +0 -34
  737. data/ext/ice/cpp/include/Slice/JavaUtil.h +0 -279
  738. data/ext/ice/cpp/include/Slice/ObjCUtil.h +0 -127
  739. data/ext/ice/cpp/include/Slice/PHPUtil.h +0 -50
  740. data/ext/ice/cpp/include/Slice/PythonUtil.h +0 -64
  741. data/ext/ice/cpp/include/Slice/Util.h +0 -56
  742. data/ext/ice/cpp/src/Ice/BasicStream.cpp +0 -3428
  743. data/ext/ice/cpp/src/Ice/DeprecatedStringConverter.cpp +0 -62
  744. data/ext/ice/cpp/src/Ice/ObjectFactoryF.cpp +0 -44
  745. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.cpp +0 -139
  746. data/ext/ice/cpp/src/Ice/ObjectFactoryManager.h +0 -43
  747. data/ext/ice/cpp/src/Ice/Outgoing.cpp +0 -694
  748. data/ext/ice/cpp/src/Ice/Stream.cpp +0 -53
  749. data/ext/ice/cpp/src/Ice/StreamI.cpp +0 -832
  750. data/ext/ice/cpp/src/Ice/StreamI.h +0 -198
  751. data/ext/ice/cpp/src/IceSSL/Certificate.cpp +0 -1336
  752. data/ext/ice/cpp/src/IceUtil/ArgVector.cpp +0 -64
  753. data/ext/ice/cpp/src/IceUtil/ArgVector.h +0 -41
  754. data/ext/ice/cpp/src/IceUtil/Exception.cpp +0 -792
  755. data/ext/ice/cpp/src/IceUtil/FileUtil.h +0 -185
  756. data/ext/ice/cpp/src/Slice/CsUtil.cpp +0 -2660
  757. data/ext/ice/cpp/src/Slice/DotNetNames.cpp +0 -146
  758. data/ext/ice/cpp/src/Slice/ObjCUtil.cpp +0 -1310
  759. data/lib/Ice/ObjectFactoryF.rb +0 -29
  760. data/lib/IceGrid/Locator.rb +0 -106
  761. data/lib/IceGrid/Observer.rb +0 -572
  762. data/lib/IceGrid/Query.rb +0 -169
  763. data/slice/Freeze/BackgroundSaveEvictor.ice +0 -111
  764. data/slice/Freeze/CatalogData.ice +0 -49
  765. data/slice/Freeze/Connection.ice +0 -121
  766. data/slice/Freeze/ConnectionF.ice +0 -20
  767. data/slice/Freeze/DB.ice +0 -37
  768. data/slice/Freeze/Evictor.ice +0 -346
  769. data/slice/Freeze/EvictorF.ice +0 -22
  770. data/slice/Freeze/EvictorStorage.ice +0 -72
  771. data/slice/Freeze/Exception.ice +0 -100
  772. data/slice/Freeze/Transaction.ice +0 -58
  773. data/slice/Freeze/TransactionalEvictor.ice +0 -50
  774. data/slice/Ice/ObjectFactoryF.ice +0 -21
  775. data/slice/IceGrid/Locator.ice +0 -57
  776. data/slice/IceGrid/Observer.ice +0 -395
  777. data/slice/IceGrid/Query.ice +0 -131
@@ -1,198 +0,0 @@
1
- // **********************************************************************
2
- //
3
- // Copyright (c) 2003-2018 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 ICE_STREAM_I_H
11
- #define ICE_STREAM_I_H
12
-
13
- #include <Ice/Stream.h>
14
-
15
- namespace IceInternal
16
- {
17
-
18
- // Forward declaration.
19
- class BasicStream;
20
-
21
- };
22
-
23
- namespace Ice
24
- {
25
-
26
- //
27
- // Implement InputStream as a wrapper around BasicStream.
28
- //
29
- class InputStreamI : public InputStream
30
- {
31
- public:
32
-
33
- InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, bool);
34
- InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool);
35
- virtual ~InputStreamI();
36
-
37
- virtual CommunicatorPtr communicator() const;
38
-
39
- virtual void sliceObjects(bool);
40
-
41
- virtual Int readSize();
42
- virtual Int readAndCheckSeqSize(int);
43
-
44
- virtual ObjectPrx readProxy();
45
- virtual void readObject(const ReadObjectCallbackPtr&);
46
-
47
- virtual void throwException();
48
- virtual void throwException(const UserExceptionReaderFactoryPtr&);
49
-
50
- virtual void startObject();
51
- virtual SlicedDataPtr endObject(bool);
52
-
53
- virtual void startException();
54
- virtual SlicedDataPtr endException(bool);
55
-
56
- virtual std::string startSlice();
57
- virtual void endSlice();
58
- virtual void skipSlice();
59
-
60
- virtual EncodingVersion startEncapsulation();
61
- virtual void endEncapsulation();
62
- virtual EncodingVersion skipEncapsulation();
63
-
64
- virtual EncodingVersion getEncoding() const;
65
-
66
- virtual void readPendingObjects();
67
-
68
- virtual size_type pos();
69
- virtual void rewind();
70
-
71
- virtual void skip(Int);
72
- virtual void skipSize();
73
-
74
- virtual void read(bool&);
75
- virtual void read(Byte&);
76
- virtual void read(Short&);
77
- virtual void read(Int&);
78
- virtual void read(Long&);
79
- virtual void read(Float&);
80
- virtual void read(Double&);
81
- virtual void read(std::string&, bool = true);
82
- virtual void read(const char*&, size_t&);
83
- virtual void read(const char*&, size_t&, std::string&);
84
- virtual void read(std::vector<std::string>&, bool);
85
- virtual void read(std::wstring&);
86
- virtual void read(std::vector<bool>&);
87
- virtual void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&);
88
- virtual void read(std::pair<const Byte*, const Byte*>&);
89
- virtual void read(std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&);
90
- virtual void read(std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&);
91
- virtual void read(std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&);
92
- virtual void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&);
93
- virtual void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&);
94
-
95
- #ifdef __SUNPRO_CC
96
- using InputStream::read;
97
- #endif
98
-
99
- virtual bool readOptional(Int, OptionalFormat);
100
-
101
- virtual void closure(void*);
102
- virtual void* closure() const;
103
-
104
- private:
105
-
106
- void initialize(IceInternal::Instance*, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool);
107
-
108
- const CommunicatorPtr _communicator;
109
- IceInternal::BasicStream* _is;
110
- std::vector< ReadObjectCallbackPtr > _callbacks;
111
- void* _closure;
112
- };
113
-
114
- //
115
- // Implement OutputStream as a wrapper around BasicStream.
116
- //
117
- class OutputStreamI : public OutputStream
118
- {
119
- public:
120
-
121
- OutputStreamI(const CommunicatorPtr&);
122
- OutputStreamI(const CommunicatorPtr&, const EncodingVersion&);
123
- OutputStreamI(const CommunicatorPtr&, IceInternal::BasicStream*);
124
- virtual ~OutputStreamI();
125
-
126
- virtual CommunicatorPtr communicator() const;
127
-
128
- virtual void writeObject(const ObjectPtr&);
129
- virtual void writeException(const UserException&);
130
- virtual void writeProxy(const ObjectPrx&);
131
-
132
- virtual void writeSize(Int);
133
-
134
- virtual void write(bool);
135
- virtual void write(Byte);
136
- virtual void write(Short);
137
- virtual void write(Int);
138
- virtual void write(Long);
139
- virtual void write(Float);
140
- virtual void write(Double);
141
- virtual void write(const std::string&, bool = true);
142
- virtual void write(const char*, size_t, bool = true);
143
- virtual void write(const std::vector<std::string>&, bool);
144
- virtual void write(const char*, bool = true);
145
- virtual void write(const std::wstring&);
146
- virtual void write(const std::vector<bool>&);
147
- virtual void write(const bool*, const bool*);
148
- virtual void write(const Byte*, const Byte*);
149
- virtual void write(const Short*, const Short*);
150
- virtual void write(const Int*, const Int*);
151
- virtual void write(const Long*, const Long*);
152
- virtual void write(const Float*, const Float*);
153
- virtual void write(const Double*, const Double*);
154
-
155
- #ifdef __SUNPRO_CC
156
- using OutputStream::write;
157
- #endif
158
-
159
- virtual bool writeOptional(Int, OptionalFormat);
160
-
161
- virtual void startObject(const SlicedDataPtr&);
162
- virtual void endObject();
163
-
164
- virtual void startException(const SlicedDataPtr&);
165
- virtual void endException();
166
-
167
- virtual void startSlice(const std::string&, int, bool);
168
- virtual void endSlice();
169
-
170
- virtual void startEncapsulation(const EncodingVersion&, FormatType);
171
- virtual void startEncapsulation();
172
- virtual void endEncapsulation();
173
-
174
- virtual EncodingVersion getEncoding() const;
175
-
176
- virtual void writePendingObjects();
177
-
178
- virtual void finished(std::vector< Byte >&);
179
- virtual std::pair<const Byte*, const Byte*> finished();
180
-
181
- virtual void reset(bool);
182
-
183
- virtual size_type pos();
184
- virtual void rewrite(Int, size_type);
185
-
186
- virtual size_type startSize();
187
- virtual void endSize(size_type pos);
188
-
189
- private:
190
-
191
- const CommunicatorPtr _communicator;
192
- IceInternal::BasicStream* _os;
193
- const bool _own;
194
- };
195
-
196
- }
197
-
198
- #endif
@@ -1,1336 +0,0 @@
1
- // **********************************************************************
2
- //
3
- // Copyright (c) 2003-2018 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 <IceUtil/DisableWarnings.h>
11
- #include <IceUtil/Mutex.h>
12
- #include <IceUtil/MutexPtrLock.h>
13
- #include <IceUtil/StringUtil.h>
14
- #include <IceSSL/Plugin.h>
15
- #include <IceSSL/Util.h>
16
- #include <IceSSL/RFC2253.h>
17
- #include <Ice/Object.h>
18
-
19
- #if defined(ICE_USE_OPENSSL)
20
- # include <openssl/x509v3.h>
21
- # include <openssl/pem.h>
22
- //
23
- // Avoid old style cast warnings from OpenSSL macros
24
- //
25
- # pragma GCC diagnostic ignored "-Wold-style-cast"
26
- #elif defined(ICE_USE_SECURE_TRANSPORT)
27
- # include <Security/Security.h>
28
- #endif
29
-
30
- #ifdef __SUNPRO_CC
31
-
32
- //
33
- // The call to sk_GENERAL_NAME_pop_free fails to compile if we don't
34
- // remove the extern "C" vs non extern "C" check with the macro below:
35
- //
36
-
37
- extern "C" typedef void (*FreeFunc)(void*);
38
-
39
- #undef CHECKED_SK_FREE_FUNC
40
- #define CHECKED_SK_FREE_FUNC(type, p) \
41
- (FreeFunc) (p)
42
-
43
- #endif
44
-
45
-
46
- using namespace std;
47
- using namespace Ice;
48
- using namespace IceSSL;
49
-
50
- const char* IceSSL::CertificateReadException::_name = "IceSSL::CertificateReadException";
51
-
52
- #if defined(ICE_USE_SECURE_TRANSPORT) || defined(ICE_USE_SCHANNEL)
53
- //
54
- // Map a certificate OID to its alias
55
- //
56
- struct CertificateOID
57
- {
58
- const char* name;
59
- const char* alias;
60
- };
61
-
62
- const CertificateOID certificateOIDS[] =
63
- {
64
- {"2.5.4.3", "CN"},
65
- {"2.5.4.4", "SN"},
66
- {"2.5.4.5", "DeviceSerialNumber"},
67
- {"2.5.4.6", "C"},
68
- {"2.5.4.7", "L"},
69
- {"2.5.4.8", "ST"},
70
- {"2.5.4.9", "STREET"},
71
- {"2.5.4.10", "O"},
72
- {"2.5.4.11", "OU"},
73
- {"2.5.4.12", "T"},
74
- {"2.5.4.42", "G"},
75
- {"2.5.4.43", "I"},
76
- {"1.2.840.113549.1.9.8", "unstructuredAddress"},
77
- {"1.2.840.113549.1.9.2", "unstructuredName"},
78
- {"1.2.840.113549.1.9.1", "emailAddress"},
79
- {"0.9.2342.19200300.100.1.25", "DC"}
80
- };
81
- const int certificateOIDSSize = sizeof(certificateOIDS) / sizeof(CertificateOID);
82
-
83
- #endif
84
-
85
-
86
- #if defined(ICE_USE_SECURE_TRANSPORT)
87
-
88
- string
89
- certificateOIDAlias(const string& name)
90
- {
91
- for(int i = 0; i < certificateOIDSSize; ++i)
92
- {
93
- const CertificateOID* certificateOID = &certificateOIDS[i];
94
- assert(certificateOID);
95
- if(name == certificateOID->name)
96
- {
97
- return certificateOID->alias;
98
- }
99
- }
100
- return name;
101
- }
102
-
103
- //
104
- // Map alternative name alias to its types.
105
- //
106
- const char* certificateAlternativeNameTypes[] = {"", "Email Address", "DNS Name", "", "Directory Name", "", "URI",
107
- "IP Address"};
108
- const int certificateAlternativeNameTypesSize = sizeof(certificateAlternativeNameTypes) / sizeof(char*);
109
-
110
- int
111
- certificateAlternativeNameType(const string& alias)
112
- {
113
- if(!alias.empty())
114
- {
115
- for(int i = 0; i < certificateAlternativeNameTypesSize; ++i)
116
- {
117
- if(alias == certificateAlternativeNameTypes[i])
118
- {
119
- return i;
120
- }
121
- }
122
- }
123
- return -1; // Not supported
124
- }
125
-
126
- string
127
- escapeX509Name(const string& name)
128
- {
129
- ostringstream os;
130
- for(string::const_iterator i = name.begin(); i != name.end(); ++i)
131
- {
132
- switch(*i)
133
- {
134
- case ',':
135
- case '=':
136
- case '+':
137
- case '<':
138
- case '>':
139
- case '#':
140
- case ';':
141
- {
142
- os << '\\';
143
- }
144
- default:
145
- {
146
- break;
147
- }
148
- }
149
- os << *i;
150
- }
151
- return os.str();
152
- }
153
-
154
- DistinguishedName
155
- getX509Name(SecCertificateRef cert, CFTypeRef key)
156
- {
157
- assert(key == kSecOIDX509V1IssuerName || key == kSecOIDX509V1SubjectName);
158
- list<pair<string, string> > rdnPairs;
159
- CFDictionaryRef property = getCertificateProperty(cert, key);
160
- if(property)
161
- {
162
- CFArrayRef dn = (CFArrayRef)CFDictionaryGetValue(property, kSecPropertyKeyValue);
163
- int size = CFArrayGetCount(dn);
164
- for(int i = 0; i < size; ++i)
165
- {
166
- CFDictionaryRef dict = (CFDictionaryRef)CFArrayGetValueAtIndex(dn, i);
167
- rdnPairs.push_front(make_pair(
168
- certificateOIDAlias(fromCFString((CFStringRef)CFDictionaryGetValue(dict, kSecPropertyKeyLabel))),
169
- escapeX509Name(fromCFString((CFStringRef)CFDictionaryGetValue(dict, kSecPropertyKeyValue)))));
170
- }
171
- CFRelease(property);
172
- }
173
- return DistinguishedName(rdnPairs);
174
- }
175
-
176
- vector<pair<int, string> >
177
- getX509AltName(SecCertificateRef cert, CFTypeRef key)
178
- {
179
- assert(key == kSecOIDIssuerAltName || key == kSecOIDSubjectAltName);
180
- CFDictionaryRef property = getCertificateProperty(cert, key);
181
-
182
- vector<pair<int, string> > pairs;
183
- if(property)
184
- {
185
- CFArrayRef names = (CFArrayRef)CFDictionaryGetValue(property, kSecPropertyKeyValue);
186
- int size = CFArrayGetCount(names);
187
-
188
- for(int i = 0; i < size; ++i)
189
- {
190
- CFDictionaryRef dict = (CFDictionaryRef)CFArrayGetValueAtIndex(names, i);
191
-
192
- int type = certificateAlternativeNameType(fromCFString(
193
- (CFStringRef)CFDictionaryGetValue(dict, kSecPropertyKeyLabel)));
194
- if(type != -1)
195
- {
196
- CFTypeRef v = (CFTypeRef)CFDictionaryGetValue(dict, kSecPropertyKeyValue);
197
- CFStringRef t = (CFStringRef)CFDictionaryGetValue(dict, kSecPropertyKeyType);
198
- if(CFEqual(t, kSecPropertyTypeString) || CFEqual(t, kSecPropertyTypeTitle))
199
- {
200
- pairs.push_back(make_pair(type, fromCFString((CFStringRef)v)));
201
- }
202
- else if(CFEqual(t, kSecPropertyTypeURL))
203
- {
204
- pairs.push_back(make_pair(type, fromCFString(CFURLGetString((CFURLRef)v))));
205
- }
206
- else if(CFEqual(t, kSecPropertyTypeSection))
207
- {
208
- CFArrayRef section = (CFArrayRef)v;
209
- ostringstream os;
210
- for(int i = 0, count = CFArrayGetCount(section); i < count;)
211
- {
212
- CFDictionaryRef d = (CFDictionaryRef)CFArrayGetValueAtIndex(section, i);
213
-
214
- CFStringRef sectionLabel = (CFStringRef)CFDictionaryGetValue(d, kSecPropertyKeyLabel);
215
- CFStringRef sectionValue = (CFStringRef)CFDictionaryGetValue(d, kSecPropertyKeyValue);
216
-
217
- os << certificateOIDAlias(fromCFString(sectionLabel)) << "=" << fromCFString(sectionValue);
218
- if(++i < count)
219
- {
220
- os << ",";
221
- }
222
- }
223
- pairs.push_back(make_pair(type, os.str()));
224
- }
225
- }
226
- }
227
- CFRelease(property);
228
- }
229
- return pairs;
230
- }
231
-
232
- IceUtil::Time
233
- getX509Date(SecCertificateRef cert, CFTypeRef key)
234
- {
235
- assert(key == kSecOIDX509V1ValidityNotAfter || key == kSecOIDX509V1ValidityNotBefore);
236
- CFDictionaryRef property = getCertificateProperty(cert, key);
237
- CFAbsoluteTime seconds = 0;
238
- if(property)
239
- {
240
- CFNumberRef date = (CFNumberRef)CFDictionaryGetValue(property, kSecPropertyKeyValue);
241
- CFNumberGetValue(date, kCFNumberDoubleType, &seconds);
242
- CFRelease(property);
243
- }
244
- return IceUtil::Time::secondsDouble(kCFAbsoluteTimeIntervalSince1970 + seconds);
245
- }
246
-
247
- string
248
- getX509String(SecCertificateRef cert, CFTypeRef key)
249
- {
250
- assert(key == kSecOIDX509V1SerialNumber || key == kSecOIDX509V1Version);
251
- CFDictionaryRef property = getCertificateProperty(cert, key);
252
- string value;
253
- if(property)
254
- {
255
- value = fromCFString((CFStringRef)CFDictionaryGetValue(property, kSecPropertyKeyValue));
256
- CFRelease(property);
257
- }
258
- return value;
259
- }
260
-
261
- #elif defined(ICE_USE_SCHANNEL)
262
-
263
- void
264
- loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const char* buffer, DWORD length)
265
- {
266
- DWORD outLength = length;
267
- vector<BYTE> outBuffer;
268
- outBuffer.resize(outLength);
269
-
270
- if(!CryptStringToBinary(buffer, length, CRYPT_STRING_BASE64HEADER, &outBuffer[0], &outLength, 0, 0))
271
- {
272
- //
273
- // Base64 data should always be bigger than binary
274
- //
275
- assert(GetLastError() != ERROR_MORE_DATA);
276
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
277
- }
278
-
279
- DWORD decodedLeng = 0;
280
- if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT, &outBuffer[0], outLength, CRYPT_DECODE_ALLOC_FLAG, 0,
281
- cert, &decodedLeng))
282
- {
283
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
284
- }
285
- }
286
-
287
- void
288
- loadCertificate(PCERT_SIGNED_CONTENT_INFO* cert, const string& file)
289
- {
290
- vector<char> buffer;
291
- readFile(file, buffer);
292
- if(buffer.empty())
293
- {
294
- throw CertificateReadException(__FILE__, __LINE__, "certificate file " + file + " is empty");
295
- }
296
- loadCertificate(cert, &buffer[0], static_cast<DWORD>(buffer.size()));
297
- }
298
-
299
- const Ice::Long TICKS_PER_MSECOND = 10000LL;
300
- const Ice::Long MSECS_TO_EPOCH = 11644473600000LL;
301
-
302
- IceUtil::Time
303
- filetimeToTime(FILETIME ftime)
304
- {
305
- Ice::Long value = 0;
306
- DWORD* dest = reinterpret_cast<DWORD*>(&value);
307
- *dest++ = ftime.dwLowDateTime;
308
- *dest = ftime.dwHighDateTime;
309
- return IceUtil::Time::milliSeconds((value / TICKS_PER_MSECOND) - MSECS_TO_EPOCH);
310
- }
311
-
312
- string
313
- certNameToString(CERT_NAME_BLOB* name)
314
- {
315
- assert(name);
316
- DWORD length = 0;
317
- if(!(length = CertNameToStr(X509_ASN_ENCODING, name, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, 0, 0)))
318
- {
319
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
320
- }
321
-
322
- vector<char> buffer(length);
323
- if(!CertNameToStr(X509_ASN_ENCODING, name, CERT_OID_NAME_STR|CERT_NAME_STR_REVERSE_FLAG, &buffer[0], length))
324
- {
325
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
326
- }
327
-
328
- string s(&buffer[0]);
329
- for(int i = 0; i < certificateOIDSSize; ++i)
330
- {
331
- const CertificateOID* certificateOID = &certificateOIDS[i];
332
- assert(certificateOID);
333
- const string name = string(certificateOID->name) + "=";
334
- const string alias = string(certificateOID->alias) + "=";
335
- size_t pos = 0;
336
- while((pos = s.find(name, pos)) != string::npos)
337
- {
338
- s.replace(pos, name.size(), alias);
339
- }
340
- }
341
- return s;
342
- }
343
-
344
- vector<pair<int, string> >
345
- certificateAltNames(CERT_INFO* certInfo, LPCSTR altNameOID)
346
- {
347
- vector<pair<int, string> > altNames;
348
-
349
- PCERT_EXTENSION extension = CertFindExtension(altNameOID, certInfo->cExtension, certInfo->rgExtension);
350
- if(extension)
351
- {
352
- CERT_ALT_NAME_INFO* altName;
353
- DWORD length = 0;
354
- if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_ALTERNATE_NAME, extension->Value.pbData,
355
- extension->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &altName, &length))
356
- {
357
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
358
- }
359
-
360
- for(DWORD i = 0; i < altName->cAltEntry; ++i)
361
- {
362
- CERT_ALT_NAME_ENTRY* entry = &altName->rgAltEntry[i];
363
-
364
- switch(entry->dwAltNameChoice)
365
- {
366
- case CERT_ALT_NAME_RFC822_NAME:
367
- {
368
- altNames.push_back(make_pair(AltNameEmail, IceUtil::wstringToString(entry->pwszRfc822Name)));
369
- break;
370
- }
371
- case CERT_ALT_NAME_DNS_NAME:
372
- {
373
- altNames.push_back(make_pair(AltNameDNS, IceUtil::wstringToString(entry->pwszDNSName)));
374
- break;
375
- }
376
- case CERT_ALT_NAME_DIRECTORY_NAME:
377
- {
378
- altNames.push_back(make_pair(AltNameDirectory, certNameToString(&entry->DirectoryName)));
379
- break;
380
- }
381
- case CERT_ALT_NAME_URL:
382
- {
383
- altNames.push_back(make_pair(AltNameURL, IceUtil::wstringToString(entry->pwszURL)));
384
- break;
385
- }
386
- case CERT_ALT_NAME_IP_ADDRESS:
387
- {
388
- if(entry->IPAddress.cbData == 4)
389
- {
390
- //
391
- // IPv4 address
392
- //
393
- ostringstream os;
394
- Byte* src = reinterpret_cast<Byte*>(entry->IPAddress.pbData);
395
- for(int j = 0; j < 4;)
396
- {
397
- int value = 0;
398
- Byte* dest = reinterpret_cast<Byte*>(&value);
399
- *dest = *src++;
400
- os << value;
401
- if(++j < 4)
402
- {
403
- os << ".";
404
- }
405
- }
406
- altNames.push_back(make_pair(AltNAmeIP, os.str()));
407
- }
408
- //
409
- // TODO IPv6 Address support.
410
- //
411
- break;
412
- }
413
- default:
414
- {
415
- // Not supported
416
- break;
417
- }
418
- }
419
- }
420
- LocalFree(altName);
421
- }
422
- return altNames;
423
- }
424
- #endif
425
-
426
- CertificateReadException::CertificateReadException(const char* file, int line, const string& r) :
427
- Exception(file, line),
428
- reason(r)
429
- {
430
- }
431
-
432
- CertificateReadException::~CertificateReadException() throw()
433
- {
434
- }
435
-
436
- string
437
- CertificateReadException::ice_name() const
438
- {
439
- return _name;
440
- }
441
-
442
- CertificateReadException*
443
- CertificateReadException::ice_clone() const
444
- {
445
- return new CertificateReadException(*this);
446
- }
447
-
448
- void
449
- CertificateReadException::ice_throw() const
450
- {
451
- throw *this;
452
- }
453
-
454
- const char* IceSSL::CertificateEncodingException::_name = "IceSSL::CertificateEncodingException";
455
-
456
- #ifdef ICE_USE_SECURE_TRANSPORT
457
- CertificateEncodingException::CertificateEncodingException(const char* file, int line, CFErrorRef err) :
458
- Exception(file, line)
459
- {
460
- assert(err);
461
- reason = "certificate error:\n" + errorToString(err);
462
- CFRelease(err);
463
- }
464
- #endif
465
-
466
- CertificateEncodingException::CertificateEncodingException(const char* file, int line, const string& r) :
467
- Exception(file, line),
468
- reason(r)
469
- {
470
- }
471
-
472
- CertificateEncodingException::~CertificateEncodingException() throw()
473
- {
474
- }
475
-
476
- string
477
- CertificateEncodingException::ice_name() const
478
- {
479
- return _name;
480
- }
481
-
482
- CertificateEncodingException*
483
- CertificateEncodingException::ice_clone() const
484
- {
485
- return new CertificateEncodingException(*this);
486
- }
487
-
488
- void
489
- CertificateEncodingException::ice_throw() const
490
- {
491
- throw *this;
492
- }
493
-
494
- #ifdef ICE_USE_OPENSSL
495
-
496
- namespace
497
- {
498
-
499
- IceUtil::Mutex* mut = 0;
500
-
501
- class Init
502
- {
503
- public:
504
-
505
- Init()
506
- {
507
- mut = new IceUtil::Mutex;
508
- }
509
-
510
- ~Init()
511
- {
512
- delete mut;
513
- mut = 0;
514
- }
515
- };
516
-
517
- Init init;
518
-
519
- }
520
-
521
- static IceUtil::Time
522
- ASMUtcTimeToIceUtilTime(const ASN1_UTCTIME* s)
523
- {
524
- struct tm tm;
525
- int offset;
526
-
527
- memset(&tm, '\0', sizeof tm);
528
-
529
- # define g2(p) (((p)[0]-'0')*10+(p)[1]-'0')
530
- tm.tm_year = g2(s->data);
531
- if(tm.tm_year < 50)
532
- tm.tm_year += 100;
533
- tm.tm_mon = g2(s->data + 2) - 1;
534
- tm.tm_mday = g2(s->data + 4);
535
- tm.tm_hour = g2(s->data + 6);
536
- tm.tm_min = g2(s->data + 8);
537
- tm.tm_sec = g2(s->data + 10);
538
- if(s->data[12] == 'Z')
539
- {
540
- offset = 0;
541
- }
542
- else
543
- {
544
- offset = g2(s->data + 13) * 60 + g2(s->data + 15);
545
- if(s->data[12] == '-')
546
- {
547
- offset = -offset;
548
- }
549
- }
550
- # undef g2
551
-
552
- //
553
- // If timegm was on all systems this code could be
554
- // return IceUtil::Time::seconds(timegm(&tm) - offset*60);
555
- //
556
- // Windows doesn't support the re-entrant _r versions.
557
- //
558
- time_t tzone;
559
- {
560
- IceUtilInternal::MutexPtrLock<IceUtil::Mutex> sync(mut);
561
- time_t now = time(0);
562
- tzone = mktime(localtime(&now)) - mktime(gmtime(&now));
563
- }
564
- return IceUtil::Time::seconds(mktime(&tm) - offset*60 + tzone);
565
- }
566
-
567
- static string
568
- convertX509NameToString(X509_NAME* name)
569
- {
570
- BIO* out = BIO_new(BIO_s_mem());
571
- X509_NAME_print_ex(out, name, 0, XN_FLAG_RFC2253);
572
- BUF_MEM* p;
573
- BIO_get_mem_ptr(out, &p);
574
- string result = string(p->data, p->length);
575
- BIO_free(out);
576
- return result;
577
- }
578
-
579
- static vector<pair<int, string> >
580
- convertGeneralNames(GENERAL_NAMES* gens)
581
- {
582
- vector<pair<int, string> > alt;
583
- if(gens == 0)
584
- {
585
- return alt;
586
- }
587
- for(int i = 0; i < sk_GENERAL_NAME_num(gens); ++i)
588
- {
589
- GENERAL_NAME* gen = sk_GENERAL_NAME_value(gens, i);
590
- pair<int, string> p;
591
- p.first = gen->type;
592
- switch(gen->type)
593
- {
594
- case GEN_EMAIL:
595
- {
596
- ASN1_IA5STRING* str = gen->d.rfc822Name;
597
- if(str && str->type == V_ASN1_IA5STRING && str->data && str->length > 0)
598
- {
599
- p.second = string(reinterpret_cast<const char*>(str->data), str->length);
600
- }
601
- break;
602
- }
603
- case GEN_DNS:
604
- {
605
- ASN1_IA5STRING* str = gen->d.dNSName;
606
- if(str && str->type == V_ASN1_IA5STRING && str->data && str->length > 0)
607
- {
608
- p.second = string(reinterpret_cast<const char*>(str->data), str->length);
609
- }
610
- break;
611
- }
612
- case GEN_DIRNAME:
613
- {
614
- p.second = convertX509NameToString(gen->d.directoryName);
615
- break;
616
- }
617
- case GEN_URI:
618
- {
619
- ASN1_IA5STRING* str = gen->d.uniformResourceIdentifier;
620
- if(str && str->type == V_ASN1_IA5STRING && str->data && str->length > 0)
621
- {
622
- p.second = string(reinterpret_cast<const char*>(str->data), str->length);
623
- }
624
- break;
625
- }
626
- case GEN_IPADD:
627
- {
628
- ASN1_OCTET_STRING* addr = gen->d.iPAddress;
629
- // TODO: Support IPv6 someday.
630
- if(addr && addr->type == V_ASN1_OCTET_STRING && addr->data && addr->length == 4)
631
- {
632
- ostringstream ostr;
633
- for(int j = 0; j < 4; ++j)
634
- {
635
- if(j > 0)
636
- {
637
- ostr << '.';
638
- }
639
- ostr << static_cast<int>(addr->data[j]);
640
- }
641
- p.second = ostr.str();
642
- }
643
- break;
644
- }
645
- case GEN_OTHERNAME:
646
- case GEN_EDIPARTY:
647
- case GEN_X400:
648
- case GEN_RID:
649
- {
650
- //
651
- // TODO: These types are not supported. If the user wants
652
- // them, they have to get at the certificate data. Another
653
- // alternative is to DER encode the data (as the Java
654
- // certificate does).
655
- //
656
- break;
657
- }
658
- }
659
- alt.push_back(p);
660
- }
661
- sk_GENERAL_NAME_pop_free(gens, GENERAL_NAME_free);
662
- return alt;
663
- }
664
- #endif
665
-
666
- const char* ParseException::_name = "IceSSL::ParseException";
667
-
668
- ParseException::ParseException(const char* file, int line, const string& r) :
669
- Exception(file, line),
670
- reason(r)
671
- {
672
- }
673
-
674
- ParseException::~ParseException() throw()
675
- {
676
- }
677
-
678
- string
679
- ParseException::ice_name() const
680
- {
681
- return _name;
682
- }
683
-
684
- ParseException*
685
- ParseException::ice_clone() const
686
- {
687
- return new ParseException(*this);
688
- }
689
-
690
- void
691
- ParseException::ice_throw() const
692
- {
693
- throw *this;
694
- }
695
-
696
- #ifdef ICE_USE_OPENSSL
697
- DistinguishedName::DistinguishedName(X509NAME* name) :
698
- _rdns(RFC2253::parseStrict(convertX509NameToString(name)))
699
- {
700
- unescape();
701
- }
702
- #endif
703
-
704
- DistinguishedName::DistinguishedName(const string& dn) :
705
- _rdns(RFC2253::parseStrict(dn))
706
- {
707
- unescape();
708
- }
709
-
710
- DistinguishedName::DistinguishedName(const list<pair<string, string> >& rdns) :
711
- _rdns(rdns)
712
- {
713
- unescape();
714
- }
715
-
716
- bool
717
- DistinguishedName::operator==(const DistinguishedName& other) const
718
- {
719
- return other._unescaped == _unescaped;
720
- }
721
-
722
- bool
723
- DistinguishedName::operator!=(const DistinguishedName& other) const
724
- {
725
- return other._unescaped != _unescaped;
726
- }
727
-
728
- bool
729
- DistinguishedName::operator<(const DistinguishedName& other) const
730
- {
731
- return other._unescaped < _unescaped;
732
- }
733
-
734
- bool
735
- DistinguishedName::match(const DistinguishedName& other) const
736
- {
737
- for(list< pair<string, string> >::const_iterator p = other._unescaped.begin(); p != other._unescaped.end(); ++p)
738
- {
739
- bool found = false;
740
- for(list< pair<string, string> >::const_iterator q = _unescaped.begin(); q != _unescaped.end(); ++q)
741
- {
742
- if(p->first == q->first)
743
- {
744
- found = true;
745
- if(p->second != q->second)
746
- {
747
- return false;
748
- }
749
- }
750
- }
751
- if(!found)
752
- {
753
- return false;
754
- }
755
- }
756
- return true;
757
- }
758
-
759
- //
760
- // This always produces the same output as the input DN -- the type of
761
- // escaping is not changed.
762
- //
763
- DistinguishedName::operator string() const
764
- {
765
- ostringstream os;
766
- bool first = true;
767
- for(list< pair<string, string> >::const_iterator p = _rdns.begin(); p != _rdns.end(); ++p)
768
- {
769
- if(!first)
770
- {
771
- os << ",";
772
- }
773
- first = false;
774
- os << p->first << "=" << p->second;
775
- }
776
- return os.str();
777
- }
778
-
779
- void
780
- DistinguishedName::unescape()
781
- {
782
- for(list< pair<string, string> >::const_iterator q = _rdns.begin(); q != _rdns.end(); ++q)
783
- {
784
- pair<string, string> rdn = *q;
785
- rdn.second = RFC2253::unescape(rdn.second);
786
- _unescaped.push_back(rdn);
787
- }
788
- }
789
-
790
- PublicKey::PublicKey(const CertificatePtr& cert, KeyRef key) :
791
- _cert(cert),
792
- _key(key)
793
- {
794
- if(!_key)
795
- {
796
- throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid key reference");
797
- }
798
- }
799
-
800
- PublicKey::~PublicKey()
801
- {
802
- #ifndef ICE_USE_SCHANNEL
803
- if(_key)
804
- {
805
- # if defined(ICE_USE_SECURE_TRANSPORT)
806
- CFRelease(_key);
807
- # else
808
- EVP_PKEY_free(_key);
809
- # endif
810
- }
811
- #endif
812
- }
813
-
814
- KeyRef
815
- PublicKey::key() const
816
- {
817
- return _key;
818
- }
819
-
820
- //
821
- // The caller is responsible for incrementing the reference count.
822
- //
823
- Certificate::Certificate(X509CertificateRef cert) : _cert(cert)
824
- #ifdef ICE_USE_SCHANNEL
825
- , _certInfo(0)
826
- #endif
827
- {
828
- if(!_cert)
829
- {
830
- throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "Invalid certificate reference");
831
- }
832
-
833
- #ifdef ICE_USE_SCHANNEL
834
- try
835
- {
836
- //
837
- // Decode certificate info
838
- //
839
- DWORD length = 0;
840
- if(!CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CERT_TO_BE_SIGNED, _cert->ToBeSigned.pbData,
841
- _cert->ToBeSigned.cbData, CRYPT_DECODE_ALLOC_FLAG, 0, &_certInfo, &length))
842
- {
843
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
844
- }
845
- }
846
- catch(...)
847
- {
848
- LocalFree(_cert);
849
- _cert = 0;
850
- throw;
851
- }
852
- #endif
853
- }
854
-
855
- Certificate::~Certificate()
856
- {
857
- if(_cert)
858
- {
859
- #if defined(ICE_USE_SECURE_TRANSPORT)
860
- CFRelease(_cert);
861
- #elif defined(ICE_USE_SCHANNEL)
862
- LocalFree(_cert);
863
- if(_certInfo)
864
- {
865
- LocalFree(_certInfo);
866
- }
867
- #else
868
- X509_free(_cert);
869
- #endif
870
- }
871
- }
872
-
873
- CertificatePtr
874
- Certificate::load(const string& file)
875
- {
876
- #if defined(ICE_USE_SECURE_TRANSPORT)
877
- return new Certificate(loadCertificate(file));
878
- #elif defined(ICE_USE_SCHANNEL)
879
- CERT_SIGNED_CONTENT_INFO* cert;
880
- loadCertificate(&cert, file);
881
- return new Certificate(cert);
882
- #else
883
- BIO *cert = BIO_new(BIO_s_file());
884
- if(BIO_read_filename(cert, file.c_str()) <= 0)
885
- {
886
- BIO_free(cert);
887
- throw CertificateReadException(__FILE__, __LINE__, "error opening file");
888
- }
889
-
890
- X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
891
- if(x == NULL)
892
- {
893
- BIO_free(cert);
894
- throw CertificateReadException(__FILE__, __LINE__, "error reading file:\n" + getSslErrors(false));
895
- }
896
- BIO_free(cert);
897
- return new Certificate(x);
898
- #endif
899
- }
900
-
901
- CertificatePtr
902
- Certificate::decode(const string& encoding)
903
- {
904
- #if defined(ICE_USE_SECURE_TRANSPORT)
905
- CFDataRef data = CFDataCreateWithBytesNoCopy(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(encoding.c_str()),
906
- encoding.size(), kCFAllocatorNull);
907
-
908
- SecExternalFormat format = kSecFormatUnknown;
909
- SecExternalItemType type = kSecItemTypeCertificate;
910
-
911
- SecItemImportExportKeyParameters params;
912
- memset(&params, 0, sizeof(params));
913
- params.version = SEC_KEY_IMPORT_EXPORT_PARAMS_VERSION;
914
-
915
- CFArrayRef items = 0;
916
- OSStatus err = SecItemImport(data, 0, &format, &type, 0, &params, 0, &items);
917
- CFRelease(data);
918
- if(err)
919
- {
920
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
921
- }
922
-
923
- SecKeychainItemRef item = (SecKeychainItemRef)CFArrayGetValueAtIndex(items, 0);
924
- CFRetain(item);
925
- CFRelease(items);
926
-
927
- assert(SecCertificateGetTypeID() == CFGetTypeID(item));
928
- return new Certificate((SecCertificateRef)item);
929
- #elif defined(ICE_USE_SCHANNEL)
930
- CERT_SIGNED_CONTENT_INFO* cert;
931
- loadCertificate(&cert, encoding.c_str(), static_cast<DWORD>(encoding.size()));
932
- return new Certificate(cert);
933
- #else
934
- BIO *cert = BIO_new_mem_buf(static_cast<void*>(const_cast<char*>(&encoding[0])), static_cast<int>(encoding.size()));
935
- X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
936
- if(x == NULL)
937
- {
938
- BIO_free(cert);
939
- throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false));
940
- }
941
- BIO_free(cert);
942
- return new Certificate(x);
943
- #endif
944
- }
945
-
946
- bool
947
- Certificate::operator==(const Certificate& other) const
948
- {
949
- #if defined(ICE_USE_SECURE_TRANSPORT)
950
- return CFEqual(_cert, other._cert);
951
- #elif defined(ICE_USE_SCHANNEL)
952
- return CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo);
953
- #else
954
- return X509_cmp(_cert, other._cert) == 0;
955
- #endif
956
- }
957
-
958
- bool
959
- Certificate::operator!=(const Certificate& other) const
960
- {
961
- #if defined(ICE_USE_SECURE_TRANSPORT)
962
- return !CFEqual(_cert, other._cert);
963
- #elif defined(ICE_USE_SCHANNEL)
964
- return !CertCompareCertificate(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, _certInfo, other._certInfo);
965
- #else
966
- return X509_cmp(_cert, other._cert) != 0;
967
- #endif
968
- }
969
-
970
- PublicKeyPtr
971
- Certificate::getPublicKey() const
972
- {
973
- #if defined(ICE_USE_SECURE_TRANSPORT)
974
- SecKeyRef key;
975
- OSStatus err = SecCertificateCopyPublicKey(_cert, &key);
976
- if(err)
977
- {
978
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
979
- }
980
- return new PublicKey(const_cast<Certificate*>(this), key);
981
- #elif defined(ICE_USE_SCHANNEL)
982
- return new PublicKey(const_cast<Certificate*>(this), &_certInfo->SubjectPublicKeyInfo);
983
- #else
984
- return new PublicKey(const_cast<Certificate*>(this), X509_get_pubkey(_cert));
985
- #endif
986
- }
987
-
988
- bool
989
- Certificate::verify(const CertificatePtr& cert) const
990
- {
991
- #if defined(ICE_USE_SECURE_TRANSPORT)
992
- //
993
- // We first check if the given certificate subject match
994
- // our certificate issuer. Otherwhise when use SecTrustEvaluate
995
- // and check a certificate against itself will always return
996
- // that is valid.
997
- //
998
- bool valid = false;
999
-
1000
- CFErrorRef error = 0;
1001
- CFDataRef issuer = 0;
1002
- CFDataRef subject = 0;
1003
-
1004
- try
1005
- {
1006
- issuer = SecCertificateCopyNormalizedIssuerContent(_cert, &error);
1007
- if(error)
1008
- {
1009
- throw CertificateEncodingException(__FILE__, __LINE__, error);
1010
- }
1011
-
1012
- subject = SecCertificateCopyNormalizedSubjectContent(cert->getCert(), &error);
1013
- if(error)
1014
- {
1015
- throw CertificateEncodingException(__FILE__, __LINE__, error);
1016
- }
1017
- }
1018
- catch(...)
1019
- {
1020
- if(issuer)
1021
- {
1022
- CFRelease(issuer);
1023
- }
1024
-
1025
- if(subject)
1026
- {
1027
- CFRelease(subject);
1028
- }
1029
- throw;
1030
- }
1031
-
1032
- //
1033
- // The certificate issuer must match the CA subject.
1034
- //
1035
- valid = CFEqual(issuer, subject);
1036
-
1037
- CFRelease(issuer);
1038
- CFRelease(subject);
1039
-
1040
- if(valid)
1041
- {
1042
- SecPolicyRef policy = 0;
1043
- SecTrustRef trust = 0;
1044
- try
1045
- {
1046
- SecPolicyRef policy = SecPolicyCreateBasicX509();
1047
- SecTrustResultType trustResult = kSecTrustResultInvalid;
1048
- SecTrustRef trust;
1049
- OSStatus err = 0;
1050
-
1051
- if((err = SecTrustCreateWithCertificates(_cert, policy, &trust)))
1052
- {
1053
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
1054
- }
1055
-
1056
- SecCertificateRef certs[1] = { cert->getCert() };
1057
-
1058
- CFArrayRef anchorCertificates = CFArrayCreate(kCFAllocatorDefault, (const void**)&certs, 1,
1059
- &kCFTypeArrayCallBacks);
1060
- err = SecTrustSetAnchorCertificates(trust, anchorCertificates);
1061
- CFRelease(anchorCertificates);
1062
-
1063
- if(err)
1064
- {
1065
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
1066
- }
1067
-
1068
- if((err = SecTrustEvaluate(trust, &trustResult)))
1069
- {
1070
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
1071
- }
1072
-
1073
- valid = trustResult == kSecTrustResultUnspecified;
1074
-
1075
- CFRelease(policy);
1076
- CFRelease(trust);
1077
- }
1078
- catch(...)
1079
- {
1080
- if(policy)
1081
- {
1082
- CFRelease(policy);
1083
- }
1084
-
1085
- if(trust)
1086
- {
1087
- CFRelease(trust);
1088
- }
1089
- throw;
1090
- }
1091
- }
1092
- return valid;
1093
- #elif defined(ICE_USE_SCHANNEL)
1094
- BYTE* buffer = 0;
1095
- DWORD length = 0;
1096
- if(!CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, _cert, CRYPT_ENCODE_ALLOC_FLAG , 0, &buffer, &length))
1097
- {
1098
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
1099
- }
1100
-
1101
- bool result = CryptVerifyCertificateSignature(0, X509_ASN_ENCODING, buffer, length, cert->getPublicKey()->key());
1102
- LocalFree(buffer);
1103
- return result;
1104
- #else
1105
- return X509_verify(_cert, cert->getPublicKey()->key()) > 0;
1106
- #endif
1107
- }
1108
-
1109
- #ifdef ICE_USE_OPENSSL
1110
- bool
1111
- Certificate::verify(const PublicKeyPtr& key) const
1112
- {
1113
- return X509_verify(_cert, key->key()) > 0;
1114
- }
1115
- #endif
1116
-
1117
- string
1118
- Certificate::encode() const
1119
- {
1120
- #if defined(ICE_USE_SECURE_TRANSPORT)
1121
- CFDataRef exported;
1122
- OSStatus err = SecItemExport(_cert, kSecFormatPEMSequence, kSecItemPemArmour, 0, &exported);
1123
- if(err != noErr)
1124
- {
1125
- throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
1126
- }
1127
- string data(reinterpret_cast<const char*>(CFDataGetBytePtr(exported)), CFDataGetLength(exported));
1128
- CFRelease(exported);
1129
- return data;
1130
- #elif defined(ICE_USE_SCHANNEL)
1131
- string s;
1132
- DWORD length = 0;
1133
- BYTE* buffer = 0;
1134
- try
1135
- {
1136
- if(!CryptEncodeObjectEx(X509_ASN_ENCODING, X509_CERT, _cert, CRYPT_ENCODE_ALLOC_FLAG , 0, &buffer, &length))
1137
- {
1138
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
1139
- }
1140
-
1141
- DWORD encodedLength = 0;
1142
- if(!CryptBinaryToString(buffer, length, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, 0, &encodedLength))
1143
- {
1144
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
1145
- }
1146
-
1147
- std::vector<char> encoded;
1148
- encoded.resize(encodedLength);
1149
- if(!CryptBinaryToString(buffer, length, CRYPT_STRING_BASE64HEADER | CRYPT_STRING_NOCR, &encoded[0],
1150
- &encodedLength))
1151
- {
1152
- throw CertificateEncodingException(__FILE__, __LINE__, IceUtilInternal::lastErrorToString());
1153
- }
1154
- LocalFree(buffer);
1155
- buffer = 0;
1156
- s.assign(&encoded[0]);
1157
- }
1158
- catch(...)
1159
- {
1160
- if(buffer)
1161
- {
1162
- LocalFree(buffer);
1163
- }
1164
- throw;
1165
- }
1166
- return s;
1167
- #else
1168
- BIO* out = BIO_new(BIO_s_mem());
1169
- int i = PEM_write_bio_X509_AUX(out, _cert);
1170
- if(i <= 0)
1171
- {
1172
- BIO_free(out);
1173
- throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false));
1174
- }
1175
- BUF_MEM* p;
1176
- BIO_get_mem_ptr(out, &p);
1177
- string result = string(p->data, p->length);
1178
- BIO_free(out);
1179
- return result;
1180
- #endif
1181
- }
1182
-
1183
- bool
1184
- Certificate::checkValidity() const
1185
- {
1186
- IceUtil::Time now = IceUtil::Time::now();
1187
- return now > getNotBefore() && now <= getNotAfter();
1188
- }
1189
-
1190
- bool
1191
- Certificate::checkValidity(const IceUtil::Time& now) const
1192
- {
1193
- return now > getNotBefore() && now <= getNotAfter();
1194
- }
1195
-
1196
- IceUtil::Time
1197
- Certificate::getNotAfter() const
1198
- {
1199
- #if defined(ICE_USE_SECURE_TRANSPORT)
1200
- return getX509Date(_cert, kSecOIDX509V1ValidityNotAfter);
1201
- #elif defined(ICE_USE_SCHANNEL)
1202
- return filetimeToTime(_certInfo->NotAfter);
1203
- #else
1204
- return ASMUtcTimeToIceUtilTime(X509_get_notAfter(_cert));
1205
- #endif
1206
- }
1207
-
1208
- IceUtil::Time
1209
- Certificate::getNotBefore() const
1210
- {
1211
- #if defined(ICE_USE_SECURE_TRANSPORT)
1212
- return getX509Date(_cert, kSecOIDX509V1ValidityNotBefore);
1213
- #elif defined(ICE_USE_SCHANNEL)
1214
- return filetimeToTime(_certInfo->NotBefore);
1215
- #else
1216
- return ASMUtcTimeToIceUtilTime(X509_get_notBefore(_cert));
1217
- #endif
1218
- }
1219
-
1220
- string
1221
- Certificate::getSerialNumber() const
1222
- {
1223
- #if defined(ICE_USE_SECURE_TRANSPORT)
1224
- return getX509String(_cert, kSecOIDX509V1SerialNumber);
1225
- #elif defined(ICE_USE_SCHANNEL)
1226
- ostringstream os;
1227
- for(int i = _certInfo->SerialNumber.cbData - 1; i >= 0; --i)
1228
- {
1229
- unsigned char c = _certInfo->SerialNumber.pbData[i];
1230
- os.fill('0');
1231
- os.width(2);
1232
- os << hex << (int)c;
1233
- if(i)
1234
- {
1235
- os << ' ';
1236
- }
1237
- }
1238
- return IceUtilInternal::toUpper(os.str());
1239
- #else
1240
- BIGNUM* bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(_cert), 0);
1241
- char* dec = BN_bn2dec(bn);
1242
- string result = dec;
1243
- OPENSSL_free(dec);
1244
- BN_free(bn);
1245
-
1246
- return result;
1247
- #endif
1248
- }
1249
-
1250
- //string
1251
- //Certificate::getSigAlgName() const
1252
- //{
1253
- //}
1254
-
1255
- //string
1256
- //Certificate::getSigAlgOID() const
1257
- //{
1258
- //}
1259
-
1260
- DistinguishedName
1261
- Certificate::getIssuerDN() const
1262
- {
1263
- #if defined(ICE_USE_SECURE_TRANSPORT)
1264
- return getX509Name(_cert, kSecOIDX509V1IssuerName);
1265
- #elif defined(ICE_USE_SCHANNEL)
1266
- return DistinguishedName(certNameToString(&_certInfo->Issuer));
1267
- #else
1268
- return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_issuer_name(_cert))));
1269
- #endif
1270
- }
1271
-
1272
- vector<pair<int, string> >
1273
- Certificate::getIssuerAlternativeNames()
1274
- {
1275
- #if defined(ICE_USE_SECURE_TRANSPORT)
1276
- return getX509AltName(_cert, kSecOIDIssuerAltName);
1277
- #elif defined(ICE_USE_SCHANNEL)
1278
- return certificateAltNames(_certInfo, szOID_ISSUER_ALT_NAME2);
1279
- #else
1280
- return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_issuer_alt_name, 0, 0)));
1281
- #endif
1282
- }
1283
-
1284
- DistinguishedName
1285
- Certificate::getSubjectDN() const
1286
- {
1287
- #if defined(ICE_USE_SECURE_TRANSPORT)
1288
- return getX509Name(_cert, kSecOIDX509V1SubjectName);
1289
- #elif defined(ICE_USE_SCHANNEL)
1290
- return DistinguishedName(certNameToString(&_certInfo->Subject));
1291
- #else
1292
- return DistinguishedName(RFC2253::parseStrict(convertX509NameToString(X509_get_subject_name(_cert))));
1293
- #endif
1294
- }
1295
-
1296
- vector<pair<int, string> >
1297
- Certificate::getSubjectAlternativeNames()
1298
- {
1299
- #if defined(ICE_USE_SECURE_TRANSPORT)
1300
- return getX509AltName(_cert, kSecOIDSubjectAltName);
1301
- #elif defined(ICE_USE_SCHANNEL)
1302
- return certificateAltNames(_certInfo, szOID_SUBJECT_ALT_NAME2);
1303
- #else
1304
- return convertGeneralNames(reinterpret_cast<GENERAL_NAMES*>(X509_get_ext_d2i(_cert, NID_subject_alt_name, 0, 0)));
1305
- #endif
1306
- }
1307
-
1308
- int
1309
- Certificate::getVersion() const
1310
- {
1311
- #if defined(ICE_USE_SECURE_TRANSPORT)
1312
- return atoi(getX509String(_cert, kSecOIDX509V1Version).c_str()) - 1;
1313
- #elif defined(ICE_USE_SCHANNEL)
1314
- return _certInfo->dwVersion;
1315
- #else
1316
- return static_cast<int>(X509_get_version(_cert));
1317
- #endif
1318
- }
1319
-
1320
- string
1321
- Certificate::toString() const
1322
- {
1323
- ostringstream os;
1324
- os << "serial: " << getSerialNumber() << "\n";
1325
- os << "issuer: " << string(getIssuerDN()) << "\n";
1326
- os << "subject: " << string(getSubjectDN()) << "\n";
1327
- os << "notBefore: " << getNotBefore().toDateTime() << "\n";
1328
- os << "notAfter: " << getNotAfter().toDateTime();
1329
- return os.str();
1330
- }
1331
-
1332
- X509CertificateRef
1333
- Certificate::getCert() const
1334
- {
1335
- return _cert;
1336
- }