rugged 1.3.1 → 1.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (656) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +34 -2
  3. data/ext/rugged/extconf.rb +6 -3
  4. data/ext/rugged/rugged.c +16 -0
  5. data/ext/rugged/rugged.h +4 -0
  6. data/ext/rugged/rugged_allocator.c +0 -54
  7. data/ext/rugged/rugged_blame.c +2 -0
  8. data/ext/rugged/rugged_blob.c +3 -0
  9. data/ext/rugged/rugged_commit.c +1 -0
  10. data/ext/rugged/rugged_config.c +9 -2
  11. data/ext/rugged/rugged_diff.c +1 -0
  12. data/ext/rugged/rugged_index.c +2 -0
  13. data/ext/rugged/rugged_patch.c +1 -0
  14. data/ext/rugged/rugged_rebase.c +1 -0
  15. data/ext/rugged/rugged_reference.c +1 -0
  16. data/ext/rugged/rugged_remote.c +28 -10
  17. data/ext/rugged/rugged_repo.c +7 -9
  18. data/ext/rugged/rugged_revwalk.c +5 -1
  19. data/ext/rugged/rugged_settings.c +5 -0
  20. data/ext/rugged/rugged_submodule.c +1 -0
  21. data/ext/rugged/rugged_tag.c +1 -0
  22. data/ext/rugged/rugged_tree.c +4 -0
  23. data/lib/rugged/index.rb +1 -1
  24. data/lib/rugged/tree.rb +5 -1
  25. data/lib/rugged/version.rb +1 -1
  26. data/vendor/libgit2/AUTHORS +1 -0
  27. data/vendor/libgit2/CMakeLists.txt +141 -289
  28. data/vendor/libgit2/COPYING +301 -20
  29. data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
  30. data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
  31. data/vendor/libgit2/cmake/CheckPrototypeDefinitionSafe.cmake +16 -0
  32. data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
  33. data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
  34. data/vendor/libgit2/cmake/ExperimentalFeatures.cmake +23 -0
  35. data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
  36. data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
  37. data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
  38. data/vendor/libgit2/cmake/FindHTTP_Parser.cmake +17 -17
  39. data/vendor/libgit2/cmake/FindIntlIconv.cmake +51 -0
  40. data/vendor/libgit2/cmake/FindLLHTTP.cmake +39 -0
  41. data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
  42. data/vendor/libgit2/cmake/FindPCRE.cmake +12 -13
  43. data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
  44. data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
  45. data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
  46. data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
  47. data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
  48. data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
  49. data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
  50. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
  51. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
  52. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
  53. data/vendor/libgit2/cmake/SelectHTTPParser.cmake +34 -0
  54. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +129 -101
  55. data/vendor/libgit2/cmake/SelectHashes.cmake +113 -54
  56. data/vendor/libgit2/cmake/SelectRegex.cmake +56 -0
  57. data/vendor/libgit2/cmake/SelectSSH.cmake +46 -0
  58. data/vendor/libgit2/cmake/SelectXdiff.cmake +9 -0
  59. data/vendor/libgit2/cmake/SelectZlib.cmake +38 -0
  60. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
  61. data/vendor/libgit2/deps/llhttp/CMakeLists.txt +8 -0
  62. data/vendor/libgit2/deps/llhttp/LICENSE-MIT +22 -0
  63. data/vendor/libgit2/deps/llhttp/api.c +510 -0
  64. data/vendor/libgit2/deps/llhttp/http.c +170 -0
  65. data/vendor/libgit2/deps/llhttp/llhttp.c +10168 -0
  66. data/vendor/libgit2/deps/llhttp/llhttp.h +897 -0
  67. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +33 -31
  68. data/vendor/libgit2/deps/ntlmclient/crypt_builtin_md4.c +311 -0
  69. data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +2 -1
  70. data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +0 -20
  71. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +7 -5
  72. data/vendor/libgit2/deps/ntlmclient/ntlm.c +25 -25
  73. data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
  74. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
  75. data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +5 -4
  76. data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +2 -1
  77. data/vendor/libgit2/deps/ntlmclient/utf8.h +1176 -721
  78. data/vendor/libgit2/deps/ntlmclient/util.h +11 -0
  79. data/vendor/libgit2/deps/pcre/CMakeLists.txt +89 -88
  80. data/vendor/libgit2/deps/pcre/LICENCE +5 -5
  81. data/vendor/libgit2/deps/pcre/pcre.h +2 -2
  82. data/vendor/libgit2/deps/pcre/pcre_compile.c +6 -3
  83. data/vendor/libgit2/deps/pcre/pcre_exec.c +2 -2
  84. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
  85. data/vendor/libgit2/deps/xdiff/CMakeLists.txt +28 -0
  86. data/vendor/libgit2/deps/xdiff/git-xdiff.h +56 -0
  87. data/vendor/libgit2/{src → deps}/xdiff/xdiff.h +15 -15
  88. data/vendor/libgit2/{src → deps}/xdiff/xdiffi.c +152 -125
  89. data/vendor/libgit2/{src → deps}/xdiff/xdiffi.h +2 -4
  90. data/vendor/libgit2/{src → deps}/xdiff/xemit.c +26 -10
  91. data/vendor/libgit2/{src → deps}/xdiff/xhistogram.c +92 -94
  92. data/vendor/libgit2/{src → deps}/xdiff/xinclude.h +1 -12
  93. data/vendor/libgit2/{src → deps}/xdiff/xmacros.h +18 -1
  94. data/vendor/libgit2/{src → deps}/xdiff/xmerge.c +126 -137
  95. data/vendor/libgit2/{src → deps}/xdiff/xpatience.c +26 -46
  96. data/vendor/libgit2/{src → deps}/xdiff/xprepare.c +24 -46
  97. data/vendor/libgit2/{src → deps}/xdiff/xutils.c +36 -8
  98. data/vendor/libgit2/{src → deps}/xdiff/xutils.h +2 -1
  99. data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -1
  100. data/vendor/libgit2/deps/zlib/LICENSE +22 -0
  101. data/vendor/libgit2/deps/zlib/adler32.c +7 -22
  102. data/vendor/libgit2/deps/zlib/crc32.c +931 -317
  103. data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
  104. data/vendor/libgit2/deps/zlib/deflate.c +428 -453
  105. data/vendor/libgit2/deps/zlib/deflate.h +51 -23
  106. data/vendor/libgit2/deps/zlib/gzguts.h +15 -19
  107. data/vendor/libgit2/deps/zlib/infback.c +19 -31
  108. data/vendor/libgit2/deps/zlib/inffast.c +15 -18
  109. data/vendor/libgit2/deps/zlib/inffast.h +1 -1
  110. data/vendor/libgit2/deps/zlib/inflate.c +75 -110
  111. data/vendor/libgit2/deps/zlib/inflate.h +3 -2
  112. data/vendor/libgit2/deps/zlib/inftrees.c +6 -11
  113. data/vendor/libgit2/deps/zlib/inftrees.h +6 -6
  114. data/vendor/libgit2/deps/zlib/trees.c +294 -380
  115. data/vendor/libgit2/deps/zlib/zconf.h +23 -14
  116. data/vendor/libgit2/deps/zlib/zlib.h +310 -284
  117. data/vendor/libgit2/deps/zlib/zutil.c +20 -46
  118. data/vendor/libgit2/deps/zlib/zutil.h +24 -41
  119. data/vendor/libgit2/include/git2/annotated_commit.h +12 -5
  120. data/vendor/libgit2/include/git2/apply.h +43 -8
  121. data/vendor/libgit2/include/git2/attr.h +28 -6
  122. data/vendor/libgit2/include/git2/blame.h +137 -29
  123. data/vendor/libgit2/include/git2/blob.h +85 -29
  124. data/vendor/libgit2/include/git2/branch.h +25 -16
  125. data/vendor/libgit2/include/git2/buffer.h +24 -82
  126. data/vendor/libgit2/include/git2/cert.h +4 -3
  127. data/vendor/libgit2/include/git2/checkout.h +88 -34
  128. data/vendor/libgit2/include/git2/cherrypick.h +10 -3
  129. data/vendor/libgit2/include/git2/clone.h +28 -12
  130. data/vendor/libgit2/include/git2/commit.h +134 -3
  131. data/vendor/libgit2/include/git2/common.h +172 -59
  132. data/vendor/libgit2/include/git2/config.h +118 -32
  133. data/vendor/libgit2/include/git2/credential.h +32 -3
  134. data/vendor/libgit2/include/git2/credential_helpers.h +2 -0
  135. data/vendor/libgit2/include/git2/deprecated.h +141 -3
  136. data/vendor/libgit2/include/git2/describe.h +20 -3
  137. data/vendor/libgit2/include/git2/diff.h +95 -19
  138. data/vendor/libgit2/include/git2/email.h +10 -30
  139. data/vendor/libgit2/include/git2/errors.h +51 -61
  140. data/vendor/libgit2/include/git2/experimental.h +20 -0
  141. data/vendor/libgit2/include/git2/filter.h +21 -9
  142. data/vendor/libgit2/include/git2/global.h +8 -1
  143. data/vendor/libgit2/include/git2/graph.h +4 -2
  144. data/vendor/libgit2/include/git2/ignore.h +11 -1
  145. data/vendor/libgit2/include/git2/index.h +111 -11
  146. data/vendor/libgit2/include/git2/indexer.h +67 -2
  147. data/vendor/libgit2/include/git2/mailmap.h +7 -1
  148. data/vendor/libgit2/include/git2/merge.h +70 -5
  149. data/vendor/libgit2/include/git2/message.h +4 -2
  150. data/vendor/libgit2/include/git2/net.h +3 -1
  151. data/vendor/libgit2/include/git2/notes.h +9 -6
  152. data/vendor/libgit2/include/git2/object.h +57 -7
  153. data/vendor/libgit2/include/git2/odb.h +156 -33
  154. data/vendor/libgit2/include/git2/odb_backend.h +132 -16
  155. data/vendor/libgit2/include/git2/oid.h +116 -17
  156. data/vendor/libgit2/include/git2/oidarray.h +7 -1
  157. data/vendor/libgit2/include/git2/pack.h +37 -9
  158. data/vendor/libgit2/include/git2/patch.h +10 -3
  159. data/vendor/libgit2/include/git2/pathspec.h +10 -1
  160. data/vendor/libgit2/include/git2/proxy.h +11 -1
  161. data/vendor/libgit2/include/git2/rebase.h +18 -7
  162. data/vendor/libgit2/include/git2/refdb.h +5 -2
  163. data/vendor/libgit2/include/git2/reflog.h +4 -3
  164. data/vendor/libgit2/include/git2/refs.h +11 -8
  165. data/vendor/libgit2/include/git2/refspec.h +14 -4
  166. data/vendor/libgit2/include/git2/remote.h +295 -54
  167. data/vendor/libgit2/include/git2/repository.h +95 -25
  168. data/vendor/libgit2/include/git2/reset.h +18 -5
  169. data/vendor/libgit2/include/git2/revert.h +9 -4
  170. data/vendor/libgit2/include/git2/revparse.h +4 -4
  171. data/vendor/libgit2/include/git2/revwalk.h +7 -3
  172. data/vendor/libgit2/include/git2/signature.h +47 -2
  173. data/vendor/libgit2/include/git2/stash.h +78 -10
  174. data/vendor/libgit2/include/git2/status.h +24 -11
  175. data/vendor/libgit2/include/git2/stdint.h +87 -85
  176. data/vendor/libgit2/include/git2/strarray.h +2 -16
  177. data/vendor/libgit2/include/git2/submodule.h +27 -11
  178. data/vendor/libgit2/include/git2/sys/alloc.h +12 -34
  179. data/vendor/libgit2/include/git2/sys/commit.h +77 -3
  180. data/vendor/libgit2/include/git2/sys/commit_graph.h +110 -59
  181. data/vendor/libgit2/include/git2/sys/config.h +80 -4
  182. data/vendor/libgit2/include/git2/sys/credential.h +4 -3
  183. data/vendor/libgit2/include/git2/sys/diff.h +21 -1
  184. data/vendor/libgit2/include/git2/sys/email.h +7 -0
  185. data/vendor/libgit2/include/git2/sys/errors.h +76 -0
  186. data/vendor/libgit2/include/git2/sys/filter.h +66 -3
  187. data/vendor/libgit2/include/git2/sys/hashsig.h +11 -0
  188. data/vendor/libgit2/include/git2/sys/index.h +3 -2
  189. data/vendor/libgit2/include/git2/sys/mempack.h +32 -2
  190. data/vendor/libgit2/include/git2/sys/merge.h +55 -7
  191. data/vendor/libgit2/include/git2/sys/midx.h +47 -4
  192. data/vendor/libgit2/include/git2/sys/odb_backend.h +10 -9
  193. data/vendor/libgit2/include/git2/sys/openssl.h +8 -1
  194. data/vendor/libgit2/include/git2/sys/path.h +12 -1
  195. data/vendor/libgit2/include/git2/sys/refdb_backend.h +40 -36
  196. data/vendor/libgit2/include/git2/sys/refs.h +3 -2
  197. data/vendor/libgit2/include/git2/sys/remote.h +53 -0
  198. data/vendor/libgit2/include/git2/sys/repository.h +63 -3
  199. data/vendor/libgit2/include/git2/sys/stream.h +26 -3
  200. data/vendor/libgit2/include/git2/sys/transport.h +87 -41
  201. data/vendor/libgit2/include/git2/tag.h +4 -1
  202. data/vendor/libgit2/include/git2/trace.h +9 -3
  203. data/vendor/libgit2/include/git2/transaction.h +3 -2
  204. data/vendor/libgit2/include/git2/transport.h +11 -3
  205. data/vendor/libgit2/include/git2/tree.h +20 -8
  206. data/vendor/libgit2/include/git2/types.h +26 -10
  207. data/vendor/libgit2/include/git2/version.h +63 -6
  208. data/vendor/libgit2/include/git2/worktree.h +30 -8
  209. data/vendor/libgit2/include/git2.h +1 -0
  210. data/vendor/libgit2/src/CMakeLists.txt +203 -420
  211. data/vendor/libgit2/src/README.md +12 -0
  212. data/vendor/libgit2/src/cli/CMakeLists.txt +56 -0
  213. data/vendor/libgit2/src/cli/README.md +26 -0
  214. data/vendor/libgit2/src/{branch.h → cli/cmd.c} +10 -8
  215. data/vendor/libgit2/src/cli/cmd.h +37 -0
  216. data/vendor/libgit2/src/cli/cmd_blame.c +287 -0
  217. data/vendor/libgit2/src/cli/cmd_cat_file.c +202 -0
  218. data/vendor/libgit2/src/cli/cmd_clone.c +190 -0
  219. data/vendor/libgit2/src/cli/cmd_config.c +241 -0
  220. data/vendor/libgit2/src/cli/cmd_hash_object.c +152 -0
  221. data/vendor/libgit2/src/cli/cmd_help.c +85 -0
  222. data/vendor/libgit2/src/cli/cmd_index_pack.c +114 -0
  223. data/vendor/libgit2/src/cli/cmd_init.c +102 -0
  224. data/vendor/libgit2/src/cli/common.c +168 -0
  225. data/vendor/libgit2/src/cli/common.h +63 -0
  226. data/vendor/libgit2/src/cli/error.h +51 -0
  227. data/vendor/libgit2/src/cli/main.c +134 -0
  228. data/vendor/libgit2/src/cli/opt.c +695 -0
  229. data/vendor/libgit2/src/cli/opt.h +367 -0
  230. data/vendor/libgit2/src/cli/opt_usage.c +263 -0
  231. data/vendor/libgit2/src/cli/opt_usage.h +40 -0
  232. data/vendor/libgit2/src/cli/progress.c +395 -0
  233. data/vendor/libgit2/src/cli/progress.h +129 -0
  234. data/vendor/libgit2/src/cli/sighandler.h +20 -0
  235. data/vendor/libgit2/src/cli/unix/sighandler.c +37 -0
  236. data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
  237. data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
  238. data/vendor/libgit2/src/libgit2/CMakeLists.txt +140 -0
  239. data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +2 -2
  240. data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +2 -2
  241. data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +32 -34
  242. data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +2 -2
  243. data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +48 -31
  244. data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +25 -20
  245. data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +6 -4
  246. data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +87 -46
  247. data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +5 -9
  248. data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +152 -57
  249. data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +1 -0
  250. data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +1 -2
  251. data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +38 -29
  252. data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +3 -3
  253. data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +164 -118
  254. data/vendor/libgit2/src/libgit2/branch.h +31 -0
  255. data/vendor/libgit2/src/libgit2/buf.c +126 -0
  256. data/vendor/libgit2/src/libgit2/buf.h +50 -0
  257. data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +22 -17
  258. data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +7 -9
  259. data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +107 -91
  260. data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -2
  261. data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +14 -15
  262. data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +254 -203
  263. data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +4 -1
  264. data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +296 -77
  265. data/vendor/libgit2/src/libgit2/commit.h +87 -0
  266. data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +246 -135
  267. data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +33 -8
  268. data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +17 -7
  269. data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +1 -0
  270. data/vendor/libgit2/src/libgit2/common.h +55 -0
  271. data/vendor/libgit2/src/{config.c → libgit2/config.c} +490 -360
  272. data/vendor/libgit2/src/libgit2/config.cmake.in +3 -0
  273. data/vendor/libgit2/src/{config.h → libgit2/config.h} +24 -6
  274. data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +8 -10
  275. data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +4 -5
  276. data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +212 -183
  277. data/vendor/libgit2/src/libgit2/config_list.c +285 -0
  278. data/vendor/libgit2/src/libgit2/config_list.h +32 -0
  279. data/vendor/libgit2/src/libgit2/config_mem.c +374 -0
  280. data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +37 -32
  281. data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +24 -31
  282. data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +24 -21
  283. data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +62 -51
  284. data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +44 -14
  285. data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +8 -10
  286. data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +46 -55
  287. data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +5 -5
  288. data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +45 -27
  289. data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +70 -20
  290. data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +5 -3
  291. data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +22 -6
  292. data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +192 -105
  293. data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +40 -29
  294. data/vendor/libgit2/src/libgit2/diff_stats.h +18 -0
  295. data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +49 -16
  296. data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +4 -8
  297. data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +1 -1
  298. data/vendor/libgit2/src/{email.c → libgit2/email.c} +58 -40
  299. data/vendor/libgit2/src/{email.h → libgit2/email.h} +1 -1
  300. data/vendor/libgit2/src/{transports/ssh.h → libgit2/experimental.h.in} +3 -4
  301. data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +105 -30
  302. data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +1 -3
  303. data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +30 -28
  304. data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +132 -58
  305. data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +26 -5
  306. data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +3 -3
  307. data/vendor/libgit2/src/libgit2/grafts.c +270 -0
  308. data/vendor/libgit2/src/libgit2/grafts.h +35 -0
  309. data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +1 -1
  310. data/vendor/libgit2/src/libgit2/hashmap_oid.h +30 -0
  311. data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +20 -20
  312. data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +44 -39
  313. data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +2 -2
  314. data/vendor/libgit2/src/{index.c → libgit2/index.c} +460 -276
  315. data/vendor/libgit2/src/{index.h → libgit2/index.h} +21 -5
  316. data/vendor/libgit2/src/libgit2/index_map.c +95 -0
  317. data/vendor/libgit2/src/libgit2/index_map.h +28 -0
  318. data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +208 -124
  319. data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +102 -71
  320. data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +8 -5
  321. data/vendor/libgit2/src/libgit2/libgit2.c +268 -0
  322. data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +39 -37
  323. data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +83 -73
  324. data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +1 -14
  325. data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +4 -4
  326. data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +13 -5
  327. data/vendor/libgit2/src/{message.c → libgit2/message.c} +21 -10
  328. data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +174 -112
  329. data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +17 -6
  330. data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +53 -57
  331. data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +9 -2
  332. data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +29 -37
  333. data/vendor/libgit2/src/{object.c → libgit2/object.c} +166 -35
  334. data/vendor/libgit2/src/{object.h → libgit2/object.h} +17 -2
  335. data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +261 -88
  336. data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +44 -5
  337. data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +192 -134
  338. data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +67 -22
  339. data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +162 -89
  340. data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +171 -92
  341. data/vendor/libgit2/src/libgit2/oid.h +284 -0
  342. data/vendor/libgit2/src/libgit2/oidarray.c +89 -0
  343. data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +5 -1
  344. data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +126 -66
  345. data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +28 -12
  346. data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +146 -111
  347. data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +45 -25
  348. data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +8 -4
  349. data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +1 -1
  350. data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +3 -3
  351. data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +8 -1
  352. data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +51 -16
  353. data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +5 -5
  354. data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +42 -34
  355. data/vendor/libgit2/src/libgit2/path.c +375 -0
  356. data/vendor/libgit2/src/libgit2/path.h +68 -0
  357. data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +7 -7
  358. data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +2 -2
  359. data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +4 -1
  360. data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +1 -1
  361. data/vendor/libgit2/src/{push.c → libgit2/push.c} +116 -60
  362. data/vendor/libgit2/src/{push.h → libgit2/push.h} +5 -16
  363. data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +9 -9
  364. data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +2 -2
  365. data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +147 -147
  366. data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +639 -254
  367. data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +8 -7
  368. data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +3 -2
  369. data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +67 -39
  370. data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +8 -3
  371. data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +60 -38
  372. data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +13 -2
  373. data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +821 -454
  374. data/vendor/libgit2/src/libgit2/remote.h +101 -0
  375. data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +1377 -594
  376. data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +43 -12
  377. data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +8 -5
  378. data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +18 -22
  379. data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +76 -44
  380. data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +48 -19
  381. data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +3 -3
  382. data/vendor/libgit2/src/{libgit2.c → libgit2/settings.c} +162 -95
  383. data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +6 -2
  384. data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +144 -21
  385. data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +1 -2
  386. data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +243 -68
  387. data/vendor/libgit2/src/{status.c → libgit2/status.c} +5 -2
  388. data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +1 -0
  389. data/vendor/libgit2/src/libgit2/strarray.h +25 -0
  390. data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +62 -67
  391. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +41 -24
  392. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +2 -0
  393. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +11 -3
  394. data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +6 -3
  395. data/vendor/libgit2/src/libgit2/streams/schannel.c +715 -0
  396. data/vendor/libgit2/src/libgit2/streams/schannel.h +28 -0
  397. data/vendor/libgit2/src/libgit2/streams/socket.c +428 -0
  398. data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +3 -1
  399. data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +79 -19
  400. data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +5 -0
  401. data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +279 -220
  402. data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +10 -11
  403. data/vendor/libgit2/src/libgit2/sysdir.c +650 -0
  404. data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +55 -18
  405. data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +74 -43
  406. data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +2 -2
  407. data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +1 -14
  408. data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +5 -22
  409. data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +7 -7
  410. data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +27 -21
  411. data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +4 -1
  412. data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +14 -11
  413. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +7 -9
  414. data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +3 -5
  415. data/vendor/libgit2/src/{transports/auth_negotiate.c → libgit2/transports/auth_gssapi.c} +44 -45
  416. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +1 -1
  417. data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +1 -2
  418. data/vendor/libgit2/src/{transports/auth_ntlm.c → libgit2/transports/auth_ntlmclient.c} +22 -22
  419. data/vendor/libgit2/src/libgit2/transports/auth_sspi.c +341 -0
  420. data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +1 -1
  421. data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +16 -19
  422. data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +49 -24
  423. data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +0 -11
  424. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +188 -134
  425. data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +10 -0
  426. data/vendor/libgit2/src/libgit2/transports/httpparser.c +128 -0
  427. data/vendor/libgit2/src/libgit2/transports/httpparser.h +99 -0
  428. data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +159 -127
  429. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +142 -165
  430. data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +56 -36
  431. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +307 -74
  432. data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +297 -97
  433. data/vendor/libgit2/src/libgit2/transports/ssh.c +85 -0
  434. data/vendor/libgit2/src/libgit2/transports/ssh_exec.c +347 -0
  435. data/vendor/libgit2/src/libgit2/transports/ssh_exec.h +26 -0
  436. data/vendor/libgit2/src/{transports/ssh.c → libgit2/transports/ssh_libssh2.c} +414 -268
  437. data/vendor/libgit2/src/libgit2/transports/ssh_libssh2.h +28 -0
  438. data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +101 -75
  439. data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +30 -20
  440. data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +7 -5
  441. data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +128 -110
  442. data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +7 -6
  443. data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +160 -121
  444. data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +1 -1
  445. data/vendor/libgit2/src/util/CMakeLists.txt +77 -0
  446. data/vendor/libgit2/src/{alloc.c → util/alloc.c} +69 -7
  447. data/vendor/libgit2/src/util/alloc.h +65 -0
  448. data/vendor/libgit2/src/util/allocators/debugalloc.c +73 -0
  449. data/vendor/libgit2/src/util/allocators/debugalloc.h +17 -0
  450. data/vendor/libgit2/src/util/allocators/failalloc.c +32 -0
  451. data/vendor/libgit2/src/util/allocators/failalloc.h +17 -0
  452. data/vendor/libgit2/src/util/allocators/stdalloc.c +37 -0
  453. data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
  454. data/vendor/libgit2/src/util/allocators/win32_leakcheck.c +50 -0
  455. data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
  456. data/vendor/libgit2/src/{array.h → util/array.h} +25 -19
  457. data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
  458. data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +5 -1
  459. data/vendor/libgit2/src/util/ctype_compat.h +70 -0
  460. data/vendor/libgit2/src/{date.c → util/date.c} +35 -33
  461. data/vendor/libgit2/src/util/date.h +45 -0
  462. data/vendor/libgit2/src/util/errors.c +401 -0
  463. data/vendor/libgit2/src/{errors.h → util/errors.h} +22 -19
  464. data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +35 -30
  465. data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +21 -8
  466. data/vendor/libgit2/src/{path.c → util/fs_path.c} +591 -615
  467. data/vendor/libgit2/src/{path.h → util/fs_path.h} +257 -181
  468. data/vendor/libgit2/src/{futils.c → util/futils.c} +144 -95
  469. data/vendor/libgit2/src/{futils.h → util/futils.h} +40 -18
  470. data/vendor/libgit2/src/{features.h.in → util/git2_features.h.in} +33 -2
  471. data/vendor/libgit2/src/{common.h → util/git2_util.h} +26 -59
  472. data/vendor/libgit2/src/util/hash/builtin.c +53 -0
  473. data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
  474. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +3 -3
  475. data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
  476. data/vendor/libgit2/src/util/hash/common_crypto.c +112 -0
  477. data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
  478. data/vendor/libgit2/src/util/hash/mbedtls.c +92 -0
  479. data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
  480. data/vendor/libgit2/src/util/hash/openssl.c +347 -0
  481. data/vendor/libgit2/src/util/hash/openssl.h +61 -0
  482. data/vendor/libgit2/src/util/hash/rfc6234/sha.h +243 -0
  483. data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
  484. data/vendor/libgit2/src/util/hash/sha.h +73 -0
  485. data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +1 -1
  486. data/vendor/libgit2/src/util/hash/win32.c +549 -0
  487. data/vendor/libgit2/src/util/hash/win32.h +60 -0
  488. data/vendor/libgit2/src/util/hash.c +158 -0
  489. data/vendor/libgit2/src/util/hash.h +61 -0
  490. data/vendor/libgit2/src/util/hashmap.h +424 -0
  491. data/vendor/libgit2/src/util/hashmap_str.h +43 -0
  492. data/vendor/libgit2/src/{integer.h → util/integer.h} +3 -1
  493. data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
  494. data/vendor/libgit2/src/util/net.c +1160 -0
  495. data/vendor/libgit2/src/{net.h → util/net.h} +45 -4
  496. data/vendor/libgit2/src/{pool.c → util/pool.c} +1 -1
  497. data/vendor/libgit2/src/{pool.h → util/pool.h} +6 -1
  498. data/vendor/libgit2/src/{posix.c → util/posix.c} +57 -3
  499. data/vendor/libgit2/src/{posix.h → util/posix.h} +26 -1
  500. data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +3 -3
  501. data/vendor/libgit2/src/util/process.h +222 -0
  502. data/vendor/libgit2/src/util/rand.c +230 -0
  503. data/vendor/libgit2/src/util/rand.h +37 -0
  504. data/vendor/libgit2/src/{regexp.c → util/regexp.c} +5 -5
  505. data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
  506. data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
  507. data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
  508. data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +15 -14
  509. data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +5 -5
  510. data/vendor/libgit2/src/util/staticstr.h +66 -0
  511. data/vendor/libgit2/src/{buffer.c → util/str.c} +159 -153
  512. data/vendor/libgit2/src/util/str.h +357 -0
  513. data/vendor/libgit2/src/util/strlist.c +108 -0
  514. data/vendor/libgit2/src/util/strlist.h +36 -0
  515. data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
  516. data/vendor/libgit2/src/{thread.h → util/thread.h} +23 -22
  517. data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
  518. data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -3
  519. data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -6
  520. data/vendor/libgit2/src/util/unix/process.c +629 -0
  521. data/vendor/libgit2/src/{unix → util/unix}/realpath.c +24 -8
  522. data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
  523. data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
  524. data/vendor/libgit2/src/{util.c → util/util.c} +24 -19
  525. data/vendor/libgit2/src/{util.h → util/util.h} +30 -81
  526. data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
  527. data/vendor/libgit2/src/{vector.c → util/vector.c} +3 -3
  528. data/vendor/libgit2/src/{vector.h → util/vector.h} +4 -4
  529. data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
  530. data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
  531. data/vendor/libgit2/src/{win32 → util/win32}/error.c +1 -1
  532. data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
  533. data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
  534. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +148 -17
  535. data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +3 -1
  536. data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -2
  537. data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +42 -35
  538. data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
  539. data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
  540. data/vendor/libgit2/src/util/win32/process.c +506 -0
  541. data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
  542. data/vendor/libgit2/src/util/win32/utf-conv.c +144 -0
  543. data/vendor/libgit2/src/util/win32/utf-conv.h +127 -0
  544. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +2 -3
  545. data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +3 -4
  546. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +1 -1
  547. data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
  548. data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +1 -1
  549. data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
  550. data/vendor/libgit2/src/{zstream.c → util/zstream.c} +5 -5
  551. data/vendor/libgit2/src/{zstream.h → util/zstream.h} +5 -5
  552. metadata +431 -362
  553. data/vendor/libgit2/cmake/FindIconv.cmake +0 -45
  554. data/vendor/libgit2/deps/http-parser/CMakeLists.txt +0 -6
  555. data/vendor/libgit2/deps/http-parser/COPYING +0 -23
  556. data/vendor/libgit2/deps/http-parser/http_parser.c +0 -2182
  557. data/vendor/libgit2/deps/http-parser/http_parser.h +0 -305
  558. data/vendor/libgit2/deps/zlib/COPYING +0 -27
  559. data/vendor/libgit2/include/git2/sys/reflog.h +0 -21
  560. data/vendor/libgit2/src/alloc.h +0 -40
  561. data/vendor/libgit2/src/allocators/failalloc.c +0 -92
  562. data/vendor/libgit2/src/allocators/failalloc.h +0 -23
  563. data/vendor/libgit2/src/allocators/stdalloc.c +0 -150
  564. data/vendor/libgit2/src/allocators/win32_leakcheck.c +0 -118
  565. data/vendor/libgit2/src/buffer.h +0 -374
  566. data/vendor/libgit2/src/commit.h +0 -46
  567. data/vendor/libgit2/src/config_entries.c +0 -237
  568. data/vendor/libgit2/src/config_entries.h +0 -24
  569. data/vendor/libgit2/src/config_mem.c +0 -220
  570. data/vendor/libgit2/src/errors.c +0 -238
  571. data/vendor/libgit2/src/hash/sha1/common_crypto.c +0 -57
  572. data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
  573. data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
  574. data/vendor/libgit2/src/hash/sha1/mbedtls.c +0 -46
  575. data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
  576. data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
  577. data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
  578. data/vendor/libgit2/src/hash/sha1.h +0 -38
  579. data/vendor/libgit2/src/hash.c +0 -110
  580. data/vendor/libgit2/src/hash.h +0 -46
  581. data/vendor/libgit2/src/idxmap.c +0 -157
  582. data/vendor/libgit2/src/idxmap.h +0 -177
  583. data/vendor/libgit2/src/khash.h +0 -615
  584. data/vendor/libgit2/src/libgit2.h +0 -15
  585. data/vendor/libgit2/src/message.h +0 -17
  586. data/vendor/libgit2/src/net.c +0 -540
  587. data/vendor/libgit2/src/netops.c +0 -125
  588. data/vendor/libgit2/src/netops.h +0 -68
  589. data/vendor/libgit2/src/offmap.c +0 -101
  590. data/vendor/libgit2/src/offmap.h +0 -133
  591. data/vendor/libgit2/src/oid.h +0 -51
  592. data/vendor/libgit2/src/oidarray.c +0 -43
  593. data/vendor/libgit2/src/oidmap.c +0 -107
  594. data/vendor/libgit2/src/oidmap.h +0 -128
  595. data/vendor/libgit2/src/remote.h +0 -55
  596. data/vendor/libgit2/src/streams/socket.c +0 -239
  597. data/vendor/libgit2/src/strmap.c +0 -100
  598. data/vendor/libgit2/src/strmap.h +0 -131
  599. data/vendor/libgit2/src/sysdir.c +0 -347
  600. data/vendor/libgit2/src/threadstate.c +0 -84
  601. data/vendor/libgit2/src/threadstate.h +0 -24
  602. data/vendor/libgit2/src/win32/findfile.c +0 -230
  603. data/vendor/libgit2/src/win32/findfile.h +0 -19
  604. data/vendor/libgit2/src/win32/utf-conv.c +0 -146
  605. data/vendor/libgit2/src/win32/utf-conv.h +0 -60
  606. /data/vendor/libgit2/{src → deps}/xdiff/xemit.h +0 -0
  607. /data/vendor/libgit2/{src → deps}/xdiff/xprepare.h +0 -0
  608. /data/vendor/libgit2/{src → deps}/xdiff/xtypes.h +0 -0
  609. /data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
  610. /data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
  611. /data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
  612. /data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
  613. /data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
  614. /data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
  615. /data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
  616. /data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
  617. /data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
  618. /data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
  619. /data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
  620. /data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
  621. /data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
  622. /data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
  623. /data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
  624. /data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
  625. /data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
  626. /data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
  627. /data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
  628. /data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
  629. /data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
  630. /data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
  631. /data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
  632. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
  633. /data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
  634. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
  635. /data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
  636. /data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
  637. /data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
  638. /data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
  639. /data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
  640. /data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
  641. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
  642. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
  643. /data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
  644. /data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
  645. /data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
  646. /data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
  647. /data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
  648. /data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
  649. /data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
  650. /data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
  651. /data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
  652. /data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
  653. /data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
  654. /data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
  655. /data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
  656. /data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
