rugged 1.1.1 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/extconf.rb +2 -2
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_remote.c +17 -0
- data/ext/rugged/rugged_repo.c +3 -3
- data/lib/rugged/repository.rb +2 -2
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -271
- data/vendor/libgit2/COPYING +149 -24
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +13 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -96
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -48
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +32 -20
- data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +154 -122
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +17 -13
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +17 -4
- data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +106 -2
- data/vendor/libgit2/include/git2/blame.h +97 -43
- data/vendor/libgit2/include/git2/blob.h +33 -2
- data/vendor/libgit2/include/git2/branch.h +27 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +43 -6
- data/vendor/libgit2/include/git2/checkout.h +32 -13
- data/vendor/libgit2/include/git2/clone.h +4 -4
- data/vendor/libgit2/include/git2/commit.h +37 -19
- data/vendor/libgit2/include/git2/common.h +46 -5
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +326 -6
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +50 -121
- data/vendor/libgit2/include/git2/email.h +127 -0
- data/vendor/libgit2/include/git2/errors.h +7 -6
- data/vendor/libgit2/include/git2/filter.h +69 -18
- data/vendor/libgit2/include/git2/graph.h +21 -2
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +13 -7
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/notes.h +2 -2
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +65 -6
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/oidarray.h +5 -8
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +16 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +34 -2
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +8 -4
- data/vendor/libgit2/include/git2/remote.h +246 -46
- data/vendor/libgit2/include/git2/repository.h +25 -18
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +124 -62
- data/vendor/libgit2/include/git2/stdint.h +3 -3
- data/vendor/libgit2/include/git2/submodule.h +16 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/email.h +45 -0
- data/vendor/libgit2/include/git2/sys/filter.h +49 -28
- data/vendor/libgit2/include/git2/sys/midx.h +74 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +9 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +26 -34
- data/vendor/libgit2/include/git2/tag.h +13 -0
- data/vendor/libgit2/include/git2/tree.h +4 -17
- data/vendor/libgit2/include/git2/types.h +16 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +192 -290
- data/vendor/libgit2/src/alloc.c +21 -8
- data/vendor/libgit2/src/allocators/failalloc.c +92 -0
- data/vendor/libgit2/src/allocators/failalloc.h +23 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
- data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
- data/vendor/libgit2/src/annotated_commit.c +21 -9
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +34 -25
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +204 -82
- data/vendor/libgit2/src/attr_file.c +105 -52
- data/vendor/libgit2/src/attr_file.h +36 -15
- data/vendor/libgit2/src/attrcache.c +55 -45
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +15 -9
- data/vendor/libgit2/src/blame_git.c +2 -2
- data/vendor/libgit2/src/blob.c +76 -52
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +203 -110
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +11 -9
- data/vendor/libgit2/src/checkout.c +118 -91
- data/vendor/libgit2/src/cherrypick.c +16 -12
- data/vendor/libgit2/src/clone.c +97 -103
- data/vendor/libgit2/src/commit.c +167 -84
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +1224 -0
- data/vendor/libgit2/src/commit_graph.h +169 -0
- data/vendor/libgit2/src/commit_list.c +48 -3
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +35 -5
- data/vendor/libgit2/src/config.c +119 -64
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +120 -100
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +29 -27
- data/vendor/libgit2/src/crlf.c +36 -23
- data/vendor/libgit2/src/date.c +13 -19
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +32 -21
- data/vendor/libgit2/src/diff.c +71 -183
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +53 -51
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +31 -26
- data/vendor/libgit2/src/diff_generate.c +76 -23
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +120 -95
- data/vendor/libgit2/src/diff_stats.c +47 -34
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +7 -10
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/email.c +315 -0
- data/vendor/libgit2/src/email.h +25 -0
- data/vendor/libgit2/src/errors.c +37 -32
- data/vendor/libgit2/src/features.h.in +11 -2
- data/vendor/libgit2/src/fetch.c +77 -26
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +27 -23
- data/vendor/libgit2/src/filebuf.c +36 -34
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +278 -132
- data/vendor/libgit2/src/filter.h +46 -6
- data/vendor/libgit2/src/fs_path.c +2071 -0
- data/vendor/libgit2/src/fs_path.h +772 -0
- data/vendor/libgit2/src/futils.c +96 -90
- data/vendor/libgit2/src/futils.h +27 -15
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +5 -5
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +5 -5
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +13 -13
- data/vendor/libgit2/src/hash/sha1/openssl.c +5 -5
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +9 -11
- data/vendor/libgit2/src/hash/sha1/win32.c +21 -17
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +71 -36
- data/vendor/libgit2/src/hash.h +13 -13
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +30 -20
- data/vendor/libgit2/src/ignore.c +63 -46
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +184 -149
- data/vendor/libgit2/src/index.h +7 -4
- data/vendor/libgit2/src/indexer.c +143 -89
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +93 -73
- data/vendor/libgit2/src/iterator.h +6 -6
- data/vendor/libgit2/src/khash.h +3 -12
- data/vendor/libgit2/src/{settings.c → libgit2.c} +165 -56
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +60 -45
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +104 -61
- data/vendor/libgit2/src/merge.h +3 -15
- data/vendor/libgit2/src/merge_driver.c +21 -15
- data/vendor/libgit2/src/merge_file.c +24 -6
- data/vendor/libgit2/src/message.c +21 -8
- data/vendor/libgit2/src/midx.c +501 -18
- data/vendor/libgit2/src/midx.h +29 -2
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +405 -71
- data/vendor/libgit2/src/net.h +26 -5
- data/vendor/libgit2/src/netops.c +7 -5
- data/vendor/libgit2/src/netops.h +3 -3
- data/vendor/libgit2/src/notes.c +40 -49
- data/vendor/libgit2/src/object.c +68 -20
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +320 -80
- data/vendor/libgit2/src/odb.h +17 -3
- data/vendor/libgit2/src/odb_loose.c +96 -86
- data/vendor/libgit2/src/odb_mempack.c +19 -6
- data/vendor/libgit2/src/odb_pack.c +402 -125
- data/vendor/libgit2/src/oid.c +16 -8
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/oidarray.c +10 -1
- data/vendor/libgit2/src/pack-objects.c +90 -69
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +337 -127
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +17 -10
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +29 -13
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +26 -25
- data/vendor/libgit2/src/path.c +86 -1768
- data/vendor/libgit2/src/path.h +39 -635
- data/vendor/libgit2/src/pathspec.c +12 -12
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +14 -6
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +18 -14
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +177 -132
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +548 -222
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +107 -72
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +53 -38
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +960 -486
- data/vendor/libgit2/src/remote.h +16 -10
- data/vendor/libgit2/src/repository.c +702 -422
- data/vendor/libgit2/src/repository.h +26 -8
- data/vendor/libgit2/src/reset.c +16 -12
- data/vendor/libgit2/src/revert.c +16 -12
- data/vendor/libgit2/src/revparse.c +66 -48
- data/vendor/libgit2/src/revwalk.c +39 -22
- data/vendor/libgit2/src/runtime.c +162 -0
- data/vendor/libgit2/src/runtime.h +62 -0
- data/vendor/libgit2/src/settings.h +11 -0
- data/vendor/libgit2/src/signature.c +18 -11
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +39 -38
- data/vendor/libgit2/src/status.c +11 -5
- data/vendor/libgit2/src/{buffer.c → str.c} +459 -136
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +22 -23
- data/vendor/libgit2/src/streams/mbedtls.h +1 -1
- data/vendor/libgit2/src/streams/openssl.c +101 -201
- data/vendor/libgit2/src/streams/openssl.h +9 -1
- data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
- data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
- data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
- data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
- data/vendor/libgit2/src/streams/registry.c +5 -6
- data/vendor/libgit2/src/streams/socket.c +6 -2
- data/vendor/libgit2/src/streams/stransport.c +6 -3
- data/vendor/libgit2/src/streams/tls.c +5 -3
- data/vendor/libgit2/src/submodule.c +290 -212
- data/vendor/libgit2/src/submodule.h +10 -10
- data/vendor/libgit2/src/sysdir.c +70 -56
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +72 -34
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +84 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +3 -16
- data/vendor/libgit2/src/trace.h +17 -30
- data/vendor/libgit2/src/trailer.c +2 -2
- data/vendor/libgit2/src/transaction.c +20 -9
- data/vendor/libgit2/src/transport.c +13 -13
- data/vendor/libgit2/src/transports/auth.c +8 -10
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +23 -17
- data/vendor/libgit2/src/transports/auth_ntlm.c +20 -16
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +10 -14
- data/vendor/libgit2/src/transports/http.c +56 -34
- data/vendor/libgit2/src/transports/http.h +3 -3
- data/vendor/libgit2/src/transports/httpclient.c +106 -79
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +127 -119
- data/vendor/libgit2/src/transports/smart.c +61 -144
- data/vendor/libgit2/src/transports/smart.h +26 -32
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +68 -44
- data/vendor/libgit2/src/transports/ssh.c +100 -131
- data/vendor/libgit2/src/transports/winhttp.c +86 -82
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +150 -116
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +68 -144
- data/vendor/libgit2/src/util.h +36 -68
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +5 -3
- data/vendor/libgit2/src/win32/findfile.c +172 -114
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/map.c +1 -1
- data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
- data/vendor/libgit2/src/win32/path_w32.c +162 -33
- data/vendor/libgit2/src/win32/path_w32.h +2 -1
- data/vendor/libgit2/src/win32/posix.h +6 -7
- data/vendor/libgit2/src/win32/posix_w32.c +26 -33
- data/vendor/libgit2/src/win32/precompiled.h +0 -1
- data/vendor/libgit2/src/win32/reparse.h +4 -4
- data/vendor/libgit2/src/win32/thread.c +24 -15
- data/vendor/libgit2/src/win32/thread.h +1 -1
- data/vendor/libgit2/src/win32/w32_buffer.c +5 -6
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_common.h +18 -9
- data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
- data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -6
- data/vendor/libgit2/src/worktree.c +138 -105
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +6 -6
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +60 -24
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/buf_text.c +0 -316
- data/vendor/libgit2/src/buf_text.h +0 -122
- data/vendor/libgit2/src/buffer.h +0 -222
- data/vendor/libgit2/src/global.c +0 -363
- data/vendor/libgit2/src/global.h +0 -41
- data/vendor/libgit2/src/thread-utils.c +0 -58
- data/vendor/libgit2/src/thread-utils.h +0 -369
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
- data/vendor/libgit2/src/win32/w32_stack.c +0 -188
- data/vendor/libgit2/src/win32/w32_stack.h +0 -140
@@ -6,12 +6,16 @@
|
|
6
6
|
*/
|
7
7
|
|
8
8
|
#include "streams/openssl.h"
|
9
|
+
#include "streams/openssl_legacy.h"
|
10
|
+
#include "streams/openssl_dynamic.h"
|
9
11
|
|
10
12
|
#ifdef GIT_OPENSSL
|
11
13
|
|
12
14
|
#include <ctype.h>
|
13
15
|
|
14
|
-
#include "
|
16
|
+
#include "common.h"
|
17
|
+
#include "runtime.h"
|
18
|
+
#include "settings.h"
|
15
19
|
#include "posix.h"
|
16
20
|
#include "stream.h"
|
17
21
|
#include "streams/socket.h"
|
@@ -25,156 +29,17 @@
|
|
25
29
|
# include <netinet/in.h>
|
26
30
|
#endif
|
27
31
|
|
28
|
-
#
|
29
|
-
#include <openssl/
|
30
|
-
#include <openssl/
|
31
|
-
#include <openssl/
|
32
|
+
#ifndef GIT_OPENSSL_DYNAMIC
|
33
|
+
# include <openssl/ssl.h>
|
34
|
+
# include <openssl/err.h>
|
35
|
+
# include <openssl/x509v3.h>
|
36
|
+
# include <openssl/bio.h>
|
37
|
+
#endif
|
32
38
|
|
33
39
|
SSL_CTX *git__ssl_ctx;
|
34
40
|
|
35
41
|
#define GIT_SSL_DEFAULT_CIPHERS "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-DSS-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:DHE-DSS-AES128-SHA256:DHE-DSS-AES256-SHA256:DHE-DSS-AES128-SHA:DHE-DSS-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA"
|
36
42
|
|
37
|
-
#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || \
|
38
|
-
(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L)
|
39
|
-
# define OPENSSL_LEGACY_API
|
40
|
-
#endif
|
41
|
-
|
42
|
-
/*
|
43
|
-
* OpenSSL 1.1 made BIO opaque so we have to use functions to interact with it
|
44
|
-
* which do not exist in previous versions. We define these inline functions so
|
45
|
-
* we can program against the interface instead of littering the implementation
|
46
|
-
* with ifdefs. We do the same for OPENSSL_init_ssl.
|
47
|
-
*/
|
48
|
-
#if defined(OPENSSL_LEGACY_API)
|
49
|
-
static int OPENSSL_init_ssl(int opts, void *settings)
|
50
|
-
{
|
51
|
-
GIT_UNUSED(opts);
|
52
|
-
GIT_UNUSED(settings);
|
53
|
-
SSL_load_error_strings();
|
54
|
-
OpenSSL_add_ssl_algorithms();
|
55
|
-
return 0;
|
56
|
-
}
|
57
|
-
|
58
|
-
static BIO_METHOD* BIO_meth_new(int type, const char *name)
|
59
|
-
{
|
60
|
-
BIO_METHOD *meth = git__calloc(1, sizeof(BIO_METHOD));
|
61
|
-
if (!meth) {
|
62
|
-
return NULL;
|
63
|
-
}
|
64
|
-
|
65
|
-
meth->type = type;
|
66
|
-
meth->name = name;
|
67
|
-
|
68
|
-
return meth;
|
69
|
-
}
|
70
|
-
|
71
|
-
static void BIO_meth_free(BIO_METHOD *biom)
|
72
|
-
{
|
73
|
-
git__free(biom);
|
74
|
-
}
|
75
|
-
|
76
|
-
static int BIO_meth_set_write(BIO_METHOD *biom, int (*write) (BIO *, const char *, int))
|
77
|
-
{
|
78
|
-
biom->bwrite = write;
|
79
|
-
return 1;
|
80
|
-
}
|
81
|
-
|
82
|
-
static int BIO_meth_set_read(BIO_METHOD *biom, int (*read) (BIO *, char *, int))
|
83
|
-
{
|
84
|
-
biom->bread = read;
|
85
|
-
return 1;
|
86
|
-
}
|
87
|
-
|
88
|
-
static int BIO_meth_set_puts(BIO_METHOD *biom, int (*puts) (BIO *, const char *))
|
89
|
-
{
|
90
|
-
biom->bputs = puts;
|
91
|
-
return 1;
|
92
|
-
}
|
93
|
-
|
94
|
-
static int BIO_meth_set_gets(BIO_METHOD *biom, int (*gets) (BIO *, char *, int))
|
95
|
-
|
96
|
-
{
|
97
|
-
biom->bgets = gets;
|
98
|
-
return 1;
|
99
|
-
}
|
100
|
-
|
101
|
-
static int BIO_meth_set_ctrl(BIO_METHOD *biom, long (*ctrl) (BIO *, int, long, void *))
|
102
|
-
{
|
103
|
-
biom->ctrl = ctrl;
|
104
|
-
return 1;
|
105
|
-
}
|
106
|
-
|
107
|
-
static int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *))
|
108
|
-
{
|
109
|
-
biom->create = create;
|
110
|
-
return 1;
|
111
|
-
}
|
112
|
-
|
113
|
-
static int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *))
|
114
|
-
{
|
115
|
-
biom->destroy = destroy;
|
116
|
-
return 1;
|
117
|
-
}
|
118
|
-
|
119
|
-
static int BIO_get_new_index(void)
|
120
|
-
{
|
121
|
-
/* This exists as of 1.1 so before we'd just have 0 */
|
122
|
-
return 0;
|
123
|
-
}
|
124
|
-
|
125
|
-
static void BIO_set_init(BIO *b, int init)
|
126
|
-
{
|
127
|
-
b->init = init;
|
128
|
-
}
|
129
|
-
|
130
|
-
static void BIO_set_data(BIO *a, void *ptr)
|
131
|
-
{
|
132
|
-
a->ptr = ptr;
|
133
|
-
}
|
134
|
-
|
135
|
-
static void *BIO_get_data(BIO *a)
|
136
|
-
{
|
137
|
-
return a->ptr;
|
138
|
-
}
|
139
|
-
|
140
|
-
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *x)
|
141
|
-
{
|
142
|
-
return ASN1_STRING_data((ASN1_STRING *)x);
|
143
|
-
}
|
144
|
-
|
145
|
-
# if defined(GIT_THREADS)
|
146
|
-
static git_mutex *openssl_locks;
|
147
|
-
|
148
|
-
static void openssl_locking_function(
|
149
|
-
int mode, int n, const char *file, int line)
|
150
|
-
{
|
151
|
-
int lock;
|
152
|
-
|
153
|
-
GIT_UNUSED(file);
|
154
|
-
GIT_UNUSED(line);
|
155
|
-
|
156
|
-
lock = mode & CRYPTO_LOCK;
|
157
|
-
|
158
|
-
if (lock) {
|
159
|
-
(void)git_mutex_lock(&openssl_locks[n]);
|
160
|
-
} else {
|
161
|
-
git_mutex_unlock(&openssl_locks[n]);
|
162
|
-
}
|
163
|
-
}
|
164
|
-
|
165
|
-
static void shutdown_ssl_locking(void)
|
166
|
-
{
|
167
|
-
int num_locks, i;
|
168
|
-
|
169
|
-
num_locks = CRYPTO_num_locks();
|
170
|
-
CRYPTO_set_locking_callback(NULL);
|
171
|
-
|
172
|
-
for (i = 0; i < num_locks; ++i)
|
173
|
-
git_mutex_free(&openssl_locks[i]);
|
174
|
-
git__free(openssl_locks);
|
175
|
-
}
|
176
|
-
# endif /* GIT_THREADS */
|
177
|
-
#endif /* OPENSSL_LEGACY_API */
|
178
43
|
|
179
44
|
static BIO_METHOD *git_stream_bio_method;
|
180
45
|
static int init_bio_method(void);
|
@@ -197,46 +62,47 @@ static void shutdown_ssl(void)
|
|
197
62
|
}
|
198
63
|
|
199
64
|
#ifdef VALGRIND
|
200
|
-
#
|
201
|
-
static void *git_openssl_malloc(size_t bytes)
|
202
|
-
{
|
203
|
-
return git__calloc(1, bytes);
|
204
|
-
}
|
65
|
+
# if !defined(GIT_OPENSSL_LEGACY) && !defined(GIT_OPENSSL_DYNAMIC)
|
205
66
|
|
206
|
-
static void *git_openssl_realloc(void *mem, size_t size)
|
207
|
-
{
|
208
|
-
return git__realloc(mem, size);
|
209
|
-
}
|
210
|
-
|
211
|
-
static void git_openssl_free(void *mem)
|
212
|
-
{
|
213
|
-
return git__free(mem);
|
214
|
-
}
|
215
|
-
#else
|
216
67
|
static void *git_openssl_malloc(size_t bytes, const char *file, int line)
|
217
68
|
{
|
218
69
|
GIT_UNUSED(file);
|
219
70
|
GIT_UNUSED(line);
|
220
71
|
return git__calloc(1, bytes);
|
221
72
|
}
|
222
|
-
|
73
|
+
|
223
74
|
static void *git_openssl_realloc(void *mem, size_t size, const char *file, int line)
|
224
75
|
{
|
225
76
|
GIT_UNUSED(file);
|
226
77
|
GIT_UNUSED(line);
|
227
78
|
return git__realloc(mem, size);
|
228
79
|
}
|
229
|
-
|
80
|
+
|
230
81
|
static void git_openssl_free(void *mem, const char *file, int line)
|
231
82
|
{
|
232
83
|
GIT_UNUSED(file);
|
233
84
|
GIT_UNUSED(line);
|
234
|
-
|
85
|
+
git__free(mem);
|
86
|
+
}
|
87
|
+
# else /* !GIT_OPENSSL_LEGACY && !GIT_OPENSSL_DYNAMIC */
|
88
|
+
static void *git_openssl_malloc(size_t bytes)
|
89
|
+
{
|
90
|
+
return git__calloc(1, bytes);
|
235
91
|
}
|
236
|
-
#endif
|
237
|
-
#endif
|
238
92
|
|
239
|
-
|
93
|
+
static void *git_openssl_realloc(void *mem, size_t size)
|
94
|
+
{
|
95
|
+
return git__realloc(mem, size);
|
96
|
+
}
|
97
|
+
|
98
|
+
static void git_openssl_free(void *mem)
|
99
|
+
{
|
100
|
+
git__free(mem);
|
101
|
+
}
|
102
|
+
# endif /* !GIT_OPENSSL_LEGACY && !GIT_OPENSSL_DYNAMIC */
|
103
|
+
#endif /* VALGRIND */
|
104
|
+
|
105
|
+
static int openssl_init(void)
|
240
106
|
{
|
241
107
|
long ssl_opts = SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
|
242
108
|
const char *ciphers = git_libgit2__ssl_ciphers();
|
@@ -250,13 +116,18 @@ int git_openssl_stream_global_init(void)
|
|
250
116
|
#endif
|
251
117
|
|
252
118
|
#ifdef VALGRIND
|
253
|
-
/*
|
254
|
-
|
119
|
+
/*
|
120
|
+
* Swap in our own allocator functions that initialize
|
121
|
+
* allocated memory to avoid spurious valgrind warnings.
|
122
|
+
* Don't error on failure; many builds of OpenSSL do not
|
123
|
+
* allow you to set these functions.
|
124
|
+
*/
|
125
|
+
if (!allocators_initialized) {
|
255
126
|
CRYPTO_set_mem_functions(git_openssl_malloc,
|
256
127
|
git_openssl_realloc,
|
257
|
-
git_openssl_free)
|
258
|
-
|
259
|
-
|
128
|
+
git_openssl_free);
|
129
|
+
allocators_initialized = true;
|
130
|
+
}
|
260
131
|
#endif
|
261
132
|
|
262
133
|
OPENSSL_init_ssl(0, NULL);
|
@@ -285,9 +156,7 @@ int git_openssl_stream_global_init(void)
|
|
285
156
|
if (init_bio_method() < 0)
|
286
157
|
goto error;
|
287
158
|
|
288
|
-
|
289
|
-
|
290
|
-
return 0;
|
159
|
+
return git_runtime_shutdown_register(shutdown_ssl);
|
291
160
|
|
292
161
|
error:
|
293
162
|
git_error_set(GIT_ERROR_NET, "could not initialize openssl: %s",
|
@@ -297,42 +166,60 @@ error:
|
|
297
166
|
return -1;
|
298
167
|
}
|
299
168
|
|
300
|
-
|
301
|
-
|
169
|
+
/*
|
170
|
+
* When we use dynamic loading, we defer OpenSSL initialization until
|
171
|
+
* it's first used. `openssl_ensure_initialized` will do the work
|
172
|
+
* under a mutex.
|
173
|
+
*/
|
174
|
+
git_mutex openssl_mutex;
|
175
|
+
bool openssl_initialized;
|
176
|
+
|
177
|
+
int git_openssl_stream_global_init(void)
|
302
178
|
{
|
303
|
-
|
304
|
-
|
305
|
-
|
179
|
+
#ifndef GIT_OPENSSL_DYNAMIC
|
180
|
+
return openssl_init();
|
181
|
+
#else
|
182
|
+
if (git_mutex_init(&openssl_mutex) != 0)
|
183
|
+
return -1;
|
184
|
+
|
185
|
+
return 0;
|
306
186
|
#endif
|
187
|
+
}
|
307
188
|
|
308
|
-
int
|
189
|
+
static int openssl_ensure_initialized(void)
|
309
190
|
{
|
310
|
-
#
|
311
|
-
int
|
191
|
+
#ifdef GIT_OPENSSL_DYNAMIC
|
192
|
+
int error = 0;
|
312
193
|
|
313
|
-
|
194
|
+
if (git_mutex_lock(&openssl_mutex) != 0)
|
195
|
+
return -1;
|
314
196
|
|
315
|
-
|
316
|
-
|
317
|
-
|
197
|
+
if (!openssl_initialized) {
|
198
|
+
if ((error = git_openssl_stream_dynamic_init()) == 0)
|
199
|
+
error = openssl_init();
|
318
200
|
|
319
|
-
|
320
|
-
if (git_mutex_init(&openssl_locks[i]) != 0) {
|
321
|
-
git_error_set(GIT_ERROR_SSL, "failed to initialize openssl locks");
|
322
|
-
return -1;
|
323
|
-
}
|
201
|
+
openssl_initialized = true;
|
324
202
|
}
|
325
203
|
|
326
|
-
|
327
|
-
|
204
|
+
error |= git_mutex_unlock(&openssl_mutex);
|
205
|
+
return error;
|
206
|
+
|
207
|
+
#else
|
328
208
|
return 0;
|
329
|
-
#
|
209
|
+
#endif
|
210
|
+
}
|
211
|
+
|
212
|
+
#if !defined(GIT_OPENSSL_LEGACY) && !defined(GIT_OPENSSL_DYNAMIC)
|
213
|
+
int git_openssl_set_locking(void)
|
214
|
+
{
|
215
|
+
# ifdef GIT_THREADS
|
330
216
|
return 0;
|
331
|
-
#else
|
217
|
+
# else
|
332
218
|
git_error_set(GIT_ERROR_THREAD, "libgit2 was not built with threads");
|
333
219
|
return -1;
|
334
|
-
#endif
|
220
|
+
# endif
|
335
221
|
}
|
222
|
+
#endif
|
336
223
|
|
337
224
|
|
338
225
|
static int bio_create(BIO *b)
|
@@ -415,8 +302,8 @@ static int ssl_set_error(SSL *ssl, int error)
|
|
415
302
|
|
416
303
|
err = SSL_get_error(ssl, error);
|
417
304
|
|
418
|
-
|
419
|
-
|
305
|
+
GIT_ASSERT(err != SSL_ERROR_WANT_READ);
|
306
|
+
GIT_ASSERT(err != SSL_ERROR_WANT_WRITE);
|
420
307
|
|
421
308
|
switch (err) {
|
422
309
|
case SSL_ERROR_WANT_CONNECT:
|
@@ -758,7 +645,9 @@ static int openssl_stream_wrap(
|
|
758
645
|
{
|
759
646
|
openssl_stream *st;
|
760
647
|
|
761
|
-
|
648
|
+
GIT_ASSERT_ARG(out);
|
649
|
+
GIT_ASSERT_ARG(in);
|
650
|
+
GIT_ASSERT_ARG(host);
|
762
651
|
|
763
652
|
st = git__calloc(1, sizeof(openssl_stream));
|
764
653
|
GIT_ERROR_CHECK_ALLOC(st);
|
@@ -793,6 +682,9 @@ static int openssl_stream_wrap(
|
|
793
682
|
|
794
683
|
int git_openssl_stream_wrap(git_stream **out, git_stream *in, const char *host)
|
795
684
|
{
|
685
|
+
if (openssl_ensure_initialized() < 0)
|
686
|
+
return -1;
|
687
|
+
|
796
688
|
return openssl_stream_wrap(out, in, host, 0);
|
797
689
|
}
|
798
690
|
|
@@ -801,7 +693,12 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
|
|
801
693
|
git_stream *stream = NULL;
|
802
694
|
int error;
|
803
695
|
|
804
|
-
|
696
|
+
GIT_ASSERT_ARG(out);
|
697
|
+
GIT_ASSERT_ARG(host);
|
698
|
+
GIT_ASSERT_ARG(port);
|
699
|
+
|
700
|
+
if (openssl_ensure_initialized() < 0)
|
701
|
+
return -1;
|
805
702
|
|
806
703
|
if ((error = git_socket_stream_new(&stream, host, port)) < 0)
|
807
704
|
return error;
|
@@ -816,6 +713,9 @@ int git_openssl_stream_new(git_stream **out, const char *host, const char *port)
|
|
816
713
|
|
817
714
|
int git_openssl__set_cert_location(const char *file, const char *path)
|
818
715
|
{
|
716
|
+
if (openssl_ensure_initialized() < 0)
|
717
|
+
return -1;
|
718
|
+
|
819
719
|
if (SSL_CTX_load_verify_locations(git__ssl_ctx, file, path) == 0) {
|
820
720
|
char errmsg[256];
|
821
721
|
|
@@ -8,14 +8,22 @@
|
|
8
8
|
#define INCLUDE_streams_openssl_h__
|
9
9
|
|
10
10
|
#include "common.h"
|
11
|
+
#include "streams/openssl_legacy.h"
|
12
|
+
#include "streams/openssl_dynamic.h"
|
11
13
|
|
12
14
|
#include "git2/sys/stream.h"
|
13
15
|
|
14
16
|
extern int git_openssl_stream_global_init(void);
|
15
17
|
|
18
|
+
#if defined(GIT_OPENSSL) && !defined(GIT_OPENSSL_DYNAMIC)
|
19
|
+
# include <openssl/ssl.h>
|
20
|
+
# include <openssl/err.h>
|
21
|
+
# include <openssl/x509v3.h>
|
22
|
+
# include <openssl/bio.h>
|
23
|
+
# endif
|
24
|
+
|
16
25
|
#ifdef GIT_OPENSSL
|
17
26
|
extern int git_openssl__set_cert_location(const char *file, const char *path);
|
18
|
-
|
19
27
|
extern int git_openssl_stream_new(git_stream **out, const char *host, const char *port);
|
20
28
|
extern int git_openssl_stream_wrap(git_stream **out, git_stream *in, const char *host);
|
21
29
|
#endif
|