rho-tau-extensions 6.0.0 → 7.4.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (296) hide show
  1. checksums.yaml +4 -4
  2. data/libs/android_net_native_prebuilt/ext/build +22 -0
  3. data/libs/android_net_native_prebuilt/ext/build.bat +44 -0
  4. data/libs/android_net_native_prebuilt/ext/platform/android/android_net_native.jar +0 -0
  5. data/libs/android_net_native_prebuilt/ext/platform/android/lib/aarch64/libandroid_net_native.a +0 -0
  6. data/libs/android_net_native_prebuilt/ext/platform/android/lib/armeabi/libandroid_net_native.a +0 -0
  7. data/libs/android_net_native_prebuilt/ext/platform/android/lib/x86/libandroid_net_native.a +0 -0
  8. data/libs/android_net_native_prebuilt/ext.yml +8 -0
  9. data/libs/crosswalk/ext/platform/android/Rakefile +19 -1
  10. data/libs/crosswalk/ext/platform/android/adds/lib/armeabi/libxwalkcore.so +0 -0
  11. data/libs/crosswalk/ext/platform/android/adds/lib/armeabi/libxwalkdummy.so +0 -0
  12. data/libs/crosswalk/ext/platform/android/adds/lib/armeabi/native_lib_placeholder.stamp +0 -0
  13. data/libs/crosswalk/ext/platform/android/adds/lib/x86/libxwalkcore.so +0 -0
  14. data/libs/crosswalk/ext/platform/android/adds/lib/x86/libxwalkdummy.so +0 -0
  15. data/libs/crosswalk/ext/platform/android/adds/lib/x86/native_lib_placeholder.stamp +0 -0
  16. data/libs/crosswalk/ext/platform/android/adds/lib/xwalk_core_library_java.jar +0 -0
  17. data/libs/crosswalk/ext/platform/android/adds/res/layout/dropdown_item.xml +1 -1
  18. data/libs/crosswalk/ext/platform/android/adds/res/layout-v17/dropdown_item.xml +2 -2
  19. data/libs/crosswalk/ext/platform/android/adds/res/menu/select_action_menu.xml +8 -8
  20. data/libs/crosswalk/ext/platform/android/adds/res/raw/icudtl.dat +0 -0
  21. data/libs/crosswalk/ext/platform/android/adds/res/raw/xwalk.pak +0 -0
  22. data/libs/crosswalk/ext/platform/android/adds/res/raw/xwalk_100_percent.pak +0 -0
  23. data/libs/crosswalk/ext/platform/android/adds/res/values/android_ui_strings.xml +1 -0
  24. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_attrs.xml → attrs.xml} +0 -0
  25. data/libs/crosswalk/ext/platform/android/adds/res/values/attrs_03.xml +18 -0
  26. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_colors.xml → colors_xwalk.xml} +0 -0
  27. data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_dimens.xml → dimens_03.xml} +1 -3
  28. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_dimens.xml → dimens_xwalk.xml} +0 -0
  29. data/libs/crosswalk/ext/platform/android/adds/res/values/ids_xwalk.xml +12 -0
  30. data/libs/crosswalk/ext/platform/android/adds/res/values/strings_00.xml +16 -0
  31. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_core_internal_java_strings.xml → strings_01.xml} +0 -0
  32. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_core_java_strings.xml → strings_02.xml} +0 -0
  33. data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_strings.xml → strings_03.xml} +0 -0
  34. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_styles.xml → styles_00.xml} +0 -0
  35. data/libs/crosswalk/ext/platform/android/adds/res/values/{ui_java_styles.xml → styles_03.xml} +0 -0
  36. data/libs/crosswalk/ext/platform/android/adds/res/values/{xwalk_values.xml → values_00.xml} +0 -0
  37. data/libs/crosswalk/ext/platform/android/adds/res/values/xwalk_app_strings.xml +7 -10
  38. data/libs/crosswalk/ext/platform/android/adds/res/values/xwalk_resources_list.xml +2 -1
  39. data/libs/crosswalk/ext/platform/android/adds/res/values-am/android_ui_strings.xml +1 -0
  40. data/libs/crosswalk/ext/platform/android/adds/res/values-ar/android_ui_strings.xml +1 -0
  41. data/libs/crosswalk/ext/platform/android/adds/res/values-bg/android_ui_strings.xml +1 -0
  42. data/libs/crosswalk/ext/platform/android/adds/res/values-ca/android_ui_strings.xml +1 -0
  43. data/libs/crosswalk/ext/platform/android/adds/res/values-cs/android_ui_strings.xml +1 -0
  44. data/libs/crosswalk/ext/platform/android/adds/res/values-da/android_ui_strings.xml +4 -3
  45. data/libs/crosswalk/ext/platform/android/adds/res/values-de/android_ui_strings.xml +1 -0
  46. data/libs/crosswalk/ext/platform/android/adds/res/values-el/android_ui_strings.xml +1 -0
  47. data/libs/crosswalk/ext/platform/android/adds/res/values-en-rGB/android_ui_strings.xml +1 -0
  48. data/libs/crosswalk/ext/platform/android/adds/res/values-es/android_ui_strings.xml +1 -0
  49. data/libs/crosswalk/ext/platform/android/adds/res/values-es-rUS/android_ui_strings.xml +1 -0
  50. data/libs/crosswalk/ext/platform/android/adds/res/values-fa/android_ui_strings.xml +2 -1
  51. data/libs/crosswalk/ext/platform/android/adds/res/values-fi/android_ui_strings.xml +1 -0
  52. data/libs/crosswalk/ext/platform/android/adds/res/values-fr/android_ui_strings.xml +1 -0
  53. data/libs/crosswalk/ext/platform/android/adds/res/values-hi/android_ui_strings.xml +2 -1
  54. data/libs/crosswalk/ext/platform/android/adds/res/values-hr/android_ui_strings.xml +1 -0
  55. data/libs/crosswalk/ext/platform/android/adds/res/values-hu/android_ui_strings.xml +1 -0
  56. data/libs/crosswalk/ext/platform/android/adds/res/values-in/android_ui_strings.xml +1 -0
  57. data/libs/crosswalk/ext/platform/android/adds/res/values-it/android_ui_strings.xml +1 -0
  58. data/libs/crosswalk/ext/platform/android/adds/res/values-iw/android_ui_strings.xml +1 -0
  59. data/libs/crosswalk/ext/platform/android/adds/res/values-ja/android_ui_strings.xml +1 -0
  60. data/libs/crosswalk/ext/platform/android/adds/res/values-ko/android_ui_strings.xml +1 -0
  61. data/libs/crosswalk/ext/platform/android/adds/res/values-lt/android_ui_strings.xml +1 -0
  62. data/libs/crosswalk/ext/platform/android/adds/res/values-lv/android_ui_strings.xml +1 -0
  63. data/libs/crosswalk/ext/platform/android/adds/res/values-nb/android_ui_strings.xml +1 -0
  64. data/libs/crosswalk/ext/platform/android/adds/res/values-nl/android_ui_strings.xml +1 -0
  65. data/libs/crosswalk/ext/platform/android/adds/res/values-pl/android_ui_strings.xml +1 -0
  66. data/libs/crosswalk/ext/platform/android/adds/res/values-pt-rBR/android_ui_strings.xml +1 -0
  67. data/libs/crosswalk/ext/platform/android/adds/res/values-pt-rPT/android_ui_strings.xml +1 -0
  68. data/libs/crosswalk/ext/platform/android/adds/res/values-ro/android_ui_strings.xml +1 -0
  69. data/libs/crosswalk/ext/platform/android/adds/res/values-ru/android_ui_strings.xml +1 -0
  70. data/libs/crosswalk/ext/platform/android/adds/res/values-sk/android_ui_strings.xml +1 -0
  71. data/libs/crosswalk/ext/platform/android/adds/res/values-sl/android_ui_strings.xml +1 -0
  72. data/libs/crosswalk/ext/platform/android/adds/res/values-sr/android_ui_strings.xml +1 -0
  73. data/libs/crosswalk/ext/platform/android/adds/res/values-sv/android_ui_strings.xml +1 -0
  74. data/libs/crosswalk/ext/platform/android/adds/res/values-sw/android_ui_strings.xml +2 -1
  75. data/libs/crosswalk/ext/platform/android/adds/res/values-th/android_ui_strings.xml +1 -0
  76. data/libs/crosswalk/ext/platform/android/adds/res/values-tl/android_ui_strings.xml +1 -0
  77. data/libs/crosswalk/ext/platform/android/adds/res/values-tr/android_ui_strings.xml +1 -0
  78. data/libs/crosswalk/ext/platform/android/adds/res/values-uk/android_ui_strings.xml +1 -0
  79. data/libs/crosswalk/ext/platform/android/adds/res/values-v17/{ui_java_styles.xml → styles_03.xml} +0 -0
  80. data/libs/crosswalk/ext/platform/android/adds/res/values-v21/{ui_java_styles.xml → styles_03.xml} +0 -0
  81. data/libs/crosswalk/ext/platform/android/adds/res/values-vi/android_ui_strings.xml +1 -0
  82. data/libs/crosswalk/ext/platform/android/adds/res/values-zh-rCN/android_ui_strings.xml +1 -0
  83. data/libs/crosswalk/ext/platform/android/adds/res/values-zh-rTW/android_ui_strings.xml +1 -0
  84. data/libs/crosswalk/ext/platform/android/src/com/tautechnologies/tau/crosswalk/TauXWalkWebView.java +18 -1
  85. data/libs/enterprise-barcode/ext/platform/android/adds/lib/aarch64/liballbarcode.a +0 -0
  86. data/libs/enterprise-barcode/ext/platform/android/adds/lib/armeabi/liballbarcode.a +0 -0
  87. data/libs/enterprise-barcode/ext/platform/android/adds/lib/x86/liballbarcode.a +0 -0
  88. data/libs/enterprise-barcode/ext/platform/android/allbarcode.jar +0 -0
  89. data/libs/enterprise-barcode/ext/platform/iphone/Barcode.xcodeproj/project.pbxproj +8 -4
  90. data/libs/enterprise-barcode/ext/platform/iphone/Rakefile +9 -58
  91. data/libs/fcm-push-18/ext/android/AndroidManifest.rb +10 -0
  92. data/libs/fcm-push-18/ext/android/ApplicationManifestAdds.erb +39 -0
  93. data/libs/fcm-push-18/ext/android/Rakefile +187 -0
  94. data/libs/fcm-push-18/ext/android/ext_java.files +3 -0
  95. data/libs/fcm-push-18/ext/android/ext_native.files +1 -0
  96. data/libs/fcm-push-18/ext/android/jni/src/fcmpushclient.cpp +215 -0
  97. data/libs/fcm-push-18/ext/android/jni/src/fcmpushclient.h +74 -0
  98. data/libs/fcm-push-18/ext/android/res/res/values/fireBaseValues.xml +5 -0
  99. data/libs/fcm-push-18/ext/android/src/com/rhomobile/rhodes/fcm/FCMFacade.java +164 -0
  100. data/libs/fcm-push-18/ext/android/src/com/rhomobile/rhodes/fcm/FCMIntentService.java +219 -0
  101. data/libs/fcm-push-18/ext/android/src/com/rhomobile/rhodes/fcm/FCMListener.java +88 -0
  102. data/libs/fcm-push-18/ext/build +16 -0
  103. data/libs/fcm-push-18/ext/build.bat +8 -0
  104. data/libs/fcm-push-18/ext/fcm.xml +9 -0
  105. data/libs/fcm-push-18/ext/iphone/ApplePush_Prefix.pch +7 -0
  106. data/libs/fcm-push-18/ext/iphone/Firebase.h +68 -0
  107. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/FirebaseAnalytics +0 -0
  108. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalytics+AppDelegate.h +62 -0
  109. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalytics.h +115 -0
  110. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalyticsConfiguration.h +1 -0
  111. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRAnalyticsSwiftNameSupport.h +13 -0
  112. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRApp.h +1 -0
  113. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRConfiguration.h +1 -0
  114. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIREventNames.h +389 -0
  115. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIROptions.h +1 -0
  116. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRParameterNames.h +485 -0
  117. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FIRUserPropertyNames.h +15 -0
  118. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Headers/FirebaseAnalytics.h +10 -0
  119. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseAnalytics.framework/Modules/module.modulemap +10 -0
  120. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/FirebaseCore +0 -0
  121. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FIRAnalyticsConfiguration.h +52 -0
  122. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FIRApp.h +130 -0
  123. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FIRConfiguration.h +78 -0
  124. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FIRLoggerLevel.h +35 -0
  125. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FIROptions.h +133 -0
  126. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Headers/FirebaseCore.h +5 -0
  127. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCore.framework/Modules/module.modulemap +7 -0
  128. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCoreDiagnostics.framework/FirebaseCoreDiagnostics +0 -0
  129. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseCoreDiagnostics.framework/Modules/module.modulemap +6 -0
  130. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseInstanceID.framework/FirebaseInstanceID +0 -0
  131. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseInstanceID.framework/Headers/FIRInstanceID.h +276 -0
  132. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseInstanceID.framework/Headers/FirebaseInstanceID.h +1 -0
  133. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseInstanceID.framework/Modules/module.modulemap +7 -0
  134. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseMessaging.framework/FirebaseMessaging +0 -0
  135. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseMessaging.framework/Headers/FIRMessaging.h +508 -0
  136. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseMessaging.framework/Headers/FirebaseMessaging.h +1 -0
  137. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseMessaging.framework/Modules/module.modulemap +8 -0
  138. data/libs/fcm-push-18/ext/iphone/Frameworks/FirebaseNanoPB.framework/FirebaseNanoPB +0 -0
  139. data/libs/fcm-push-18/ext/iphone/Frameworks/GoogleToolboxForMac.framework/GoogleToolboxForMac +0 -0
  140. data/libs/fcm-push-18/ext/iphone/Frameworks/GoogleToolboxForMac.framework/Modules/module.modulemap +5 -0
  141. data/libs/fcm-push-18/ext/iphone/Frameworks/Protobuf.framework/Modules/module.modulemap +5 -0
  142. data/libs/fcm-push-18/ext/iphone/Frameworks/Protobuf.framework/Protobuf +0 -0
  143. data/libs/fcm-push-18/ext/iphone/Frameworks/nanopb.framework/Modules/module.modulemap +5 -0
  144. data/libs/fcm-push-18/ext/iphone/Frameworks/nanopb.framework/nanopb +0 -0
  145. data/libs/fcm-push-18/ext/iphone/Rakefile +30 -0
  146. data/libs/fcm-push-18/ext/iphone/fcm-push.xcodeproj/project.pbxproj +370 -0
  147. data/libs/fcm-push-18/ext/iphone/impl/PushNotificationsReceiver.h +28 -0
  148. data/libs/fcm-push-18/ext/iphone/impl/PushNotificationsReceiver.m +27 -0
  149. data/libs/fcm-push-18/ext/iphone/impl/PushNotificationsReceiver.mm +234 -0
  150. data/libs/fcm-push-18/ext/iphone/impl/applePushSetup.c +10 -0
  151. data/libs/fcm-push-18/ext/iphone/impl/applepushclient.h +69 -0
  152. data/libs/fcm-push-18/ext/iphone/impl/applepushclient.mm +164 -0
  153. data/libs/fcm-push-18/ext/iphone/impl/readme.txt +7 -0
  154. data/libs/fcm-push-18/ext/platform/iphone/impl/readme.txt +7 -0
  155. data/libs/fcm-push-18/ext.yml +20 -0
  156. data/libs/nodejs/ext/platform/android/jxCore/jx.h +17 -1
  157. data/libs/nodejs/ext/platform/android/jxCore/libcares_arm.a +0 -0
  158. data/libs/nodejs/ext/platform/android/jxCore/libcares_ia32.a +0 -0
  159. data/libs/nodejs/ext/platform/android/jxCore/libcares_x64.a +0 -0
  160. data/libs/nodejs/ext/platform/android/jxCore/libchrome_zlib_arm.a +0 -0
  161. data/libs/nodejs/ext/platform/android/jxCore/libchrome_zlib_ia32.a +0 -0
  162. data/libs/nodejs/ext/platform/android/jxCore/libchrome_zlib_x64.a +0 -0
  163. data/libs/nodejs/ext/platform/android/jxCore/libhttp_parser_arm.a +0 -0
  164. data/libs/nodejs/ext/platform/android/jxCore/libhttp_parser_ia32.a +0 -0
  165. data/libs/nodejs/ext/platform/android/jxCore/libhttp_parser_x64.a +0 -0
  166. data/libs/nodejs/ext/platform/android/jxCore/libjx_arm.a +0 -0
  167. data/libs/nodejs/ext/platform/android/jxCore/libjx_ia32.a +0 -0
  168. data/libs/nodejs/ext/platform/android/jxCore/libjx_x64.a +0 -0
  169. data/libs/nodejs/ext/platform/android/jxCore/libopenssl_arm.a +0 -0
  170. data/libs/nodejs/ext/platform/android/jxCore/libopenssl_ia32.a +0 -0
  171. data/libs/nodejs/ext/platform/android/jxCore/libopenssl_x64.a +0 -0
  172. data/libs/nodejs/ext/platform/android/jxCore/libsqlite3_arm.a +0 -0
  173. data/libs/nodejs/ext/platform/android/jxCore/libsqlite3_ia32.a +0 -0
  174. data/libs/nodejs/ext/platform/android/jxCore/libsqlite3_x64.a +0 -0
  175. data/libs/nodejs/ext/platform/android/jxCore/libuv_arm.a +0 -0
  176. data/libs/nodejs/ext/platform/android/jxCore/libuv_ia32.a +0 -0
  177. data/libs/nodejs/ext/platform/android/jxCore/libuv_x64.a +0 -0
  178. data/libs/nodejs/ext/platform/android/jxCore/libv8_base_arm.a +0 -0
  179. data/libs/nodejs/ext/platform/android/jxCore/libv8_base_ia32.a +0 -0
  180. data/libs/nodejs/ext/platform/android/jxCore/libv8_base_x64.a +0 -0
  181. data/libs/nodejs/ext/platform/android/jxCore/libv8_nosnapshot_arm.a +0 -0
  182. data/libs/nodejs/ext/platform/android/jxCore/libv8_nosnapshot_ia32.a +0 -0
  183. data/libs/nodejs/ext/platform/android/jxCore/libv8_nosnapshot_x64.a +0 -0
  184. data/libs/nodejs/ext/platform/iphone/Nodejs.xcodeproj/project.pbxproj +8 -4
  185. data/libs/nodejs/ext/platform/iphone/Rakefile +9 -62
  186. data/libs/nodejs/ext/platform/iphone/jxCore/jx.h +17 -1
  187. data/libs/nodejs/ext/platform/iphone/jxCore/libcares.a +0 -0
  188. data/libs/nodejs/ext/platform/iphone/jxCore/libchrome_zlib.a +0 -0
  189. data/libs/nodejs/ext/platform/iphone/jxCore/libhttp_parser.a +0 -0
  190. data/libs/nodejs/ext/platform/iphone/jxCore/libjx.a +0 -0
  191. data/libs/nodejs/ext/platform/iphone/jxCore/libmozjs.a +0 -0
  192. data/libs/nodejs/ext/platform/iphone/jxCore/libopenssl.a +0 -0
  193. data/libs/nodejs/ext/platform/iphone/jxCore/libsqlite3.a +0 -0
  194. data/libs/nodejs/ext/platform/iphone/jxCore/libuv.a +0 -0
  195. data/libs/openssl.so-edge/ext/android/armeabi/libcrypto.a +0 -0
  196. data/libs/openssl.so-edge/ext/android/armeabi/libssl.a +0 -0
  197. data/libs/openssl.so-edge/ext/android/x86/libcrypto.a +0 -0
  198. data/libs/openssl.so-edge/ext/android/x86/libssl.a +0 -0
  199. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/asn1t.h +19 -0
  200. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/dso.h +23 -0
  201. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/internal/thread_once.h +5 -2
  202. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/asn1.h +5 -2
  203. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/asn1t.h +5 -0
  204. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/bio.h +9 -12
  205. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/bn.h +1 -1
  206. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/buffer.h +1 -4
  207. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/conf.h +1 -0
  208. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/crypto.h +5 -1
  209. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ct.h +17 -2
  210. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/dh.h +24 -6
  211. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/dsa.h +1 -0
  212. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/e_os2.h +3 -16
  213. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ec.h +7 -12
  214. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/engine.h +0 -2
  215. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/err.h +3 -2
  216. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/evp.h +11 -1
  217. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/lhash.h +13 -0
  218. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/objects.h +2 -2
  219. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ocsp.h +3 -16
  220. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/opensslconf.h +20 -8
  221. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/opensslv.h +3 -3
  222. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/rsa.h +2 -0
  223. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/seed.h +1 -3
  224. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/srtp.h +1 -1
  225. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ssl.h +85 -52
  226. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ssl3.h +4 -1
  227. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/tls1.h +6 -6
  228. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/ui.h +10 -0
  229. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509.h +1 -1
  230. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509_vfy.h +5 -0
  231. data/libs/openssl.so-edge/ext/openssl-1-1-0-stable/include/openssl/x509v3.h +1 -0
  232. data/libs/rexml-edge/rexml/attlistdecl.rb +63 -0
  233. data/libs/rexml-edge/rexml/attribute.rb +192 -0
  234. data/libs/rexml-edge/rexml/cdata.rb +68 -0
  235. data/libs/rexml-edge/rexml/child.rb +97 -0
  236. data/libs/rexml-edge/rexml/comment.rb +80 -0
  237. data/libs/rexml-edge/rexml/doctype.rb +270 -0
  238. data/libs/rexml-edge/rexml/document.rb +291 -0
  239. data/libs/rexml-edge/rexml/dtd/attlistdecl.rb +11 -0
  240. data/libs/rexml-edge/rexml/dtd/dtd.rb +47 -0
  241. data/libs/rexml-edge/rexml/dtd/elementdecl.rb +18 -0
  242. data/libs/rexml-edge/rexml/dtd/entitydecl.rb +57 -0
  243. data/libs/rexml-edge/rexml/dtd/notationdecl.rb +40 -0
  244. data/libs/rexml-edge/rexml/element.rb +1241 -0
  245. data/libs/rexml-edge/rexml/encoding.rb +51 -0
  246. data/libs/rexml-edge/rexml/entity.rb +174 -0
  247. data/libs/rexml-edge/rexml/formatters/default.rb +112 -0
  248. data/libs/rexml-edge/rexml/formatters/pretty.rb +142 -0
  249. data/libs/rexml-edge/rexml/formatters/transitive.rb +58 -0
  250. data/libs/rexml-edge/rexml/functions.rb +418 -0
  251. data/libs/rexml-edge/rexml/instruction.rb +71 -0
  252. data/libs/rexml-edge/rexml/light/node.rb +196 -0
  253. data/libs/rexml-edge/rexml/namespace.rb +48 -0
  254. data/libs/rexml-edge/rexml/node.rb +76 -0
  255. data/libs/rexml-edge/rexml/output.rb +30 -0
  256. data/libs/rexml-edge/rexml/parent.rb +166 -0
  257. data/libs/rexml-edge/rexml/parseexception.rb +52 -0
  258. data/libs/rexml-edge/rexml/parsers/baseparser.rb +533 -0
  259. data/libs/rexml-edge/rexml/parsers/lightparser.rb +59 -0
  260. data/libs/rexml-edge/rexml/parsers/pullparser.rb +197 -0
  261. data/libs/rexml-edge/rexml/parsers/sax2parser.rb +273 -0
  262. data/libs/rexml-edge/rexml/parsers/streamparser.rb +61 -0
  263. data/libs/rexml-edge/rexml/parsers/treeparser.rb +101 -0
  264. data/libs/rexml-edge/rexml/parsers/ultralightparser.rb +57 -0
  265. data/libs/rexml-edge/rexml/parsers/xpathparser.rb +657 -0
  266. data/libs/rexml-edge/rexml/quickpath.rb +266 -0
  267. data/libs/rexml-edge/rexml/rexml.rb +32 -0
  268. data/libs/rexml-edge/rexml/sax2listener.rb +98 -0
  269. data/libs/rexml-edge/rexml/security.rb +28 -0
  270. data/libs/rexml-edge/rexml/source.rb +297 -0
  271. data/libs/rexml-edge/rexml/streamlistener.rb +93 -0
  272. data/libs/rexml-edge/rexml/syncenumerator.rb +33 -0
  273. data/libs/rexml-edge/rexml/text.rb +426 -0
  274. data/libs/rexml-edge/rexml/undefinednamespaceexception.rb +9 -0
  275. data/libs/rexml-edge/rexml/validation/relaxng.rb +539 -0
  276. data/libs/rexml-edge/rexml/validation/validation.rb +144 -0
  277. data/libs/rexml-edge/rexml/validation/validationexception.rb +10 -0
  278. data/libs/rexml-edge/rexml/xmldecl.rb +116 -0
  279. data/libs/rexml-edge/rexml/xmltokens.rb +85 -0
  280. data/libs/rexml-edge/rexml/xpath.rb +81 -0
  281. data/libs/rexml-edge/rexml/xpath_parser.rb +704 -0
  282. data/version +1 -1
  283. metadata +144 -27
  284. data/libs/crosswalk/ext/platform/android/adds/res/drawable/launchscreen_bg.xml +0 -19
  285. data/libs/crosswalk/ext/platform/android/adds/res/drawable-hdpi/crosswalk.png +0 -0
  286. data/libs/crosswalk/ext/platform/android/adds/res/drawable-ldpi/crosswalk.png +0 -0
  287. data/libs/crosswalk/ext/platform/android/adds/res/drawable-mdpi/crosswalk.png +0 -0
  288. data/libs/crosswalk/ext/platform/android/adds/res/drawable-xhdpi/crosswalk.png +0 -0
  289. data/libs/crosswalk/ext/platform/android/adds/res/layout/autofill_suggestion_item.xml +0 -7
  290. data/libs/crosswalk/ext/platform/android/adds/res/layout-v17/autofill_suggestion_item.xml +0 -18
  291. data/libs/crosswalk/ext/platform/android/adds/res/raw/contacts_api.js +0 -206
  292. data/libs/crosswalk/ext/platform/android/adds/res/raw/device_capabilities_api.js +0 -231
  293. data/libs/crosswalk/ext/platform/android/adds/res/raw/messaging_api.js +0 -359
  294. data/libs/crosswalk/ext/platform/android/adds/res/raw/presentation_api.js +0 -144
  295. data/libs/crosswalk/ext/platform/android/adds/res/values/ui_java_attrs.xml +0 -9
  296. data/libs/crosswalk/ext/platform/android/adds/res/values-v14/theme.xml +0 -16