@@ -1,12 +1,10 @@
1
1
  /* crc32.c -- compute the CRC-32 of a data stream
2
- * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
2
+ * Copyright (C) 1995-2022 Mark Adler
3
3
  * For conditions of distribution and use, see copyright notice in zlib.h
4
4
  *
5
- * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
6
- * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
7
- * tables for updating the shift register in one step with three exclusive-ors
8
- * instead of four steps with four exclusive-ors. This results in about a
9
- * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
5
+ * This interleaved implementation of a CRC makes use of pipelined multiple
6
+ * arithmetic-logic units, commonly found in modern CPU cores. It is due to
7
+ * Kadatch and Jenkins (2010). See doc/crc-doc.1.0.pdf in this distribution.
10
8
  */
11
9
 
12
10
  /* @(#) $Id$ */
@@ -14,11 +12,12 @@
14
12
  /*
15
13
  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
16
14
  protection on the static variables used to control the first-use generation
17
- of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
15
+ of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should
18
16
  first call get_crc_table() to initialize the tables before allowing more than
19
17
  one thread to use crc32().
20
18
 
21
- DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
19
+ MAKECRCH can be #defined to write out crc32.h. A main() routine is also
20
+ produced, so that this one source file can be compiled to an executable.
22
21
  */
23
22
 