@@ -625,8 +625,8 @@ ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t);
625
625
  ASN1_TIME *ASN1_TIME_adj(ASN1_TIME *s, time_t t,
626
626
  int offset_day, long offset_sec);
627
627
  int ASN1_TIME_check(const ASN1_TIME *t);
628
- ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME
629
- **out);
628
+ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(const ASN1_TIME *t,
629
+ ASN1_GENERALIZEDTIME **out);
630
630
  int ASN1_TIME_set_string(ASN1_TIME *s, const char *str);
631
631
 
632
632
  int i2a_ASN1_INTEGER(BIO *bp, const ASN1_INTEGER *a);
@@ -946,6 +946,7 @@ int ERR_load_ASN1_strings(void);
946
946
  # define ASN1_F_C2I_ASN1_INTEGER 194
947
947
  # define ASN1_F_C2I_ASN1_OBJECT 196
948
948
  # define ASN1_F_C2I_IBUF 226
949
+ # define ASN1_F_C2I_UINT64_INT 101
949
950
  # define ASN1_F_COLLECT_DATA 140
950
951
  # define ASN1_F_D2I_ASN1_OBJECT 147
951
952
  # define ASN1_F_D2I_ASN1_UINTEGER 150
@@ -971,6 +972,8 @@ int ERR_load_ASN1_strings(void);
971
972
  # define ASN1_F_SMIME_READ_ASN1 212
972
973
  # define ASN1_F_SMIME_TEXT 213
973
974
  # define ASN1_F_STBL_MODULE_INIT 223
975
+ # define ASN1_F_UINT32_C2I 105
976
+ # define ASN1_F_UINT64_C2I 112
974
977
  # define ASN1_F_X509_CRL_ADD0_REVOKED 169
975
978
  # define ASN1_F_X509_INFO_NEW 170
976
979
  # define ASN1_F_X509_NAME_ENCODE 203
@@ -346,17 +346,22 @@ extern "C" {
346
346
 
347
347
  /* OPTIONAL simple type */
348
348
  # define ASN1_OPT(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL, 0, stname, field, type)
349
+ # define ASN1_OPT_EMBED(stname, field, type) ASN1_EX_TYPE(ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED, 0, stname, field, type)
349
350
 
350
351
  /* IMPLICIT tagged simple type */
351
352
  # define ASN1_IMP(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, 0)
353
+ # define ASN1_IMP_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
352
354
 
353
355
  /* IMPLICIT tagged OPTIONAL simple type */
354
356
  # define ASN1_IMP_OPT(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
357
+ # define ASN1_IMP_OPT_EMBED(stname, field, type, tag) ASN1_IMP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
355
358
 
356
359
  /* Same as above but EXPLICIT */
357
360
 
358
361
  # define ASN1_EXP(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, 0)
362
+ # define ASN1_EXP_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_EMBED)
359
363
  # define ASN1_EXP_OPT(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL)
364
+ # define ASN1_EXP_OPT_EMBED(stname, field, type, tag) ASN1_EXP_EX(stname, field, type, tag, ASN1_TFLG_OPTIONAL|ASN1_TFLG_EMBED)
360
365
 
361
366
  /* SEQUENCE OF type */
362
367
  # define ASN1_SEQUENCE_OF(stname, field, type) \
@@ -20,11 +20,7 @@
20
20
  # include <openssl/crypto.h>
21
21
 
22
22
  # ifndef OPENSSL_NO_SCTP
23
- # ifndef OPENSSL_SYS_VMS
24
- # include <stdint.h>
25
- # else
26
- # include <inttypes.h>
27
- # endif
23
+ # include <openssl/e_os2.h>
28
24
  # endif
29
25
 
30
26
  #ifdef __cplusplus
@@ -129,11 +125,10 @@ extern "C" {
129
125
 
130
126
  # define BIO_CTRL_DGRAM_GET_MTU_OVERHEAD 49
131
127
 
132
- # define BIO_CTRL_DGRAM_SET_PEEK_MODE 50
133
-
128
+ /* Deliberately outside of OPENSSL_NO_SCTP - used in bss_dgram.c */
129
+ # define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
134
130
  # ifndef OPENSSL_NO_SCTP
135
131
  /* SCTP stuff */
136
- # define BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE 50
137
132
  # define BIO_CTRL_DGRAM_SCTP_ADD_AUTH_KEY 51
138
133
  # define BIO_CTRL_DGRAM_SCTP_NEXT_AUTH_KEY 52
139
134
  # define BIO_CTRL_DGRAM_SCTP_AUTH_CCS_RCVD 53
@@ -146,6 +141,8 @@ extern "C" {
146
141
  # define BIO_CTRL_DGRAM_SCTP_SAVE_SHUTDOWN 70
147
142
  # endif
148
143
 
144
+ # define BIO_CTRL_DGRAM_SET_PEEK_MODE 71
145
+
149
146
  /* modifiers */
150
147
  # define BIO_FP_READ 0x02
151
148
  # define BIO_FP_WRITE 0x04
@@ -170,7 +167,7 @@ extern "C" {
170
167
  /*
171
168
  * This is used with memory BIOs:
172
169
  * BIO_FLAGS_MEM_RDONLY means we shouldn't free up or change the data in any way;
173
- * BIO_FLAGS_NONCLEAR_RST means we should't clear data on reset.
170
+ * BIO_FLAGS_NONCLEAR_RST means we shouldn't clear data on reset.
174
171
  */
175
172
  # define BIO_FLAGS_MEM_RDONLY 0x200
176
173
  # define BIO_FLAGS_NONCLEAR_RST 0x400
@@ -365,9 +362,9 @@ struct bio_dgram_sctp_prinfo {
365
362
  # define BIO_set_conn_port(b,port) BIO_ctrl(b,BIO_C_SET_CONNECT,1,(char *)port)
366
363
  # define BIO_set_conn_address(b,addr) BIO_ctrl(b,BIO_C_SET_CONNECT,2,(char *)addr)
367
364
  # define BIO_set_conn_ip_family(b,f) BIO_int_ctrl(b,BIO_C_SET_CONNECT,3,f)
368
- # define BIO_get_conn_hostname(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0,NULL))
369
- # define BIO_get_conn_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1,NULL))
370
- # define BIO_get_conn_address(b) ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2,NULL))
365
+ # define BIO_get_conn_hostname(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,0))
366
+ # define BIO_get_conn_port(b) ((const char *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,1))
367
+ # define BIO_get_conn_address(b) ((const BIO_ADDR *)BIO_ptr_ctrl(b,BIO_C_GET_CONNECT,2))
371
368
  # define BIO_get_conn_ip_family(b) BIO_ctrl(b,BIO_C_GET_CONNECT,3,NULL)
372
369
  # define BIO_set_conn_mode(b,n) BIO_ctrl(b,BIO_C_SET_CONNECT_MODE,(n),NULL)
373
370
 
@@ -196,7 +196,7 @@ int BN_sqr(BIGNUM *r, const BIGNUM *a, BN_CTX *ctx);
196
196
  */
197
197
  void BN_set_negative(BIGNUM *b, int n);
198
198
  /** BN_is_negative returns 1 if the BIGNUM is negative
199
- * \param a pointer to the BIGNUM object
199
+ * \param b pointer to the BIGNUM object
200
200
  * \return 1 if a < 0 and 0 otherwise
201
201
  */
202
202
  int BN_is_negative(const BIGNUM *b);
@@ -21,10 +21,7 @@ extern "C" {
21
21
  #endif
22
22
 
23
23
  # include <stddef.h>
24
-
25
- # if !defined(NO_SYS_TYPES_H)
26
- # include <sys/types.h>
27
- # endif
24
+ # include <sys/types.h>
28
25
 
29
26
  /*
30
27
  * These names are outdated as of OpenSSL 1.1; a future release
@@ -208,6 +208,7 @@ int ERR_load_CONF_strings(void);
208
208
  # define CONF_R_NO_VALUE 108
209
209
  # define CONF_R_UNABLE_TO_CREATE_NEW_SECTION 103
210
210
  # define CONF_R_UNKNOWN_MODULE_NAME 113
211
+ # define CONF_R_VARIABLE_EXPANSION_TOO_LONG 116
211
212
  # define CONF_R_VARIABLE_HAS_NO_VALUE 104
212
213
 
213
214
  # ifdef __cplusplus
@@ -146,6 +146,8 @@ int CRYPTO_mem_ctrl(int mode);
146
146
  CRYPTO_secure_zalloc(num, OPENSSL_FILE, OPENSSL_LINE)
147
147
  # define OPENSSL_secure_free(addr) \
148
148
  CRYPTO_secure_free(addr, OPENSSL_FILE, OPENSSL_LINE)
149
+ # define OPENSSL_secure_clear_free(addr, num) \
150
+ CRYPTO_secure_clear_free(addr, num, OPENSSL_FILE, OPENSSL_LINE)
149
151
  # define OPENSSL_secure_actual_size(ptr) \
150
152
  CRYPTO_secure_actual_size(ptr)
151
153
 
@@ -174,7 +176,7 @@ typedef void CRYPTO_EX_new (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
174
176
  typedef void CRYPTO_EX_free (void *parent, void *ptr, CRYPTO_EX_DATA *ad,
175
177
  int idx, long argl, void *argp);
176
178
  typedef int CRYPTO_EX_dup (CRYPTO_EX_DATA *to, const CRYPTO_EX_DATA *from,
177
- void *srcp, int idx, long argl, void *argp);
179
+ void *from_d, int idx, long argl, void *argp);
178
180
  __owur int CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
179
181
  CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
180
182
  CRYPTO_EX_free *free_func);
@@ -285,6 +287,8 @@ int CRYPTO_secure_malloc_done(void);
285
287
  void *CRYPTO_secure_malloc(size_t num, const char *file, int line);
286
288
  void *CRYPTO_secure_zalloc(size_t num, const char *file, int line);
287
289
  void CRYPTO_secure_free(void *ptr, const char *file, int line);
290
+ void CRYPTO_secure_clear_free(void *ptr, size_t num,
291
+ const char *file, int line);
288
292
  int CRYPTO_secure_allocated(const void *ptr);
289
293
  int CRYPTO_secure_malloc_initialized(void);
290
294
  size_t CRYPTO_secure_actual_size(void *ptr);
@@ -98,6 +98,21 @@ const CTLOG_STORE *CT_POLICY_EVAL_CTX_get0_log_store(const CT_POLICY_EVAL_CTX *c
98
98
  void CT_POLICY_EVAL_CTX_set_shared_CTLOG_STORE(CT_POLICY_EVAL_CTX *ctx,
99
99
  CTLOG_STORE *log_store);
100
100
 
101
+ /*
102
+ * Gets the time, in milliseconds since the Unix epoch, that will be used as the
103
+ * current time when checking whether an SCT was issued in the future.
104
+ * Such SCTs will fail validation, as required by RFC6962.
105
+ */
106
+ uint64_t CT_POLICY_EVAL_CTX_get_time(const CT_POLICY_EVAL_CTX *ctx);
107
+
108
+ /*
109
+ * Sets the time to evaluate SCTs against, in milliseconds since the Unix epoch.
110
+ * If an SCT's timestamp is after this time, it will be interpreted as having
111
+ * been issued in the future. RFC6962 states that "TLS clients MUST reject SCTs
112
+ * whose timestamp is in the future", so an SCT will not validate in this case.
113
+ */
114
+ void CT_POLICY_EVAL_CTX_set_time(CT_POLICY_EVAL_CTX *ctx, uint64_t time_in_ms);
115
+
101
116
  /*****************
102
117
  * SCT functions *
103
118
  *****************/
@@ -467,7 +482,6 @@ int ERR_load_CT_strings(void);
467
482
  # define CT_F_CTLOG_NEW 117
468
483
  # define CT_F_CTLOG_NEW_FROM_BASE64 118
469
484
  # define CT_F_CTLOG_NEW_FROM_CONF 119
470
- # define CT_F_CTLOG_NEW_NULL 120
471
485
  # define CT_F_CTLOG_STORE_LOAD_CTX_NEW 122
472
486
  # define CT_F_CTLOG_STORE_LOAD_FILE 123
473
487
  # define CT_F_CTLOG_STORE_LOAD_LOG 130
@@ -482,6 +496,7 @@ int ERR_load_CT_strings(void);
482
496
  # define CT_F_O2I_SCT_LIST 111
483
497
  # define CT_F_O2I_SCT_SIGNATURE 112
484
498
  # define CT_F_SCT_CTX_NEW 126
499
+ # define CT_F_SCT_CTX_VERIFY 128
485
500
  # define CT_F_SCT_NEW 100
486
501
  # define CT_F_SCT_NEW_FROM_BASE64 127
487
502
  # define CT_F_SCT_SET0_LOG_ID 101
@@ -491,7 +506,6 @@ int ERR_load_CT_strings(void);
491
506
  # define CT_F_SCT_SET_LOG_ENTRY_TYPE 102
492
507
  # define CT_F_SCT_SET_SIGNATURE_NID 103
493
508
  # define CT_F_SCT_SET_VERSION 104
494
- # define CT_F_SCT_CTX_VERIFY 128
495
509
 
496
510
  /* Reason codes. */
497
511
  # define CT_R_BASE64_DECODE_ERROR 108
@@ -501,6 +515,7 @@ int ERR_load_CT_strings(void);
501
515
  # define CT_R_LOG_CONF_MISSING_DESCRIPTION 111
502
516
  # define CT_R_LOG_CONF_MISSING_KEY 112
503
517
  # define CT_R_LOG_KEY_INVALID 113
518
+ # define CT_R_SCT_FUTURE_TIMESTAMP 116
504
519
  # define CT_R_SCT_INVALID 104
505
520
  # define CT_R_SCT_INVALID_SIGNATURE 107
506
521
  # define CT_R_SCT_LIST_INVALID 105
@@ -87,12 +87,29 @@ DECLARE_ASN1_ITEM(DHparams)
87
87
  */
88
88
  # define DH_CHECK_P_NOT_STRONG_PRIME DH_CHECK_P_NOT_SAFE_PRIME
89
89
 
90
- # define d2i_DHparams_fp(fp,x) (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
91
- (char *(*)())d2i_DHparams,(fp),(unsigned char **)(x))
92
- # define i2d_DHparams_fp(fp,x) ASN1_i2d_fp(i2d_DHparams,(fp), \
93
- (unsigned char *)(x))
94
- # define d2i_DHparams_bio(bp,x) ASN1_d2i_bio_of(DH,DH_new,d2i_DHparams,bp,x)
95
- # define i2d_DHparams_bio(bp,x) ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
90
+ # define d2i_DHparams_fp(fp,x) \
91
+ (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
92
+ (char *(*)())d2i_DHparams, \
93
+ (fp), \
94
+ (unsigned char **)(x))
95
+ # define i2d_DHparams_fp(fp,x) \
96
+ ASN1_i2d_fp(i2d_DHparams,(fp), (unsigned char *)(x))
97
+ # define d2i_DHparams_bio(bp,x) \
98
+ ASN1_d2i_bio_of(DH, DH_new, d2i_DHparams, bp, x)
99
+ # define i2d_DHparams_bio(bp,x) \
100
+ ASN1_i2d_bio_of_const(DH,i2d_DHparams,bp,x)
101
+
102
+ # define d2i_DHxparams_fp(fp,x) \
103
+ (DH *)ASN1_d2i_fp((char *(*)())DH_new, \
104
+ (char *(*)())d2i_DHxparams, \
105
+ (fp), \
106
+ (unsigned char **)(x))
107
+ # define i2d_DHxparams_fp(fp,x) \
108
+ ASN1_i2d_fp(i2d_DHxparams,(fp), (unsigned char *)(x))
109
+ # define d2i_DHxparams_bio(bp,x) \
110
+ ASN1_d2i_bio_of(DH, DH_new, d2i_DHxparams, bp, x)
111
+ # define i2d_DHxparams_bio(bp,x) \
112
+ ASN1_i2d_bio_of_const(DH, i2d_DHxparams, bp, x)
96
113
 
97
114
  DH *DHparams_dup(DH *);
98
115
 
@@ -124,6 +141,7 @@ DEPRECATEDIN_0_9_8(DH *DH_generate_parameters(int prime_len, int generator,
124
141
  int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,
125
142
  BN_GENCB *cb);
126
143
 
144
+ int DH_check_params(const DH *dh, int *ret);
127
145
  int DH_check(const DH *dh, int *codes);
128
146
  int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);
129
147
  int DH_generate_key(DH *dh);
@@ -274,6 +274,7 @@ int ERR_load_DSA_strings(void);
274
274
  # define DSA_R_NO_PARAMETERS_SET 107
275
275
  # define DSA_R_PARAMETER_ENCODING_ERROR 105
276
276
  # define DSA_R_Q_NOT_PRIME 113
277
+ # define DSA_R_SEED_LEN_SMALL 110
277
278
 
278
279
  # ifdef __cplusplus
279
280
  }
@@ -212,9 +212,9 @@ extern "C" {
212
212
  # endif
213
213
  # endif
214
214
 
215
- # if defined(OPENSSL_SYS_UEFI) && !defined(ssize_t)
216
- # define ossl_ssize_t int
217
- # define OSSL_SSIZE_MAX INT_MAX
215
+ # if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t)
216
+ # define ossl_ssize_t INTN
217
+ # define OSSL_SSIZE_MAX MAX_INTN
218
218
  # endif
219
219
 
220
220
  # ifndef ossl_ssize_t
@@ -242,7 +242,6 @@ typedef INT32 int32_t;
242
242
  typedef UINT32 uint32_t;
243
243
  typedef INT64 int64_t;
244
244
  typedef UINT64 uint64_t;
245
- # define PRIu64 "%Lu"
246
245
  # elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || \
247
246
  defined(__osf__) || defined(__sgi) || defined(__hpux) || \
248
247
  defined(OPENSSL_SYS_VMS) || defined (__OpenBSD__)
@@ -264,18 +263,6 @@ typedef unsigned __int64 uint64_t;
264
263
  # include <stdint.h>
265
264
  # endif
266
265
 
267
- /*
268
- * We need a format operator for some client tools for uint64_t. If inttypes.h
269
- * isn't available or did not define it, just go with hard-coded.
270
- */
271
- # ifndef PRIu64
272
- # ifdef SIXTY_FOUR_BIT_LONG
273
- # define PRIu64 "lu"
274
- # else
275
- # define PRIu64 "llu"
276
- # endif
277
- # endif
278
-
279
266
  /* ossl_inline: portable inline definition usable in public headers */
280
267
  # if !defined(inline) && !defined(__cplusplus)
281
268
  # if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
@@ -573,11 +573,9 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *p,
573
573
  * \param point EC_POINT object
574
574
  * \param form point conversion form
575
575
  * \param pbuf returns pointer to allocated buffer
576
- * \param len length of the memory buffer
577
576
  * \param ctx BN_CTX object (optional)
578
577
  * \return the length of the encoded octet string or 0 if an error occurred
579
578
  */
580
-
581
579
  size_t EC_POINT_point2buf(const EC_GROUP *group, const EC_POINT *point,
582
580
  point_conversion_form_t form,
583
581
  unsigned char **pbuf, BN_CTX *ctx);
@@ -863,7 +861,7 @@ int EC_KEY_generate_key(EC_KEY *key);
863
861
  int EC_KEY_check_key(const EC_KEY *key);
864
862
 
865
863
  /** Indicates if an EC_KEY can be used for signing.
866
- * \param key the EC_KEY object
864
+ * \param eckey the EC_KEY object
867
865
  * \return 1 if can can sign and 0 otherwise.
868
866
  */
869
867
  int EC_KEY_can_sign(const EC_KEY *eckey);
@@ -882,11 +880,9 @@ int EC_KEY_set_public_key_affine_coordinates(EC_KEY *key, BIGNUM *x,
882
880
  * \param key key to encode
883
881
  * \param form point conversion form
884
882
  * \param pbuf returns pointer to allocated buffer
885
- * \param len length of the memory buffer
886
883
  * \param ctx BN_CTX object (optional)
887
884
  * \return the length of the encoded octet string or 0 if an error occurred
888
885
  */
889
-
890
886
  size_t EC_KEY_key2buf(const EC_KEY *key, point_conversion_form_t form,
891
887
  unsigned char **pbuf, BN_CTX *ctx);
892
888
 
@@ -921,11 +917,10 @@ int EC_KEY_oct2priv(EC_KEY *key, const unsigned char *buf, size_t len);
921
917
  size_t EC_KEY_priv2oct(const EC_KEY *key, unsigned char *buf, size_t len);
922
918
 
923
919
  /** Encodes an EC_KEY private key to an allocated octet string
924
- * \param key key to encode
920
+ * \param eckey key to encode
925
921
  * \param pbuf returns pointer to allocated buffer
926
922
  * \return the length of the encoded octet string or 0 if an error occurred
927
923
  */
928
-
929
924
  size_t EC_KEY_priv2buf(const EC_KEY *eckey, unsigned char **pbuf);
930
925
 
931
926
  /********************************************************************/
@@ -1228,7 +1223,7 @@ void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
1228
1223
  const ECDSA_SIG *sig,
1229
1224
  EC_KEY *eckey));
1230
1225
 
1231
- void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
1226
+ void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
1232
1227
  int (**pinit)(EC_KEY *key),
1233
1228
  void (**pfinish)(EC_KEY *key),
1234
1229
  int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
@@ -1239,16 +1234,16 @@ void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
1239
1234
  int (**pset_public)(EC_KEY *key,
1240
1235
  const EC_POINT *pub_key));
1241
1236
 
1242
- void EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth,
1237
+ void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
1243
1238
  int (**pkeygen)(EC_KEY *key));
1244
1239
 
1245
- void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth,
1240
+ void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
1246
1241
  int (**pck)(unsigned char **psec,
1247
1242
  size_t *pseclen,
1248
1243
  const EC_POINT *pub_key,
1249
1244
  const EC_KEY *ecdh));