24
23
  #ifdef MAKECRCH
@@ -28,408 +27,1023 @@
28
27
  # endif /* !DYNAMIC_CRC_TABLE */
29
28
  #endif /* MAKECRCH */
30
29
 
31
- #include "zutil.h" /* for STDC and FAR definitions */
30
+ #include "zutil.h" /* for Z_U4, Z_U8, z_crc_t, and FAR definitions */
32
31
 
33
- /* Definitions for doing the crc four data bytes at a time. */
34
- #if !defined(NOBYFOUR) && defined(Z_U4)
35
- # define BYFOUR
32
+ /*
33
+ A CRC of a message is computed on N braids of words in the message, where
34
+ each word consists of W bytes (4 or 8). If N is 3, for example, then three
35
+ running sparse CRCs are calculated respectively on each braid, at these
36
+ indices in the array of words: 0, 3, 6, ..., 1, 4, 7, ..., and 2, 5, 8, ...
37
+ This is done starting at a word boundary, and continues until as many blocks
38
+ of N * W bytes as are available have been processed. The results are combined
39
+ into a single CRC at the end. For this code, N must be in the range 1..6 and
40
+ W must be 4 or 8. The upper limit on N can be increased if desired by adding
41
+ more #if blocks, extending the patterns apparent in the code. In addition,
42
+ crc32.h would need to be regenerated, if the maximum N value is increased.
43
+
44
+ N and W are chosen empirically by benchmarking the execution time on a given
45
+ processor. The choices for N and W below were based on testing on Intel Kaby
46
+ Lake i7, AMD Ryzen 7, ARM Cortex-A57, Sparc64-VII, PowerPC POWER9, and MIPS64
47
+ Octeon II processors. The Intel, AMD, and ARM processors were all fastest
48
+ with N=5, W=8. The Sparc, PowerPC, and MIPS64 were all fastest at N=5, W=4.
49
+ They were all tested with either gcc or clang, all using the -O3 optimization
50
+ level. Your mileage may vary.
51
+ */
52
+
53
+ /* Define N */
54
+ #ifdef Z_TESTN
55
+ # define N Z_TESTN
56
+ #else
57
+ # define N 5
58
+ #endif
59
+ #if N < 1 || N > 6
60
+ # error N must be in 1..6
36
61
  #endif
37
- #ifdef BYFOUR
38
- local unsigned long crc32_little OF((unsigned long,
39
- const unsigned char FAR *, z_size_t));
40
- local unsigned long crc32_big OF((unsigned long,
41
- const unsigned char FAR *, z_size_t));
42
- # define TBLS 8
62
+
63
+ /*
64
+ z_crc_t must be at least 32 bits. z_word_t must be at least as long as
65
+ z_crc_t. It is assumed here that z_word_t is either 32 bits or 64 bits, and
66
+ that bytes are eight bits.
67
+ */
68
+
69
+ /*
70
+ Define W and the associated z_word_t type. If W is not defined, then a
71
+ braided calculation is not used, and the associated tables and code are not
72
+ compiled.
73
+ */
74
+ #ifdef Z_TESTW
75
+ # if Z_TESTW-1 != -1
76
+ # define W Z_TESTW
77
+ # endif
43
78
  #else
44
- # define TBLS 1
45
- #endif /* BYFOUR */
79
+ # ifdef MAKECRCH
80
+ # define W 8 /* required for MAKECRCH */
81
+ # else
82
+ # if defined(__x86_64__) || defined(__aarch64__)
83
+ # define W 8
84
+ # else
85
+ # define W 4
86
+ # endif
87
+ # endif
88
+ #endif
89
+ #ifdef W
90
+ # if W == 8 && defined(Z_U8)
91
+ typedef Z_U8 z_word_t;
92
+ # elif defined(Z_U4)
93
+ # undef W
94
+ # define W 4
95
+ typedef Z_U4 z_word_t;
96
+ # else
97
+ # undef W
98
+ # endif
99
+ #endif
46
100
 
47
- /* Local functions for crc concatenation */
48
- local unsigned long gf2_matrix_times OF((unsigned long *mat,
49
- unsigned long vec));
50
- local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
51
- local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
101
+ /* If available, use the ARM processor CRC32 instruction. */
102
+ #if defined(__aarch64__) && defined(__ARM_FEATURE_CRC32) && W == 8
103
+ # define ARMCRC32
104
+ #endif
52
105
 
106
+ #if defined(W) && (!defined(ARMCRC32) || defined(DYNAMIC_CRC_TABLE))
107
+ /*
108
+ Swap the bytes in a z_word_t to convert between little and big endian. Any
109
+ self-respecting compiler will optimize this to a single machine byte-swap
110
+ instruction, if one is available. This assumes that word_t is either 32 bits
111
+ or 64 bits.
112
+ */
113
+ local z_word_t byte_swap(z_word_t word) {
114
+ # if W == 8
115
+ return
116
+ (word & 0xff00000000000000) >> 56 |
117
+ (word & 0xff000000000000) >> 40 |
118
+ (word & 0xff0000000000) >> 24 |
119
+ (word & 0xff00000000) >> 8 |
120
+ (word & 0xff000000) << 8 |
121
+ (word & 0xff0000) << 24 |
122
+ (word & 0xff00) << 40 |
123
+ (word & 0xff) << 56;
124
+ # else /* W == 4 */
125
+ return
126
+ (word & 0xff000000) >> 24 |
127
+ (word & 0xff0000) >> 8 |
128
+ (word & 0xff00) << 8 |
129
+ (word & 0xff) << 24;
130
+ # endif
131
+ }
132
+ #endif
53
133
 
54
134
  #ifdef DYNAMIC_CRC_TABLE
135
+ /* =========================================================================
136
+ * Table of powers of x for combining CRC-32s, filled in by make_crc_table()
137
+ * below.
138
+ */
139
+ local z_crc_t FAR x2n_table[32];
140
+ #else
141
+ /* =========================================================================
142
+ * Tables for byte-wise and braided CRC-32 calculations, and a table of powers
143
+ * of x for combining CRC-32s, all made by make_crc_table().
144
+ */
145
+ # include "crc32.h"
146
+ #endif
147
+
148
+ /* CRC polynomial. */
149
+ #define POLY 0xedb88320 /* p(x) reflected, with x^32 implied */
55
150
 