1250
1245
 
1251
- void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
1246
+ void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
1252
1247
  int (**psign)(int type, const unsigned char *dgst,
1253
1248
  int dlen, unsigned char *sig,
1254
1249
  unsigned int *siglen,
@@ -1262,7 +1257,7 @@ void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
1262
1257
  const BIGNUM *in_r,
1263
1258
  EC_KEY *eckey));
1264
1259
 
1265
- void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth,
1260
+ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
1266
1261
  int (**pverify)(int type, const unsigned
1267
1262
  char *dgst, int dgst_len,
1268
1263
  const unsigned char *sigbuf,
@@ -334,8 +334,6 @@ ENGINE *ENGINE_by_id(const char *id);
334
334
  OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_PADLOCK, NULL)
335
335
  # define ENGINE_load_capi() \
336
336
  OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_CAPI, NULL)
337
- # define ENGINE_load_dasync() \
338
- OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_DASYNC, NULL)
339
337
  # define ENGINE_load_afalg() \
340
338
  OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL)
341
339
  # endif
@@ -89,7 +89,7 @@ typedef struct err_state_st {
89
89
  # define ERR_LIB_CMS 46
90
90
  # define ERR_LIB_TS 47
91
91
  # define ERR_LIB_HMAC 48
92
- # define ERR_LIB_JPAKE 49
92
+ /* # define ERR_LIB_JPAKE 49 */
93
93
  # define ERR_LIB_CT 50
94
94
  # define ERR_LIB_ASYNC 51
95
95
  # define ERR_LIB_KDF 52
@@ -128,7 +128,6 @@ typedef struct err_state_st {
128
128
  # define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
129
129
  # define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
130
130
  # define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
131
- # define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
132
131
  # define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
133
132
  # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
134
133
  # define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE)
@@ -140,6 +139,7 @@ typedef struct err_state_st {
140
139
  # define ERR_GET_LIB(l) (int)(((l) >> 24L) & 0x0FFL)
141
140
  # define ERR_GET_FUNC(l) (int)(((l) >> 12L) & 0xFFFL)
142
141
  # define ERR_GET_REASON(l) (int)( (l) & 0xFFFL)
142
+ # define ERR_FATAL_ERROR(l) (int)( (l) & ERR_R_FATAL)
143
143
 
144
144
  /* OS functions */
145
145
  # define SYS_F_FOPEN 1
@@ -159,6 +159,7 @@ typedef struct err_state_st {
159
159
  # define SYS_F_GETSOCKOPT 15
160
160
  # define SYS_F_GETSOCKNAME 16
161
161
  # define SYS_F_GETHOSTBYNAME 17
162
+ # define SYS_F_FFLUSH 18
162
163
 
163
164
  /* reasons */
164
165
  # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */
@@ -900,6 +900,9 @@ int EVP_PKEY_security_bits(const EVP_PKEY *pkey);
900
900
  int EVP_PKEY_size(EVP_PKEY *pkey);
901
901
  int EVP_PKEY_set_type(EVP_PKEY *pkey, int type);
902
902
  int EVP_PKEY_set_type_str(EVP_PKEY *pkey, const char *str, int len);
903
+ # ifndef OPENSSL_NO_ENGINE
904
+ int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e);
905
+ # endif
903
906
  int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key);
904
907
  void *EVP_PKEY_get0(const EVP_PKEY *pkey);
905
908
  const unsigned char *EVP_PKEY_get0_hmac(const EVP_PKEY *pkey, size_t *len);
@@ -1455,11 +1458,14 @@ int ERR_load_EVP_strings(void);
1455
1458
  /* Function codes. */
1456
1459
  # define EVP_F_AESNI_INIT_KEY 165
1457
1460
  # define EVP_F_AES_INIT_KEY 133
1461
+ # define EVP_F_AES_OCB_CIPHER 169
1458
1462
  # define EVP_F_AES_T4_INIT_KEY 178
1463
+ # define EVP_F_AES_WRAP_CIPHER 170
1459
1464
  # define EVP_F_ALG_MODULE_INIT 177
1460
1465
  # define EVP_F_CAMELLIA_INIT_KEY 159
1461
1466
  # define EVP_F_CHACHA20_POLY1305_CTRL 182
1462
1467
  # define EVP_F_CMLL_T4_INIT_KEY 179
1468
+ # define EVP_F_DES_EDE3_WRAP_CIPHER 171
1463
1469
  # define EVP_F_DO_SIGVER_INIT 161
1464
1470
  # define EVP_F_EVP_CIPHERINIT_EX 123
1465
1471
  # define EVP_F_EVP_CIPHER_CTX_COPY 163
@@ -1479,6 +1485,7 @@ int ERR_load_EVP_strings(void);
1479
1485
  # define EVP_F_EVP_PBE_SCRYPT 181
1480
1486
  # define EVP_F_EVP_PKCS82PKEY 111
1481
1487
  # define EVP_F_EVP_PKEY2PKCS8 113
1488
+ # define EVP_F_EVP_PKEY_ASN1_ADD0 168
1482
1489
  # define EVP_F_EVP_PKEY_COPY_PARAMETERS 103
1483
1490
  # define EVP_F_EVP_PKEY_CTX_CTRL 137
1484
1491
  # define EVP_F_EVP_PKEY_CTX_CTRL_STR 150
@@ -1502,6 +1509,7 @@ int ERR_load_EVP_strings(void);
1502
1509
  # define EVP_F_EVP_PKEY_NEW 106
1503
1510
  # define EVP_F_EVP_PKEY_PARAMGEN 148
1504
1511
  # define EVP_F_EVP_PKEY_PARAMGEN_INIT 149
1512
+ # define EVP_F_EVP_PKEY_SET1_ENGINE 187
1505
1513
  # define EVP_F_EVP_PKEY_SIGN 140
1506
1514
  # define EVP_F_EVP_PKEY_SIGN_INIT 141
1507
1515
  # define EVP_F_EVP_PKEY_VERIFY 142
@@ -1546,6 +1554,7 @@ int ERR_load_EVP_strings(void);
1546
1554
  # define EVP_R_INPUT_NOT_INITIALIZED 111
1547
1555
  # define EVP_R_INVALID_DIGEST 152
1548
1556
  # define EVP_R_INVALID_FIPS_MODE 168
1557
+ # define EVP_R_INVALID_KEY 163
1549
1558
  # define EVP_R_INVALID_KEY_LENGTH 130
1550
1559
  # define EVP_R_INVALID_OPERATION 148
1551
1560
  # define EVP_R_KEYGEN_FAILURE 120
@@ -1561,6 +1570,7 @@ int ERR_load_EVP_strings(void);
1561
1570
  # define EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 150
1562
1571
  # define EVP_R_OPERATON_NOT_INITIALIZED 151
1563
1572
  # define EVP_R_PARTIALLY_OVERLAPPING 162
1573
+ # define EVP_R_PKEY_ASN1_METHOD_ALREADY_REGISTERED 164
1564
1574
  # define EVP_R_PRIVATE_KEY_DECODE_ERROR 145
1565
1575
  # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146
1566
1576
  # define EVP_R_PUBLIC_KEY_NOT_RSA 106
@@ -1568,12 +1578,12 @@ int ERR_load_EVP_strings(void);
1568
1578
  # define EVP_R_UNKNOWN_DIGEST 161
1569
1579
  # define EVP_R_UNKNOWN_OPTION 169
1570
1580
  # define EVP_R_UNKNOWN_PBE_ALGORITHM 121
1571
- # define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
1572
1581
  # define EVP_R_UNSUPPORTED_ALGORITHM 156
1573
1582
  # define EVP_R_UNSUPPORTED_CIPHER 107
1574
1583
  # define EVP_R_UNSUPPORTED_KEYLENGTH 123
1575
1584
  # define EVP_R_UNSUPPORTED_KEY_DERIVATION_FUNCTION 124
1576
1585
  # define EVP_R_UNSUPPORTED_KEY_SIZE 108
1586
+ # define EVP_R_UNSUPPORTED_NUMBER_OF_ROUNDS 135
1577
1587
  # define EVP_R_UNSUPPORTED_PRF 125
1578
1588
  # define EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM 118
1579
1589
  # define EVP_R_UNSUPPORTED_SALT_TYPE 126
@@ -195,8 +195,21 @@ void OPENSSL_LH_node_usage_stats_bio(const OPENSSL_LHASH *lh, BIO *out);
195
195
  LHASH_OF(type)
196
196
 
197
197
  DEFINE_LHASH_OF(OPENSSL_STRING);
198
+ # ifdef _MSC_VER
199
+ /*
200
+ * push and pop this warning:
201
+ * warning C4090: 'function': different 'const' qualifiers
202
+ */
203
+ # pragma warning (push)
204
+ # pragma warning (disable: 4090)
205
+ # endif
206
+
198
207
  DEFINE_LHASH_OF(OPENSSL_CSTRING);
199
208
 
209
+ # ifdef _MSC_VER
210
+ # pragma warning (pop)
211
+ # endif
212
+
200
213
  #ifdef __cplusplus
201
214
  }
202
215
  #endif
@@ -992,7 +992,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
992
992
  * const void *a_;
993
993
  * const nid_triple const *a = a_;
994
994
  *
995
- * The assignement discards a const because what you really want is:
995
+ * The assignment discards a const because what you really want is:
996
996
  *
997
997
  * const int const * const *a = a_;
998
998
  *
@@ -1000,7 +1000,7 @@ const void *OBJ_bsearch_ex_(const void *key, const void *base, int num,
1000
1000
  * which breaks comparison functions.
1001
1001
  *
1002
1002
  * Thus we end up having to cast, sadly, or unpack the
1003
- * declarations. Or, as I finally did in this case, delcare nid_triple
1003
+ * declarations. Or, as I finally did in this case, declare nid_triple
1004
1004
  * to be a struct, which it should have been in the first place.
1005
1005
  *
1006
1006
  * Ben, August 2008.
@@ -137,22 +137,6 @@ typedef struct ocsp_service_locator_st OCSP_SERVICELOC;
137
137
 
138
138
  # define i2d_OCSP_REQUEST_bio(bp,o) ASN1_i2d_bio_of(OCSP_REQUEST,i2d_OCSP_REQUEST,bp,o)
139
139
 
140
- # define OCSP_REQUEST_sign(o,pkey,md) \
141
- ASN1_item_sign(ASN1_ITEM_rptr(OCSP_REQINFO),\
142
- &o->optionalSignature->signatureAlgorithm,NULL,\
143
- o->optionalSignature->signature,&o->tbsRequest,pkey,md)
144
-
145
- # define OCSP_BASICRESP_sign(o,pkey,md,d) \
146
- ASN1_item_sign(ASN1_ITEM_rptr(OCSP_RESPDATA),&o->signatureAlgorithm,NULL,\
147
- o->signature,&o->tbsResponseData,pkey,md)
148
-
149
- # define OCSP_REQUEST_verify(a,r) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_REQINFO),\
150
- &a->optionalSignature->signatureAlgorithm,\
151
- a->optionalSignature->signature,&a->tbsRequest,r)
152
-
153
- # define OCSP_BASICRESP_verify(a,r,d) ASN1_item_verify(ASN1_ITEM_rptr(OCSP_RESPDATA),\
154
- &a->signatureAlgorithm,a->signature,&a->tbsResponseData,r)
155
-
156
140
  # define ASN1_BIT_STRING_digest(data,type,md,len) \