56
- local volatile int crc_table_empty = 1;
57
- local z_crc_t FAR crc_table[TBLS][256];
58
- local void make_crc_table OF((void));
151
+ /*
152
+ Return a(x) multiplied by b(x) modulo p(x), where p(x) is the CRC polynomial,
153
+ reflected. For speed, this requires that a not be zero.
154
+ */
155
+ local z_crc_t multmodp(z_crc_t a, z_crc_t b) {
156
+ z_crc_t m, p;
157
+
158
+ m = (z_crc_t)1 << 31;
159
+ p = 0;
160
+ for (;;) {
161
+ if (a & m) {
162
+ p ^= b;
163
+ if ((a & (m - 1)) == 0)
164
+ break;
165
+ }
166
+ m >>= 1;
167
+ b = b & 1 ? (b >> 1) ^ POLY : b >> 1;
168
+ }
169
+ return p;
170
+ }
171
+
172
+ /*
173
+ Return x^(n * 2^k) modulo p(x). Requires that x2n_table[] has been
174
+ initialized.
175
+ */
176
+ local z_crc_t x2nmodp(z_off64_t n, unsigned k) {
177
+ z_crc_t p;
178
+
179
+ p = (z_crc_t)1 << 31; /* x^0 == 1 */
180
+ while (n) {
181
+ if (n & 1)
182
+ p = multmodp(x2n_table[k & 31], p);
183
+ n >>= 1;
184
+ k++;
185
+ }
186
+ return p;
187
+ }
188
+
189
+ #ifdef DYNAMIC_CRC_TABLE
190
+ /* =========================================================================
191
+ * Build the tables for byte-wise and braided CRC-32 calculations, and a table
192
+ * of powers of x for combining CRC-32s.
193
+ */
194
+ local z_crc_t FAR crc_table[256];
195
+ #ifdef W
196
+ local z_word_t FAR crc_big_table[256];
197
+ local z_crc_t FAR crc_braid_table[W][256];
198
+ local z_word_t FAR crc_braid_big_table[W][256];
199
+ local void braid(z_crc_t [][256], z_word_t [][256], int, int);
200
+ #endif
59
201
  #ifdef MAKECRCH
60
- local void write_table OF((FILE *, const z_crc_t FAR *));
202
+ local void write_table(FILE *, const z_crc_t FAR *, int);
203
+ local void write_table32hi(FILE *, const z_word_t FAR *, int);
204
+ local void write_table64(FILE *, const z_word_t FAR *, int);
61
205
  #endif /* MAKECRCH */
206
+
207
+ /*
208
+ Define a once() function depending on the availability of atomics. If this is
209
+ compiled with DYNAMIC_CRC_TABLE defined, and if CRCs will be computed in
210
+ multiple threads, and if atomics are not available, then get_crc_table() must
211
+ be called to initialize the tables and must return before any threads are
212
+ allowed to compute or combine CRCs.
213
+ */
214
+
215
+ /* Definition of once functionality. */
216
+ typedef struct once_s once_t;
217
+
218
+ /* Check for the availability of atomics. */
219
+ #if defined(__STDC__) && __STDC_VERSION__ >= 201112L && \
220
+ !defined(__STDC_NO_ATOMICS__)
221
+
222
+ #include <stdatomic.h>
223
+
224
+ /* Structure for once(), which must be initialized with ONCE_INIT. */
225
+ struct once_s {
226
+ atomic_flag begun;
227
+ atomic_int done;
228
+ };
229
+ #define ONCE_INIT {ATOMIC_FLAG_INIT, 0}
230
+
231
+ /*
232
+ Run the provided init() function exactly once, even if multiple threads
233
+ invoke once() at the same time. The state must be a once_t initialized with
234
+ ONCE_INIT.
235
+ */
236
+ local void once(once_t *state, void (*init)(void)) {
237
+ if (!atomic_load(&state->done)) {
238
+ if (atomic_flag_test_and_set(&state->begun))
239
+ while (!atomic_load(&state->done))
240
+ ;
241
+ else {
242
+ init();
243
+ atomic_store(&state->done, 1);
244
+ }
245
+ }
246
+ }
247
+
248
+ #else /* no atomics */
249
+
250
+ /* Structure for once(), which must be initialized with ONCE_INIT. */
251
+ struct once_s {
252
+ volatile int begun;
253
+ volatile int done;
254
+ };
255
+ #define ONCE_INIT {0, 0}
256
+
257
+ /* Test and set. Alas, not atomic, but tries to minimize the period of
258
+ vulnerability. */
259
+ local int test_and_set(int volatile *flag) {
260
+ int was;
261
+
262
+ was = *flag;
263
+ *flag = 1;
264
+ return was;
265
+ }
266
+
267
+ /* Run the provided init() function once. This is not thread-safe. */
268
+ local void once(once_t *state, void (*init)(void)) {
269
+ if (!state->done) {
270
+ if (test_and_set(&state->begun))
271
+ while (!state->done)
272
+ ;
273
+ else {
274
+ init();
275
+ state->done = 1;
276
+ }
277
+ }
278
+ }
279
+
280
+ #endif
281
+
282
+ /* State for once(). */
283
+ local once_t made = ONCE_INIT;
284
+
62
285
  /*
63
286
  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
64
287
  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
65
288
 
66
289
  Polynomials over GF(2) are represented in binary, one bit per coefficient,
67
- with the lowest powers in the most significant bit. Then adding polynomials
290
+ with the lowest powers in the most significant bit. Then adding polynomials
68
291
  is just exclusive-or, and multiplying a polynomial by x is a right shift by
69
- one. If we call the above polynomial p, and represent a byte as the
292
+ one. If we call the above polynomial p, and represent a byte as the
70
293
  polynomial q, also with the lowest power in the most significant bit (so the
71
- byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
294
+ byte 0xb1 is the polynomial x^7+x^3+x^2+1), then the CRC is (q*x^32) mod p,
72
295
  where a mod b means the remainder after dividing a by b.
73
296
 
74
297
  This calculation is done using the shift-register method of multiplying and
75
- taking the remainder. The register is initialized to zero, and for each
298
+ taking the remainder. The register is initialized to zero, and for each
76
299
  incoming bit, x^32 is added mod p to the register if the bit is a one (where
77
- x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
78
- x (which is shifting right by one and adding x^32 mod p if the bit shifted
79
- out is a one). We start with the highest power (least significant bit) of
80
- q and repeat for all eight bits of q.
81
-
82
- The first table is simply the CRC of all possible eight bit values. This is
83
- all the information needed to generate CRCs on data a byte at a time for all
84
- combinations of CRC register values and incoming bytes. The remaining tables
85
- allow for word-at-a-time CRC calculation for both big-endian and little-
86
- endian machines, where a word is four bytes.
87
- */
88
- local void make_crc_table()
89
- {
90
- z_crc_t c;
91
- int n, k;
92
- z_crc_t poly; /* polynomial exclusive-or pattern */
93
- /* terms of polynomial defining this crc (except x^32): */
94
- static volatile int first = 1; /* flag to limit concurrent making */
95
- static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
96
-
97
- /* See if another task is already doing this (not thread-safe, but better
98
- than nothing -- significantly reduces duration of vulnerability in
99
- case the advice about DYNAMIC_CRC_TABLE is ignored) */
100
- if (first) {
101
- first = 0;
102
-
103
- /* make exclusive-or pattern from polynomial (0xedb88320UL) */
104
- poly = 0;
105
- for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
106
- poly |= (z_crc_t)1 << (31 - p[n]);
107
-
108
- /* generate a crc for every 8-bit value */
109
- for (n = 0; n < 256; n++) {
110
- c = (z_crc_t)n;
111
- for (k = 0; k < 8; k++)
112
- c = c & 1 ? poly ^ (c >> 1) : c >> 1;
113
- crc_table[0][n] = c;
114
- }
300
+ x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by x
301
+ (which is shifting right by one and adding x^32 mod p if the bit shifted out
302
+ is a one). We start with the highest power (least significant bit) of q and
303
+ repeat for all eight bits of q.
115
304
 
116
- #ifdef BYFOUR
117
- /* generate crc for each value followed by one, two, and three zeros,
118
- and then the byte reversal of those as well as the first table */
119
- for (n = 0; n < 256; n++) {
120
- c = crc_table[0][n];
121
- crc_table[4][n] = ZSWAP32(c);
122
- for (k = 1; k < 4; k++) {
123
- c = crc_table[0][c & 0xff] ^ (c >> 8);
124
- crc_table[k][n] = c;
125
- crc_table[k + 4][n] = ZSWAP32(c);
126
- }
127
- }
128
- #endif /* BYFOUR */
305
+ The table is simply the CRC of all possible eight bit values. This is all the
306
+ information needed to generate CRCs on data a byte at a time for all
307
+ combinations of CRC register values and incoming bytes.
308
+ */
129
309
 
130
- crc_table_empty = 0;
131
- }
132
- else { /* not first */
133
- /* wait for the other guy to finish (not efficient, but rare) */
134
- while (crc_table_empty)
135
- ;
310
+ local void make_crc_table(void) {
311
+ unsigned i, j, n;
312
+ z_crc_t p;
313
+
314
+ /* initialize the CRC of bytes tables */
315
+ for (i = 0; i < 256; i++) {
316
+ p = i;
317
+ for (j = 0; j < 8; j++)
318
+ p = p & 1 ? (p >> 1) ^ POLY : p >> 1;
319
+ crc_table[i] = p;
320
+ #ifdef W
321
+ crc_big_table[i] = byte_swap(p);
322
+ #endif
136
323
  }
137
324
 
325
+ /* initialize the x^2^n mod p(x) table */
326
+ p = (z_crc_t)1 << 30; /* x^1 */
327
+ x2n_table[0] = p;
328
+ for (n = 1; n < 32; n++)
329
+ x2n_table[n] = p = multmodp(p, p);
330
+
331
+ #ifdef W
332
+ /* initialize the braiding tables -- needs x2n_table[] */
333
+ braid(crc_braid_table, crc_braid_big_table, N, W);
334
+ #endif
335
+
138
336
  #ifdef MAKECRCH
139
- /* write out CRC tables to crc32.h */
140
337
  {
338
+ /*
339
+ The crc32.h header file contains tables for both 32-bit and 64-bit
340
+ z_word_t's, and so requires a 64-bit type be available. In that case,
341
+ z_word_t must be defined to be 64-bits. This code then also generates
342
+ and writes out the tables for the case that z_word_t is 32 bits.
343
+ */
344
+ #if !defined(W) || W != 8
345
+ # error Need a 64-bit integer type in order to generate crc32.h.
346
+ #endif
141
347
  FILE *out;
348
+ int k, n;
349
+ z_crc_t ltl[8][256];
350
+ z_word_t big[8][256];
142
351
 
143
352
  out = fopen("crc32.h", "w");
144
353
  if (out == NULL) return;
145
- fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
146
- fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
147
- fprintf(out, "local const z_crc_t FAR ");
148
- fprintf(out, "crc_table[TBLS][256] =\n{\n {\n");
149
- write_table(out, crc_table[0]);
150
- # ifdef BYFOUR
151
- fprintf(out, "#ifdef BYFOUR\n");
152
- for (k = 1; k < 8; k++) {
153
- fprintf(out, " },\n {\n");
154
- write_table(out, crc_table[k]);
354
+
355
+ /* write out little-endian CRC table to crc32.h */
356
+ fprintf(out,
357
+ "/* crc32.h -- tables for rapid CRC calculation\n"
358
+ " * Generated automatically by crc32.c\n */\n"
359
+ "\n"
360
+ "local const z_crc_t FAR crc_table[] = {\n"
361
+ " ");
362
+ write_table(out, crc_table, 256);
363
+ fprintf(out,
364
+ "};\n");
365
+
366
+ /* write out big-endian CRC table for 64-bit z_word_t to crc32.h */
367
+ fprintf(out,
368
+ "\n"
369
+ "#ifdef W\n"
370
+ "\n"
371
+ "#if W == 8\n"
372
+ "\n"
373
+ "local const z_word_t FAR crc_big_table[] = {\n"
374
+ " ");
375
+ write_table64(out, crc_big_table, 256);
376
+ fprintf(out,
377
+ "};\n");
378
+
379
+ /* write out big-endian CRC table for 32-bit z_word_t to crc32.h */
380
+ fprintf(out,
381
+ "\n"
382
+ "#else /* W == 4 */\n"
383
+ "\n"
384
+ "local const z_word_t FAR crc_big_table[] = {\n"
385
+ " ");
386
+ write_table32hi(out, crc_big_table, 256);
387
+ fprintf(out,
388
+ "};\n"
389
+ "\n"
390
+ "#endif\n");
391
+
392
+ /* write out braid tables for each value of N */
393
+ for (n = 1; n <= 6; n++) {
394
+ fprintf(out,
395
+ "\n"
396
+ "#if N == %d\n", n);
397
+
398
+ /* compute braid tables for this N and 64-bit word_t */
399
+ braid(ltl, big, n, 8);
400
+
401
+ /* write out braid tables for 64-bit z_word_t to crc32.h */
402
+ fprintf(out,
403
+ "\n"
404
+ "#if W == 8\n"
405
+ "\n"
406
+ "local const z_crc_t FAR crc_braid_table[][256] = {\n");
407
+ for (k = 0; k < 8; k++) {
408
+ fprintf(out, " {");
409
+ write_table(out, ltl[k], 256);
410
+ fprintf(out, "}%s", k < 7 ? ",\n" : "");
411
+ }
412
+ fprintf(out,
413
+ "};\n"
414
+ "\n"
415
+ "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
416
+ for (k = 0; k < 8; k++) {
417
+ fprintf(out, " {");
418
+ write_table64(out, big[k], 256);
419
+ fprintf(out, "}%s", k < 7 ? ",\n" : "");
420
+ }
421
+ fprintf(out,
422
+ "};\n");
423
+
424
+ /* compute braid tables for this N and 32-bit word_t */
425
+ braid(ltl, big, n, 4);
426
+
427
+ /* write out braid tables for 32-bit z_word_t to crc32.h */
428
+ fprintf(out,
429
+ "\n"
430
+ "#else /* W == 4 */\n"
431
+ "\n"
432
+ "local const z_crc_t FAR crc_braid_table[][256] = {\n");
433
+ for (k = 0; k < 4; k++) {
434
+ fprintf(out, " {");
435
+ write_table(out, ltl[k], 256);
436
+ fprintf(out, "}%s", k < 3 ? ",\n" : "");
437
+ }
438
+ fprintf(out,
439
+ "};\n"
440
+ "\n"
441
+ "local const z_word_t FAR crc_braid_big_table[][256] = {\n");
442
+ for (k = 0; k < 4; k++) {
443
+ fprintf(out, " {");
444
+ write_table32hi(out, big[k], 256);
445
+ fprintf(out, "}%s", k < 3 ? ",\n" : "");
446
+ }
447
+ fprintf(out,
448
+ "};\n"
449
+ "\n"
450
+ "#endif\n"
451
+ "\n"
452
+ "#endif\n");
155
453
  }
156
- fprintf(out, "#endif\n");
157
- # endif /* BYFOUR */
158
- fprintf(out, " }\n};\n");
454
+ fprintf(out,
455
+ "\n"
456
+ "#endif\n");
457
+
458
+ /* write out zeros operator table to crc32.h */
459
+ fprintf(out,
460
+ "\n"
461
+ "local const z_crc_t FAR x2n_table[] = {\n"
462
+ " ");
463
+ write_table(out, x2n_table, 32);
464
+ fprintf(out,
465
+ "};\n");
159
466
  fclose(out);
160
467
  }
161
468
  #endif /* MAKECRCH */
162
469
  }
163
470
 
164
471
  #ifdef MAKECRCH
165
- local void write_table(out, table)
166
- FILE *out;
167
- const z_crc_t FAR *table;
168
- {
472
+
473
+ /*
474
+ Write the 32-bit values in table[0..k-1] to out, five per line in
475
+ hexadecimal separated by commas.
476
+ */
477
+ local void write_table(FILE *out, const z_crc_t FAR *table, int k) {
169
478
  int n;
170
479
 
171
- for (n = 0; n < 256; n++)
172
- fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ",
480
+ for (n = 0; n < k; n++)
481
+ fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : " ",
173
482
  (unsigned long)(table[n]),
174
- n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
483
+ n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
175
484
  }
485
+
486
+ /*
487
+ Write the high 32-bits of each value in table[0..k-1] to out, five per line
488
+ in hexadecimal separated by commas.
489
+ */
490
+ local void write_table32hi(FILE *out, const z_word_t FAR *table, int k) {
491
+ int n;
492
+
493
+ for (n = 0; n < k; n++)
494
+ fprintf(out, "%s0x%08lx%s", n == 0 || n % 5 ? "" : " ",
495
+ (unsigned long)(table[n] >> 32),
496
+ n == k - 1 ? "" : (n % 5 == 4 ? ",\n" : ", "));
497
+ }
498
+
499
+ /*
500
+ Write the 64-bit values in table[0..k-1] to out, three per line in
501
+ hexadecimal separated by commas. This assumes that if there is a 64-bit
502
+ type, then there is also a long long integer type, and it is at least 64
503
+ bits. If not, then the type cast and format string can be adjusted
504
+ accordingly.
505
+ */
506
+ local void write_table64(FILE *out, const z_word_t FAR *table, int k) {
507
+ int n;
508
+
509
+ for (n = 0; n < k; n++)
510
+ fprintf(out, "%s0x%016llx%s", n == 0 || n % 3 ? "" : " ",
511
+ (unsigned long long)(table[n]),
512
+ n == k - 1 ? "" : (n % 3 == 2 ? ",\n" : ", "));
513
+ }
514
+
515
+ /* Actually do the deed. */
516
+ int main(void) {
517
+ make_crc_table();
518
+ return 0;
519
+ }
520
+
176
521
  #endif /* MAKECRCH */
177
522
 
178
- #else /* !DYNAMIC_CRC_TABLE */
179
- /* ========================================================================
180
- * Tables of CRC-32s of all single-byte values, made by make_crc_table().
523
+ #ifdef W
524
+ /*
525
+ Generate the little and big-endian braid tables for the given n and z_word_t
526
+ size w. Each array must have room for w blocks of 256 elements.
181
527
  */
182
- #include "crc32.h"
528
+ local void braid(z_crc_t ltl[][256], z_word_t big[][256], int n, int w) {
529
+ int k;
530
+ z_crc_t i, p, q;
531
+ for (k = 0; k < w; k++) {
532
+ p = x2nmodp((n * w + 3 - k) << 3, 0);
533
+ ltl[k][0] = 0;
534
+ big[w - 1 - k][0] = 0;
535
+ for (i = 1; i < 256; i++) {
536
+ ltl[k][i] = q = multmodp(i << 24, p);
537
+ big[w - 1 - k][i] = byte_swap(q);
538
+ }
539
+ }
540
+ }
541
+ #endif
542
+
183
543
  #endif /* DYNAMIC_CRC_TABLE */
184
544
 
185
545
  /* =========================================================================
186
- * This function can be used by asm versions of crc32()
546
+ * This function can be used by asm versions of crc32(), and to force the
547
+ * generation of the CRC tables in a threaded application.
187
548
  */
188
- const z_crc_t FAR * ZEXPORT get_crc_table()
189
- {
549
+ const z_crc_t FAR * ZEXPORT get_crc_table(void) {
190
550
  #ifdef DYNAMIC_CRC_TABLE
191
- if (crc_table_empty)
192
- make_crc_table();
551
+ once(&made, make_crc_table);
193
552
  #endif /* DYNAMIC_CRC_TABLE */
194
553
  return (const z_crc_t FAR *)crc_table;
195
554
  }
196
555
 
197
- /* ========================================================================= */
198
- #define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
199
- #define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
556
+ /* =========================================================================
557
+ * Use ARM machine instructions if available. This will compute the CRC about
558
+ * ten times faster than the braided calculation. This code does not check for
559
+ * the presence of the CRC instruction at run time. __ARM_FEATURE_CRC32 will
560
+ * only be defined if the compilation specifies an ARM processor architecture
561
+ * that has the instructions. For example, compiling with -march=armv8.1-a or
562
+ * -march=armv8-a+crc, or -march=native if the compile machine has the crc32
563
+ * instructions.
564
+ */
565
+ #ifdef ARMCRC32
200
566
 
201
- /* ========================================================================= */
202
- unsigned long ZEXPORT crc32_z(crc, buf, len)
203
- unsigned long crc;
204
- const unsigned char FAR *buf;
205
- z_size_t len;
206
- {
207
- if (buf == Z_NULL) return 0UL;
567
+ /*
568
+ Constants empirically determined to maximize speed. These values are from
569
+ measurements on a Cortex-A57. Your mileage may vary.
570
+ */
571
+ #define Z_BATCH 3990 /* number of words in a batch */
572
+ #define Z_BATCH_ZEROS 0xa10d3d0c /* computed from Z_BATCH = 3990 */
573
+ #define Z_BATCH_MIN 800 /* fewest words in a final batch */
574
+
575
+ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
576
+ z_size_t len) {
577
+ z_crc_t val;
578
+ z_word_t crc1, crc2;
579
+ const z_word_t *word;
580
+ z_word_t val0, val1, val2;
581
+ z_size_t last, last2, i;
582
+ z_size_t num;
583
+
584
+ /* Return initial CRC, if requested. */
585
+ if (buf == Z_NULL) return 0;
208
586
 
209
587
  #ifdef DYNAMIC_CRC_TABLE
210
- if (crc_table_empty)
211
- make_crc_table();
588
+ once(&made, make_crc_table);
212
589
  #endif /* DYNAMIC_CRC_TABLE */
213
590
 
214
- #ifdef BYFOUR
215
- if (sizeof(void *) == sizeof(ptrdiff_t)) {
216
- z_crc_t endian;
591
+ /* Pre-condition the CRC */
592
+ crc = (~crc) & 0xffffffff;
217
593
 
218
- endian = 1;
219
- if (*((unsigned char *)(&endian)))
220
- return crc32_little(crc, buf, len);
221
- else
222
- return crc32_big(crc, buf, len);
594
+ /* Compute the CRC up to a word boundary. */
595
+ while (len && ((z_size_t)buf & 7) != 0) {
596
+ len--;
597
+ val = *buf++;
598
+ __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
223
599
  }
224
- #endif /* BYFOUR */
225
- crc = crc ^ 0xffffffffUL;
226
- while (len >= 8) {
227
- DO8;
228
- len -= 8;
600
+
601
+ /* Prepare to compute the CRC on full 64-bit words word[0..num-1]. */
602
+ word = (z_word_t const *)buf;
603
+ num = len >> 3;
604
+ len &= 7;
605
+
606
+ /* Do three interleaved CRCs to realize the throughput of one crc32x
607
+ instruction per cycle. Each CRC is calculated on Z_BATCH words. The
608
+ three CRCs are combined into a single CRC after each set of batches. */
609
+ while (num >= 3 * Z_BATCH) {
610
+ crc1 = 0;
611
+ crc2 = 0;
612
+ for (i = 0; i < Z_BATCH; i++) {
613
+ val0 = word[i];
614
+ val1 = word[i + Z_BATCH];
615
+ val2 = word[i + 2 * Z_BATCH];
616
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
617
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
618
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
619
+ }
620
+ word += 3 * Z_BATCH;
621
+ num -= 3 * Z_BATCH;
622
+ crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc1;
623
+ crc = multmodp(Z_BATCH_ZEROS, crc) ^ crc2;
229
624
  }
230
- if (len) do {
231
- DO1;
232
- } while (--len);
233
- return crc ^ 0xffffffffUL;
234
- }
235
625
 
236
- /* ========================================================================= */
237
- unsigned long ZEXPORT crc32(crc, buf, len)
238
- unsigned long crc;
239
- const unsigned char FAR *buf;
240
- uInt len;
241
- {
242
- return crc32_z(crc, buf, len);
626
+ /* Do one last smaller batch with the remaining words, if there are enough
627
+ to pay for the combination of CRCs. */
628
+ last = num / 3;
629
+ if (last >= Z_BATCH_MIN) {
630
+ last2 = last << 1;
631
+ crc1 = 0;
632
+ crc2 = 0;
633
+ for (i = 0; i < last; i++) {
634
+ val0 = word[i];
635
+ val1 = word[i + last];
636
+ val2 = word[i + last2];
637
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
638
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc1) : "r"(val1));
639
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc2) : "r"(val2));
640
+ }
641
+ word += 3 * last;
642
+ num -= 3 * last;
643
+ val = x2nmodp(last, 6);
644
+ crc = multmodp(val, crc) ^ crc1;
645
+ crc = multmodp(val, crc) ^ crc2;
646
+ }
647
+
648
+ /* Compute the CRC on any remaining words. */
649
+ for (i = 0; i < num; i++) {
650
+ val0 = word[i];
651
+ __asm__ volatile("crc32x %w0, %w0, %x1" : "+r"(crc) : "r"(val0));
652
+ }
653
+ word += num;
654
+
655
+ /* Complete the CRC on any remaining bytes. */
656
+ buf = (const unsigned char FAR *)word;
657
+ while (len) {
658
+ len--;
659
+ val = *buf++;
660
+ __asm__ volatile("crc32b %w0, %w0, %w1" : "+r"(crc) : "r"(val));
661
+ }
662
+
663
+ /* Return the CRC, post-conditioned. */
664
+ return crc ^ 0xffffffff;
243
665
  }
244
666
 
245
- #ifdef BYFOUR
667
+ #else
668
+
669
+ #ifdef W
246
670
 
247
671
  /*
248
- This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
249
- integer pointer type. This violates the strict aliasing rule, where a
250
- compiler can assume, for optimization purposes, that two pointers to
251
- fundamentally different types won't ever point to the same memory. This can
252
- manifest as a problem only if one of the pointers is written to. This code
253
- only reads from those pointers. So long as this code remains isolated in
254
- this compilation unit, there won't be a problem. For this reason, this code
255
- should not be copied and pasted into a compilation unit in which other code
256
- writes to the buffer that is passed to these routines.
672
+ Return the CRC of the W bytes in the word_t data, taking the
673
+ least-significant byte of the word as the first byte of data, without any pre
674
+ or post conditioning. This is used to combine the CRCs of each braid.
257
675
  */
676
+ local z_crc_t crc_word(z_word_t data) {
677
+ int k;
678
+ for (k = 0; k < W; k++)
679
+ data = (data >> 8) ^ crc_table[data & 0xff];
680
+ return (z_crc_t)data;
681
+ }
258
682
 
259
- /* ========================================================================= */
260
- #define DOLIT4 c ^= *buf4++; \
261
- c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
262
- crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
263
- #define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
683
+ local z_word_t crc_word_big(z_word_t data) {
684
+ int k;
685
+ for (k = 0; k < W; k++)
686
+ data = (data << 8) ^
687
+ crc_big_table[(data >> ((W - 1) << 3)) & 0xff];
688
+ return data;
689
+ }
690
+
691
+ #endif
264
692
 
265
693
  /* ========================================================================= */
266
- local unsigned long crc32_little(crc, buf, len)
267
- unsigned long crc;
268
- const unsigned char FAR *buf;
269
- z_size_t len;
270
- {
271
- register z_crc_t c;
272
- register const z_crc_t FAR *buf4;
273
-
274
- c = (z_crc_t)crc;
275
- c = ~c;
276
- while (len && ((ptrdiff_t)buf & 3)) {
277
- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
278
- len--;
279
- }
694
+ unsigned long ZEXPORT crc32_z(unsigned long crc, const unsigned char FAR *buf,
695
+ z_size_t len) {
696
+ /* Return initial CRC, if requested. */
697
+ if (buf == Z_NULL) return 0;
280
698
 
281
- buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
282
- while (len >= 32) {
283
- DOLIT32;
284
- len -= 32;
285
- }
286
- while (len >= 4) {
287
- DOLIT4;
288
- len -= 4;
289
- }
290
- buf = (const unsigned char FAR *)buf4;
699
+ #ifdef DYNAMIC_CRC_TABLE
700
+ once(&made, make_crc_table);
701
+ #endif /* DYNAMIC_CRC_TABLE */
291
702
 
292
- if (len) do {
293
- c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
294
- } while (--len);
295
- c = ~c;
296
- return (unsigned long)c;
297
- }
703
+ /* Pre-condition the CRC */
704
+ crc = (~crc) & 0xffffffff;
298
705
 
299
- /* ========================================================================= */
300
- #define DOBIG4 c ^= *buf4++; \
301
- c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
302
- crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
303
- #define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
706
+ #ifdef W
304
707
 
305
- /* ========================================================================= */
306
- local unsigned long crc32_big(crc, buf, len)
307
- unsigned long crc;
308
- const unsigned char FAR *buf;
309
- z_size_t len;
310
- {
311
- register z_crc_t c;
312
- register const z_crc_t FAR *buf4;
313
-
314
- c = ZSWAP32((z_crc_t)crc);
315
- c = ~c;
316
- while (len && ((ptrdiff_t)buf & 3)) {
317
- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
318
- len--;
708
+ /* If provided enough bytes, do a braided CRC calculation. */
709
+ if (len >= N * W + W - 1) {
710
+ z_size_t blks;
711
+ z_word_t const *words;
712
+ unsigned endian;
713
+ int k;
714
+
715
+ /* Compute the CRC up to a z_word_t boundary. */
716
+ while (len && ((z_size_t)buf & (W - 1)) != 0) {
717
+ len--;
718
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
719
+ }
720
+
721
+ /* Compute the CRC on as many N z_word_t blocks as are available. */
722
+ blks = len / (N * W);
723
+ len -= blks * N * W;
724
+ words = (z_word_t const *)buf;
725
+
726
+ /* Do endian check at execution time instead of compile time, since ARM
727
+ processors can change the endianness at execution time. If the
728
+ compiler knows what the endianness will be, it can optimize out the
729
+ check and the unused branch. */
730
+ endian = 1;
731
+ if (*(unsigned char *)&endian) {
732
+ /* Little endian. */
733
+
734
+ z_crc_t crc0;
735
+ z_word_t word0;
736
+ #if N > 1
737
+ z_crc_t crc1;
738
+ z_word_t word1;
739
+ #if N > 2
740
+ z_crc_t crc2;
741
+ z_word_t word2;
742
+ #if N > 3
743
+ z_crc_t crc3;
744
+ z_word_t word3;
745
+ #if N > 4
746
+ z_crc_t crc4;
747
+ z_word_t word4;
748
+ #if N > 5
749
+ z_crc_t crc5;
750
+ z_word_t word5;
751
+ #endif
752
+ #endif
753
+ #endif
754
+ #endif
755
+ #endif
756
+
757
+ /* Initialize the CRC for each braid. */
758
+ crc0 = crc;
759
+ #if N > 1
760
+ crc1 = 0;
761
+ #if N > 2
762
+ crc2 = 0;
763
+ #if N > 3
764
+ crc3 = 0;
765
+ #if N > 4
766
+ crc4 = 0;
767
+ #if N > 5
768
+ crc5 = 0;
769
+ #endif
770
+ #endif
771
+ #endif
772
+ #endif
773
+ #endif
774
+
775
+ /*
776
+ Process the first blks-1 blocks, computing the CRCs on each braid
777
+ independently.
778
+ */
779
+ while (--blks) {
780
+ /* Load the word for each braid into registers. */
781
+ word0 = crc0 ^ words[0];
782
+ #if N > 1
783
+ word1 = crc1 ^ words[1];
784
+ #if N > 2
785
+ word2 = crc2 ^ words[2];
786
+ #if N > 3
787
+ word3 = crc3 ^ words[3];
788
+ #if N > 4
789
+ word4 = crc4 ^ words[4];
790
+ #if N > 5
791
+ word5 = crc5 ^ words[5];
792
+ #endif
793
+ #endif
794
+ #endif
795
+ #endif
796
+ #endif
797
+ words += N;
798
+
799
+ /* Compute and update the CRC for each word. The loop should
800
+ get unrolled. */
801
+ crc0 = crc_braid_table[0][word0 & 0xff];
802
+ #if N > 1
803
+ crc1 = crc_braid_table[0][word1 & 0xff];
804
+ #if N > 2
805
+ crc2 = crc_braid_table[0][word2 & 0xff];
806
+ #if N > 3
807
+ crc3 = crc_braid_table[0][word3 & 0xff];
808
+ #if N > 4
809
+ crc4 = crc_braid_table[0][word4 & 0xff];
810
+ #if N > 5
811
+ crc5 = crc_braid_table[0][word5 & 0xff];
812
+ #endif
813
+ #endif
814
+ #endif
815
+ #endif
816
+ #endif
817
+ for (k = 1; k < W; k++) {
818
+ crc0 ^= crc_braid_table[k][(word0 >> (k << 3)) & 0xff];
819
+ #if N > 1
820
+ crc1 ^= crc_braid_table[k][(word1 >> (k << 3)) & 0xff];
821
+ #if N > 2
822
+ crc2 ^= crc_braid_table[k][(word2 >> (k << 3)) & 0xff];
823
+ #if N > 3
824
+ crc3 ^= crc_braid_table[k][(word3 >> (k << 3)) & 0xff];
825
+ #if N > 4
826
+ crc4 ^= crc_braid_table[k][(word4 >> (k << 3)) & 0xff];
827
+ #if N > 5
828
+ crc5 ^= crc_braid_table[k][(word5 >> (k << 3)) & 0xff];
829
+ #endif
830
+ #endif
831
+ #endif
832
+ #endif
833
+ #endif
834
+ }
835
+ }
836
+
837
+ /*
838
+ Process the last block, combining the CRCs of the N braids at the
839
+ same time.
840
+ */
841
+ crc = crc_word(crc0 ^ words[0]);
842
+ #if N > 1
843
+ crc = crc_word(crc1 ^ words[1] ^ crc);
844
+ #if N > 2
845
+ crc = crc_word(crc2 ^ words[2] ^ crc);
846
+ #if N > 3
847
+ crc = crc_word(crc3 ^ words[3] ^ crc);
848
+ #if N > 4
849
+ crc = crc_word(crc4 ^ words[4] ^ crc);
850
+ #if N > 5
851
+ crc = crc_word(crc5 ^ words[5] ^ crc);
852
+ #endif
853
+ #endif
854
+ #endif
855
+ #endif
856
+ #endif
857
+ words += N;
858
+ }
859
+ else {
860
+ /* Big endian. */
861
+
862
+ z_word_t crc0, word0, comb;
863
+ #if N > 1
864
+ z_word_t crc1, word1;
865
+ #if N > 2
866
+ z_word_t crc2, word2;
867
+ #if N > 3
868
+ z_word_t crc3, word3;
869
+ #if N > 4
870
+ z_word_t crc4, word4;
871
+ #if N > 5
872
+ z_word_t crc5, word5;
873
+ #endif
874
+ #endif
875
+ #endif
876
+ #endif
877
+ #endif
878
+
879
+ /* Initialize the CRC for each braid. */
880
+ crc0 = byte_swap(crc);
881
+ #if N > 1
882
+ crc1 = 0;
883
+ #if N > 2
884
+ crc2 = 0;
885
+ #if N > 3
886
+ crc3 = 0;
887
+ #if N > 4
888
+ crc4 = 0;
889
+ #if N > 5
890
+ crc5 = 0;
891
+ #endif
892
+ #endif
893
+ #endif
894
+ #endif
895
+ #endif
896
+
897
+ /*
898
+ Process the first blks-1 blocks, computing the CRCs on each braid
899
+ independently.
900
+ */
901
+ while (--blks) {
902
+ /* Load the word for each braid into registers. */
903
+ word0 = crc0 ^ words[0];
904
+ #if N > 1
905
+ word1 = crc1 ^ words[1];
906
+ #if N > 2
907
+ word2 = crc2 ^ words[2];
908
+ #if N > 3
909
+ word3 = crc3 ^ words[3];
910
+ #if N > 4
911
+ word4 = crc4 ^ words[4];
912
+ #if N > 5
913
+ word5 = crc5 ^ words[5];
914
+ #endif
915
+ #endif
916
+ #endif
917
+ #endif
918
+ #endif
919
+ words += N;
920
+
921
+ /* Compute and update the CRC for each word. The loop should
922
+ get unrolled. */
923
+ crc0 = crc_braid_big_table[0][word0 & 0xff];
924
+ #if N > 1
925
+ crc1 = crc_braid_big_table[0][word1 & 0xff];
926
+ #if N > 2
927
+ crc2 = crc_braid_big_table[0][word2 & 0xff];
928
+ #if N > 3
929
+ crc3 = crc_braid_big_table[0][word3 & 0xff];
930
+ #if N > 4
931
+ crc4 = crc_braid_big_table[0][word4 & 0xff];
932
+ #if N > 5
933
+ crc5 = crc_braid_big_table[0][word5 & 0xff];
934
+ #endif
935
+ #endif
936
+ #endif
937
+ #endif
938
+ #endif
939
+ for (k = 1; k < W; k++) {
940
+ crc0 ^= crc_braid_big_table[k][(word0 >> (k << 3)) & 0xff];
941
+ #if N > 1
942
+ crc1 ^= crc_braid_big_table[k][(word1 >> (k << 3)) & 0xff];
943
+ #if N > 2
944
+ crc2 ^= crc_braid_big_table[k][(word2 >> (k << 3)) & 0xff];
945
+ #if N > 3
946
+ crc3 ^= crc_braid_big_table[k][(word3 >> (k << 3)) & 0xff];
947
+ #if N > 4
948
+ crc4 ^= crc_braid_big_table[k][(word4 >> (k << 3)) & 0xff];
949
+ #if N > 5
950
+ crc5 ^= crc_braid_big_table[k][(word5 >> (k << 3)) & 0xff];
951
+ #endif
952
+ #endif
953
+ #endif
954
+ #endif
955
+ #endif
956
+ }
957
+ }
958
+
959
+ /*
960
+ Process the last block, combining the CRCs of the N braids at the
961
+ same time.
962
+ */
963
+ comb = crc_word_big(crc0 ^ words[0]);
964
+ #if N > 1
965
+ comb = crc_word_big(crc1 ^ words[1] ^ comb);
966
+ #if N > 2
967
+ comb = crc_word_big(crc2 ^ words[2] ^ comb);
968
+ #if N > 3
969
+ comb = crc_word_big(crc3 ^ words[3] ^ comb);
970
+ #if N > 4
971
+ comb = crc_word_big(crc4 ^ words[4] ^ comb);
972
+ #if N > 5
973
+ comb = crc_word_big(crc5 ^ words[5] ^ comb);
974
+ #endif
975
+ #endif
976
+ #endif
977
+ #endif
978
+ #endif
979
+ words += N;
980
+ crc = byte_swap(comb);
981
+ }
982
+
983
+ /*
984
+ Update the pointer to the remaining bytes to process.
985
+ */
986
+ buf = (unsigned char const *)words;
319
987
  }
320
988
 
321
- buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
322
- while (len >= 32) {
323
- DOBIG32;
324
- len -= 32;
989
+ #endif /* W */
990
+
991
+ /* Complete the computation of the CRC on any remaining bytes. */
992
+ while (len >= 8) {
993
+ len -= 8;
994
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
995
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
996
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
997
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
998
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
999
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
1000
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
1001
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
325
1002
  }
326
- while (len >= 4) {
327
- DOBIG4;
328
- len -= 4;
1003
+ while (len) {
1004
+ len--;
1005
+ crc = (crc >> 8) ^ crc_table[(crc ^ *buf++) & 0xff];
329
1006
  }
330
- buf = (const unsigned char FAR *)buf4;
331
1007
 
332
- if (len) do {
333
- c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
334
- } while (--len);
335
- c = ~c;
336
- return (unsigned long)(ZSWAP32(c));
1008
+ /* Return the CRC, post-conditioned. */
1009
+ return crc ^ 0xffffffff;
337
1010
  }
338
1011
 
339
- #endif /* BYFOUR */
340
-
341
- #define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */
1012
+ #endif
342
1013
 
343
1014
  /* ========================================================================= */
344
- local unsigned long gf2_matrix_times(mat, vec)
345
- unsigned long *mat;
346
- unsigned long vec;
347
- {
348
- unsigned long sum;
349
-
350
- sum = 0;
351
- while (vec) {
352
- if (vec & 1)
353
- sum ^= *mat;
354
- vec >>= 1;
355
- mat++;
356
- }
357
- return sum;
1015
+ unsigned long ZEXPORT crc32(unsigned long crc, const unsigned char FAR *buf,
1016
+ uInt len) {
1017
+ return crc32_z(crc, buf, len);
358
1018
  }
359
1019
 
360
1020
  /* ========================================================================= */
361
- local void gf2_matrix_square(square, mat)
362
- unsigned long *square;
363
- unsigned long *mat;
364
- {
365
- int n;
366
-
367
- for (n = 0; n < GF2_DIM; n++)
368
- square[n] = gf2_matrix_times(mat, mat[n]);
1021
+ uLong ZEXPORT crc32_combine64(uLong crc1, uLong crc2, z_off64_t len2) {
1022
+ #ifdef DYNAMIC_CRC_TABLE
1023
+ once(&made, make_crc_table);
1024
+ #endif /* DYNAMIC_CRC_TABLE */
1025
+ return multmodp(x2nmodp(len2, 3), crc1) ^ (crc2 & 0xffffffff);
369
1026
  }
370
1027
 
371
1028
  /* ========================================================================= */
372
- local uLong crc32_combine_(crc1, crc2, len2)
373
- uLong crc1;
374
- uLong crc2;
375
- z_off64_t len2;
376
- {
377
- int n;
378
- unsigned long row;
379
- unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */
380
- unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */
381
-
382
- /* degenerate case (also disallow negative lengths) */
383
- if (len2 <= 0)
384
- return crc1;
385
-
386
- /* put operator for one zero bit in odd */
387
- odd[0] = 0xedb88320UL; /* CRC-32 polynomial */
388
- row = 1;
389
- for (n = 1; n < GF2_DIM; n++) {
390
- odd[n] = row;
391
- row <<= 1;
392
- }
1029
+ uLong ZEXPORT crc32_combine(uLong crc1, uLong crc2, z_off_t len2) {
1030
+ return crc32_combine64(crc1, crc2, (z_off64_t)len2);
1031
+ }
393
1032
 
394
- /* put operator for two zero bits in even */
395
- gf2_matrix_square(even, odd);
396
-
397
- /* put operator for four zero bits in odd */
398
- gf2_matrix_square(odd, even);
399
-
400
- /* apply len2 zeros to crc1 (first square will put the operator for one
401
- zero byte, eight zero bits, in even) */
402
- do {
403
- /* apply zeros operator for this bit of len2 */
404
- gf2_matrix_square(even, odd);
405
- if (len2 & 1)
406
- crc1 = gf2_matrix_times(even, crc1);
407
- len2 >>= 1;
408
-
409
- /* if no more bits set, then done */
410
- if (len2 == 0)
411
- break;
412
-
413
- /* another iteration of the loop with odd and even swapped */
414
- gf2_matrix_square(odd, even);
415
- if (len2 & 1)
416
- crc1 = gf2_matrix_times(odd, crc1);
417
- len2 >>= 1;
418
-
419
- /* if no more bits set, then done */
420
- } while (len2 != 0);
421
-
422
- /* return combined crc */
423
- crc1 ^= crc2;
424
- return crc1;
1033
+ /* ========================================================================= */
1034
+ uLong ZEXPORT crc32_combine_gen64(z_off64_t len2) {
1035
+ #ifdef DYNAMIC_CRC_TABLE
1036
+ once(&made, make_crc_table);
1037
+ #endif /* DYNAMIC_CRC_TABLE */
1038
+ return x2nmodp(len2, 3);
425
1039
  }
426
1040
 
427
1041
  /* ========================================================================= */
428
- uLong ZEXPORT crc32_combine(crc1, crc2, len2)
429
- uLong crc1;
430
- uLong crc2;
431
- z_off_t len2;
432
- {
433
- return crc32_combine_(crc1, crc2, len2);
1042
+ uLong ZEXPORT crc32_combine_gen(z_off_t len2) {
1043
+ return crc32_combine_gen64((z_off64_t)len2);
434
1044
  }
435
1045
 
1046
+ /* ========================================================================= */
1047
+ uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op) {
1048
+ return multmodp(op, crc1) ^ (crc2 & 0xffffffff);
1049
+ }