157
141
  ASN1_item_digest(ASN1_ITEM_rptr(ASN1_BIT_STRING),type,data,md,len)
158
142
 
@@ -259,6 +243,9 @@ int OCSP_basic_add1_cert(OCSP_BASICRESP *resp, X509 *cert);
259
243
  int OCSP_basic_sign(OCSP_BASICRESP *brsp,
260
244
  X509 *signer, EVP_PKEY *key, const EVP_MD *dgst,
261
245
  STACK_OF(X509) *certs, unsigned long flags);
246
+ int OCSP_RESPID_set_by_name(OCSP_RESPID *respid, X509 *cert);
247
+ int OCSP_RESPID_set_by_key(OCSP_RESPID *respid, X509 *cert);
248
+ int OCSP_RESPID_match(OCSP_RESPID *respid, X509 *cert);
262
249
 
263
250
  X509_EXTENSION *OCSP_crlID_new(const char *url, long *n, char *tim);
264
251
 
@@ -22,6 +22,21 @@ extern "C" {
22
22
  * OpenSSL was configured with the following options:
23
23
  */
24
24
 
25
+ #ifndef OPENSSL_NO_COMP
26
+ # define OPENSSL_NO_COMP
27
+ #endif
28
+ #ifndef OPENSSL_NO_MD2
29
+ # define OPENSSL_NO_MD2
30
+ #endif
31
+ #ifndef OPENSSL_NO_RC5
32
+ # define OPENSSL_NO_RC5
33
+ #endif
34
+ #ifndef OPENSSL_THREADS
35
+ # define OPENSSL_THREADS
36
+ #endif
37
+ #ifndef OPENSSL_NO_AFALGENG
38
+ # define OPENSSL_NO_AFALGENG
39
+ #endif
25
40
  #ifndef OPENSSL_NO_ASAN
26
41
  # define OPENSSL_NO_ASAN
27
42
  #endif
@@ -37,6 +52,9 @@ extern "C" {
37
52
  #ifndef OPENSSL_NO_EGD
38
53
  # define OPENSSL_NO_EGD
39
54
  #endif
55
+ #ifndef OPENSSL_NO_ENGINE
56
+ # define OPENSSL_NO_ENGINE
57
+ #endif
40
58
  #ifndef OPENSSL_NO_FUZZ_AFL
41
59
  # define OPENSSL_NO_FUZZ_AFL
42
60
  #endif
@@ -46,15 +64,12 @@ extern "C" {
46
64
  #ifndef OPENSSL_NO_HEARTBEATS
47
65
  # define OPENSSL_NO_HEARTBEATS
48
66
  #endif
49
- #ifndef OPENSSL_NO_MD2
50
- # define OPENSSL_NO_MD2
67
+ #ifndef OPENSSL_NO_HW
68
+ # define OPENSSL_NO_HW
51
69
  #endif
52
70
  #ifndef OPENSSL_NO_MSAN
53
71
  # define OPENSSL_NO_MSAN
54
72
  #endif
55
- #ifndef OPENSSL_NO_RC5
56
- # define OPENSSL_NO_RC5
57
- #endif
58
73
  #ifndef OPENSSL_NO_SCTP
59
74
  # define OPENSSL_NO_SCTP
60
75
  #endif
@@ -76,9 +91,6 @@ extern "C" {
76
91
  #ifndef OPENSSL_NO_WEAK_SSL_CIPHERS
77
92
  # define OPENSSL_NO_WEAK_SSL_CIPHERS
78
93
  #endif
79
- #ifndef OPENSSL_THREADS
80
- # define OPENSSL_THREADS
81
- #endif
82
94
  #ifndef OPENSSL_NO_AFALGENG
83
95
  # define OPENSSL_NO_AFALGENG
84
96
  #endif
@@ -39,11 +39,11 @@ extern "C" {
39
39
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
40
40
  * major minor fix final patch/beta)
41
41
  */
42
- # define OPENSSL_VERSION_NUMBER 0x10100010L
42
+ # define OPENSSL_VERSION_NUMBER 0x10100080L
43
43
  # ifdef OPENSSL_FIPS
44
- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-fips-dev xx XXX xxxx"
44
+ # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-fips-dev xx XXX xxxx"
45
45
  # else
46
- # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0a-dev xx XXX xxxx"
46
+ # define OPENSSL_VERSION_TEXT "OpenSSL 1.1.0h-dev xx XXX xxxx"
47
47
  # endif
48
48
 
49
49
  /*-