rugged 0.27.7 → 0.27.10
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.
- checksums.yaml +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/AUTHORS +1 -0
- data/vendor/libgit2/CMakeLists.txt +99 -51
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/Modules/AddCFlagIfSupported.cmake +15 -1
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +29 -0
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +96 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +9 -8
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindIconv.cmake +11 -6
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +110 -0
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +53 -0
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +124 -0
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +66 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +21 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +33 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1420 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +21 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9800 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +421 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/winhttp/COPYING.GPL +993 -0
- data/vendor/libgit2/deps/winhttp/COPYING.LGPL +502 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +1 -0
- data/vendor/libgit2/deps/zlib/COPYING +27 -0
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/include/git2/annotated_commit.h +9 -0
- data/vendor/libgit2/include/git2/apply.h +149 -0
- data/vendor/libgit2/include/git2/attr.h +20 -13
- data/vendor/libgit2/include/git2/blame.h +4 -4
- data/vendor/libgit2/include/git2/blob.h +44 -12
- data/vendor/libgit2/include/git2/buffer.h +20 -26
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +53 -21
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +5 -5
- data/vendor/libgit2/include/git2/commit.h +25 -3
- data/vendor/libgit2/include/git2/common.h +35 -10
- data/vendor/libgit2/include/git2/config.h +29 -19
- data/vendor/libgit2/include/git2/cred.h +308 -0
- data/vendor/libgit2/include/git2/deprecated.h +493 -0
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +177 -135
- data/vendor/libgit2/include/git2/errors.h +53 -46
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +74 -52
- data/vendor/libgit2/include/git2/indexer.h +76 -6
- data/vendor/libgit2/include/git2/merge.h +25 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/notes.h +1 -1
- data/vendor/libgit2/include/git2/object.h +17 -29
- data/vendor/libgit2/include/git2/odb.h +12 -11
- data/vendor/libgit2/include/git2/odb_backend.h +10 -9
- data/vendor/libgit2/include/git2/oid.h +2 -2
- data/vendor/libgit2/include/git2/pack.h +14 -3
- data/vendor/libgit2/include/git2/proxy.h +5 -3
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +34 -16
- data/vendor/libgit2/include/git2/remote.h +111 -14
- data/vendor/libgit2/include/git2/repository.h +69 -34
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -7
- data/vendor/libgit2/include/git2/signature.h +2 -2
- data/vendor/libgit2/include/git2/stash.h +5 -5
- data/vendor/libgit2/include/git2/status.h +26 -17
- data/vendor/libgit2/include/git2/submodule.h +23 -6
- data/vendor/libgit2/include/git2/sys/alloc.h +18 -18
- data/vendor/libgit2/include/git2/sys/commit.h +1 -1
- data/vendor/libgit2/include/git2/sys/config.h +13 -13
- data/vendor/libgit2/include/git2/sys/cred.h +90 -0
- data/vendor/libgit2/include/git2/sys/filter.h +6 -6
- data/vendor/libgit2/include/git2/sys/merge.h +3 -3
- data/vendor/libgit2/include/git2/sys/odb_backend.h +66 -22
- data/vendor/libgit2/include/git2/sys/path.h +14 -5
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +76 -40
- data/vendor/libgit2/include/git2/sys/repository.h +5 -1
- data/vendor/libgit2/include/git2/sys/stream.h +92 -12
- data/vendor/libgit2/include/git2/sys/transport.h +129 -83
- data/vendor/libgit2/include/git2/tag.h +13 -4
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -311
- data/vendor/libgit2/include/git2/tree.h +4 -4
- data/vendor/libgit2/include/git2/types.h +25 -106
- data/vendor/libgit2/include/git2/version.h +3 -3
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/include/git2.h +4 -0
- data/vendor/libgit2/src/CMakeLists.txt +104 -235
- data/vendor/libgit2/src/alloc.c +14 -18
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +7 -8
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/annotated_commit.c +18 -11
- data/vendor/libgit2/src/apply.c +535 -28
- data/vendor/libgit2/src/apply.h +3 -1
- data/vendor/libgit2/src/array.h +2 -2
- data/vendor/libgit2/src/attr.c +77 -71
- data/vendor/libgit2/src/attr_file.c +203 -117
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +49 -51
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +38 -18
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +29 -15
- data/vendor/libgit2/src/blob.c +123 -37
- data/vendor/libgit2/src/blob.h +19 -2
- data/vendor/libgit2/src/branch.c +47 -23
- data/vendor/libgit2/src/buf_text.c +7 -6
- data/vendor/libgit2/src/buffer.c +60 -53
- data/vendor/libgit2/src/cache.c +38 -45
- data/vendor/libgit2/src/cache.h +3 -3
- data/vendor/libgit2/src/cc-compat.h +20 -3
- data/vendor/libgit2/src/checkout.c +77 -67
- data/vendor/libgit2/src/cherrypick.c +12 -6
- data/vendor/libgit2/src/clone.c +36 -14
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +103 -48
- data/vendor/libgit2/src/commit.h +7 -0
- data/vendor/libgit2/src/commit_list.c +36 -78
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +24 -90
- data/vendor/libgit2/src/config.c +203 -176
- data/vendor/libgit2/src/config.h +8 -20
- data/vendor/libgit2/src/config_backend.h +96 -0
- data/vendor/libgit2/src/config_cache.c +41 -35
- data/vendor/libgit2/src/config_entries.c +229 -0
- data/vendor/libgit2/src/config_entries.h +24 -0
- data/vendor/libgit2/src/config_file.c +422 -680
- data/vendor/libgit2/src/config_mem.c +220 -0
- data/vendor/libgit2/src/config_parse.c +96 -68
- data/vendor/libgit2/src/config_parse.h +15 -14
- data/vendor/libgit2/src/config_snapshot.c +206 -0
- data/vendor/libgit2/src/crlf.c +219 -196
- data/vendor/libgit2/src/delta.c +25 -18
- data/vendor/libgit2/src/describe.c +42 -41
- data/vendor/libgit2/src/diff.c +52 -67
- data/vendor/libgit2/src/diff.h +2 -1
- data/vendor/libgit2/src/diff_driver.c +44 -46
- data/vendor/libgit2/src/diff_file.c +16 -14
- data/vendor/libgit2/src/diff_file.h +1 -1
- data/vendor/libgit2/src/diff_generate.c +158 -103
- data/vendor/libgit2/src/diff_generate.h +3 -3
- data/vendor/libgit2/src/diff_parse.c +4 -4
- data/vendor/libgit2/src/diff_print.c +34 -22
- data/vendor/libgit2/src/diff_stats.c +22 -7
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +3 -3
- data/vendor/libgit2/src/errors.c +51 -39
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -3
- data/vendor/libgit2/src/fetch.c +8 -3
- data/vendor/libgit2/src/fetchhead.c +12 -12
- data/vendor/libgit2/src/filebuf.c +28 -32
- data/vendor/libgit2/src/filebuf.h +2 -2
- data/vendor/libgit2/src/filter.c +47 -33
- data/vendor/libgit2/src/filter.h +0 -10
- data/vendor/libgit2/src/{fileops.c → futils.c} +70 -63
- data/vendor/libgit2/src/{fileops.h → futils.h} +6 -6
- data/vendor/libgit2/src/global.c +35 -55
- data/vendor/libgit2/src/global.h +0 -2
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +48 -0
- data/vendor/libgit2/src/hash/sha1/collisiondetect.h +19 -0
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +17 -17
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -10
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -7
- data/vendor/libgit2/src/hash/sha1/openssl.c +59 -0
- data/vendor/libgit2/src/hash/sha1/openssl.h +19 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +47 -37
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +20 -21
- data/vendor/libgit2/src/hashsig.c +5 -5
- data/vendor/libgit2/src/idxmap.c +107 -61
- data/vendor/libgit2/src/idxmap.h +153 -31
- data/vendor/libgit2/src/ignore.c +38 -42
- data/vendor/libgit2/src/index.c +264 -199
- data/vendor/libgit2/src/index.h +7 -1
- data/vendor/libgit2/src/indexer.c +338 -167
- data/vendor/libgit2/src/integer.h +71 -26
- data/vendor/libgit2/src/iterator.c +134 -62
- data/vendor/libgit2/src/iterator.h +15 -0
- data/vendor/libgit2/src/mailmap.c +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +137 -93
- data/vendor/libgit2/src/merge_driver.c +11 -11
- data/vendor/libgit2/src/merge_file.c +2 -2
- data/vendor/libgit2/src/mwindow.c +24 -29
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +184 -0
- data/vendor/libgit2/src/net.h +36 -0
- data/vendor/libgit2/src/netops.c +55 -156
- data/vendor/libgit2/src/netops.h +3 -23
- data/vendor/libgit2/src/notes.c +14 -9
- data/vendor/libgit2/src/object.c +120 -69
- data/vendor/libgit2/src/object.h +22 -9
- data/vendor/libgit2/src/object_api.c +8 -8
- data/vendor/libgit2/src/odb.c +111 -88
- data/vendor/libgit2/src/odb.h +8 -7
- data/vendor/libgit2/src/odb_loose.c +58 -47
- data/vendor/libgit2/src/odb_mempack.c +21 -34
- data/vendor/libgit2/src/odb_pack.c +17 -13
- data/vendor/libgit2/src/offmap.c +53 -35
- data/vendor/libgit2/src/offmap.h +108 -21
- data/vendor/libgit2/src/oid.c +12 -7
- data/vendor/libgit2/src/oidmap.c +49 -47
- data/vendor/libgit2/src/oidmap.h +101 -24
- data/vendor/libgit2/src/pack-objects.c +87 -86
- data/vendor/libgit2/src/pack-objects.h +2 -8
- data/vendor/libgit2/src/pack.c +94 -96
- data/vendor/libgit2/src/pack.h +16 -18
- data/vendor/libgit2/src/parse.c +17 -4
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +3 -3
- data/vendor/libgit2/src/patch_generate.c +18 -18
- data/vendor/libgit2/src/patch_parse.c +147 -79
- data/vendor/libgit2/src/path.c +207 -62
- data/vendor/libgit2/src/path.h +14 -0
- data/vendor/libgit2/src/pathspec.c +18 -18
- data/vendor/libgit2/src/pool.c +26 -22
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +10 -10
- data/vendor/libgit2/src/posix.h +12 -1
- data/vendor/libgit2/src/proxy.c +8 -3
- data/vendor/libgit2/src/push.c +35 -29
- data/vendor/libgit2/src/push.h +2 -1
- data/vendor/libgit2/src/reader.c +265 -0
- data/vendor/libgit2/src/reader.h +107 -0
- data/vendor/libgit2/src/rebase.c +97 -38
- data/vendor/libgit2/src/refdb.c +15 -3
- data/vendor/libgit2/src/refdb_fs.c +318 -222
- data/vendor/libgit2/src/reflog.c +13 -15
- data/vendor/libgit2/src/refs.c +122 -89
- data/vendor/libgit2/src/refs.h +5 -3
- data/vendor/libgit2/src/refspec.c +27 -33
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +229 -178
- data/vendor/libgit2/src/remote.h +11 -2
- data/vendor/libgit2/src/repository.c +227 -172
- data/vendor/libgit2/src/repository.h +52 -40
- data/vendor/libgit2/src/reset.c +7 -7
- data/vendor/libgit2/src/revert.c +11 -6
- data/vendor/libgit2/src/revparse.c +46 -46
- data/vendor/libgit2/src/revwalk.c +89 -54
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +22 -9
- data/vendor/libgit2/src/signature.c +15 -13
- data/vendor/libgit2/src/sortedcache.c +22 -36
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +56 -76
- data/vendor/libgit2/src/status.c +27 -21
- data/vendor/libgit2/src/stream.h +17 -2
- data/vendor/libgit2/src/streams/mbedtls.c +100 -80
- data/vendor/libgit2/src/streams/mbedtls.h +5 -2
- data/vendor/libgit2/src/streams/openssl.c +93 -81
- data/vendor/libgit2/src/streams/openssl.h +5 -2
- data/vendor/libgit2/src/streams/registry.c +118 -0
- data/vendor/libgit2/src/streams/registry.h +19 -0
- data/vendor/libgit2/src/streams/socket.c +55 -30
- data/vendor/libgit2/src/streams/stransport.c +57 -32
- data/vendor/libgit2/src/streams/stransport.h +5 -0
- data/vendor/libgit2/src/streams/tls.c +48 -20
- data/vendor/libgit2/src/streams/tls.h +12 -4
- data/vendor/libgit2/src/strmap.c +47 -74
- data/vendor/libgit2/src/strmap.h +108 -33
- data/vendor/libgit2/src/submodule.c +190 -169
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +25 -15
- data/vendor/libgit2/src/tag.c +39 -26
- data/vendor/libgit2/src/tag.h +2 -1
- data/vendor/libgit2/src/trace.c +2 -2
- data/vendor/libgit2/src/trace.h +2 -2
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +30 -29
- data/vendor/libgit2/src/transport.c +3 -3
- data/vendor/libgit2/src/transports/auth.c +14 -10
- data/vendor/libgit2/src/transports/auth.h +10 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +31 -16
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +35 -0
- data/vendor/libgit2/src/transports/cred.c +24 -24
- data/vendor/libgit2/src/transports/git.c +25 -30
- data/vendor/libgit2/src/transports/http.c +871 -335
- data/vendor/libgit2/src/transports/http.h +2 -0
- data/vendor/libgit2/src/transports/local.c +28 -28
- data/vendor/libgit2/src/transports/smart.c +64 -46
- data/vendor/libgit2/src/transports/smart.h +5 -6
- data/vendor/libgit2/src/transports/smart_pkt.c +162 -151
- data/vendor/libgit2/src/transports/smart_protocol.c +64 -94
- data/vendor/libgit2/src/transports/ssh.c +76 -65
- data/vendor/libgit2/src/transports/winhttp.c +328 -319
- data/vendor/libgit2/src/tree-cache.c +21 -14
- data/vendor/libgit2/src/tree.c +119 -112
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +154 -93
- data/vendor/libgit2/src/util.h +19 -23
- data/vendor/libgit2/src/vector.c +15 -10
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/dir.c +3 -3
- data/vendor/libgit2/src/win32/findfile.c +1 -1
- data/vendor/libgit2/src/win32/map.c +9 -11
- data/vendor/libgit2/src/win32/msvc-compat.h +6 -0
- data/vendor/libgit2/src/win32/path_w32.c +113 -9
- data/vendor/libgit2/src/win32/path_w32.h +18 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +69 -44
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -10
- data/vendor/libgit2/src/win32/w32_buffer.c +9 -5
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +2 -95
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +6 -11
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +27 -64
- data/vendor/libgit2/src/win32/w32_util.h +5 -49
- data/vendor/libgit2/src/worktree.c +44 -30
- data/vendor/libgit2/src/xdiff/xdiffi.c +5 -5
- data/vendor/libgit2/src/xdiff/xhistogram.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +27 -15
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +4 -4
- metadata +115 -38
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/config_file.h +0 -73
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/hash/hash_collisiondetect.h +0 -47
- data/vendor/libgit2/src/hash/hash_openssl.h +0 -59
- data/vendor/libgit2/src/streams/curl.c +0 -385
- data/vendor/libgit2/src/streams/curl.h +0 -17
- /data/vendor/libgit2/deps/http-parser/{LICENSE-MIT → COPYING} +0 -0
- /data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- /data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- /data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
|
@@ -0,0 +1,445 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Edward Thomson. All rights reserved.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of ntlmclient, distributed under the MIT license.
|
|
5
|
+
* For full terms and copyright information, and for third-party
|
|
6
|
+
* copyright information, see the included LICENSE.txt file.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
#include <stdlib.h>
|
|
10
|
+
#include <stdint.h>
|
|
11
|
+
|
|
12
|
+
#include "ntlm.h"
|
|
13
|
+
#include "unicode.h"
|
|
14
|
+
#include "compat.h"
|
|
15
|
+
|
|
16
|
+
struct ntlm_unicode_ctx {
|
|
17
|
+
ntlm_client *ntlm;
|
|
18
|
+
};
|
|
19
|
+
|
|
20
|
+
typedef unsigned int UTF32; /* at least 32 bits */
|
|
21
|
+
typedef unsigned short UTF16; /* at least 16 bits */
|
|
22
|
+
typedef unsigned char UTF8; /* typically 8 bits */
|
|
23
|
+
|
|
24
|
+
/* Some fundamental constants */
|
|
25
|
+
#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
|
|
26
|
+
#define UNI_MAX_BMP (UTF32)0x0000FFFF
|
|
27
|
+
#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
|
|
28
|
+
#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
|
|
29
|
+
#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
|
|
30
|
+
|
|
31
|
+
#define UNI_MAX_UTF8_BYTES_PER_CODE_POINT 4
|
|
32
|
+
|
|
33
|
+
typedef enum {
|
|
34
|
+
conversionOK, /* conversion successful */
|
|
35
|
+
sourceExhausted, /* partial character in source, but hit end */
|
|
36
|
+
targetExhausted, /* insuff. room in target for conversion */
|
|
37
|
+
sourceIllegal /* source sequence is illegal/malformed */
|
|
38
|
+
} ConversionResult;
|
|
39
|
+
|
|
40
|
+
typedef enum {
|
|
41
|
+
strictConversion = 0,
|
|
42
|
+
lenientConversion
|
|
43
|
+
} ConversionFlags;
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
static const int halfShift = 10; /* used for shifting by 10 bits */
|
|
47
|
+
|
|
48
|
+
static const UTF32 halfBase = 0x0010000UL;
|
|
49
|
+
static const UTF32 halfMask = 0x3FFUL;
|
|
50
|
+
|
|
51
|
+
#define UNI_SUR_HIGH_START (UTF32)0xD800
|
|
52
|
+
#define UNI_SUR_HIGH_END (UTF32)0xDBFF
|
|
53
|
+
#define UNI_SUR_LOW_START (UTF32)0xDC00
|
|
54
|
+
#define UNI_SUR_LOW_END (UTF32)0xDFFF
|
|
55
|
+
#define false 0
|
|
56
|
+
#define true 1
|
|
57
|
+
|
|
58
|
+
/* --------------------------------------------------------------------- */
|
|
59
|
+
|
|
60
|
+
/*
|
|
61
|
+
* Index into the table below with the first byte of a UTF-8 sequence to
|
|
62
|
+
* get the number of trailing bytes that are supposed to follow it.
|
|
63
|
+
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
|
|
64
|
+
* left as-is for anyone who may want to do such conversion, which was
|
|
65
|
+
* allowed in earlier algorithms.
|
|
66
|
+
*/
|
|
67
|
+
static const char trailingBytesForUTF8[256] = {
|
|
68
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
69
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
70
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
71
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
72
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
73
|
+
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
74
|
+
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
|
75
|
+
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
/*
|
|
79
|
+
* Magic values subtracted from a buffer value during UTF8 conversion.
|
|
80
|
+
* This table contains as many values as there might be trailing bytes
|
|
81
|
+
* in a UTF-8 sequence.
|
|
82
|
+
*/
|
|
83
|
+
static const UTF32 offsetsFromUTF8[6] = {
|
|
84
|
+
0x00000000UL, 0x00003080UL, 0x000E2080UL,
|
|
85
|
+
0x03C82080UL, 0xFA082080UL, 0x82082080UL };
|
|
86
|
+
|
|
87
|
+
/*
|
|
88
|
+
* Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
|
|
89
|
+
* into the first byte, depending on how many bytes follow. There are
|
|
90
|
+
* as many entries in this table as there are UTF-8 sequence types.
|
|
91
|
+
* (I.e., one byte sequence, two byte... etc.). Remember that sequencs
|
|
92
|
+
* for *legal* UTF-8 will be 4 or fewer bytes total.
|
|
93
|
+
*/
|
|
94
|
+
static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
|
|
95
|
+
|
|
96
|
+
/* --------------------------------------------------------------------- */
|
|
97
|
+
|
|
98
|
+
/* The interface converts a whole buffer to avoid function-call overhead.
|
|
99
|
+
* Constants have been gathered. Loops & conditionals have been removed as
|
|
100
|
+
* much as possible for efficiency, in favor of drop-through switches.
|
|
101
|
+
* (See "Note A" at the bottom of the file for equivalent code.)
|
|
102
|
+
* If your compiler supports it, the "isLegalUTF8" call can be turned
|
|
103
|
+
* into an inline function.
|
|
104
|
+
*/
|
|
105
|
+
|
|
106
|
+
static ConversionResult ConvertUTF16toUTF8 (
|
|
107
|
+
const UTF16** sourceStart, const UTF16* sourceEnd,
|
|
108
|
+
UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
|
|
109
|
+
ConversionResult result = conversionOK;
|
|
110
|
+
const UTF16* source = *sourceStart;
|
|
111
|
+
UTF8* target = *targetStart;
|
|
112
|
+
while (source < sourceEnd) {
|
|
113
|
+
UTF32 ch;
|
|
114
|
+
unsigned short bytesToWrite = 0;
|
|
115
|
+
const UTF32 byteMask = 0xBF;
|
|
116
|
+
const UTF32 byteMark = 0x80;
|
|
117
|
+
const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
|
|
118
|
+
ch = *source++;
|
|
119
|
+
/* If we have a surrogate pair, convert to UTF32 first. */
|
|
120
|
+
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
|
|
121
|
+
/* If the 16 bits following the high surrogate are in the source buffer... */
|
|
122
|
+
if (source < sourceEnd) {
|
|
123
|
+
UTF32 ch2 = *source;
|
|
124
|
+
/* If it's a low surrogate, convert to UTF32. */
|
|
125
|
+
if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
|
|
126
|
+
ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
|
|
127
|
+
+ (ch2 - UNI_SUR_LOW_START) + halfBase;
|
|
128
|
+
++source;
|
|
129
|
+
} else if (flags == strictConversion) { /* it's an unpaired high surrogate */
|
|
130
|
+
--source; /* return to the illegal value itself */
|
|
131
|
+
result = sourceIllegal;
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
} else { /* We don't have the 16 bits following the high surrogate. */
|
|
135
|
+
--source; /* return to the high surrogate */
|
|
136
|
+
result = sourceExhausted;
|
|
137
|
+
break;
|
|
138
|
+
}
|
|
139
|
+
} else if (flags == strictConversion) {
|
|
140
|
+
/* UTF-16 surrogate values are illegal in UTF-32 */
|
|
141
|
+
if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
|
|
142
|
+
--source; /* return to the illegal value itself */
|
|
143
|
+
result = sourceIllegal;
|
|
144
|
+
break;
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
/* Figure out how many bytes the result will require */
|
|
148
|
+
if (ch < (UTF32)0x80) { bytesToWrite = 1;
|
|
149
|
+
} else if (ch < (UTF32)0x800) { bytesToWrite = 2;
|
|
150
|
+
} else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
|
|
151
|
+
} else if (ch < (UTF32)0x110000) { bytesToWrite = 4;
|
|
152
|
+
} else { bytesToWrite = 3;
|
|
153
|
+
ch = UNI_REPLACEMENT_CHAR;
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
target += bytesToWrite;
|
|
157
|
+
if (target > targetEnd) {
|
|
158
|
+
source = oldSource; /* Back up source pointer! */
|
|
159
|
+
target -= bytesToWrite; result = targetExhausted; break;
|
|
160
|
+
}
|
|
161
|
+
switch (bytesToWrite) { /* note: everything falls through. */
|
|
162
|
+
case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
|
163
|
+
case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
|
164
|
+
case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
|
|
165
|
+
case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
|
|
166
|
+
}
|
|
167
|
+
target += bytesToWrite;
|
|
168
|
+
}
|
|
169
|
+
*sourceStart = source;
|
|
170
|
+
*targetStart = target;
|
|
171
|
+
return result;
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
/* --------------------------------------------------------------------- */
|
|
175
|
+
|
|
176
|
+
/*
|
|
177
|
+
* Utility routine to tell whether a sequence of bytes is legal UTF-8.
|
|
178
|
+
* This must be called with the length pre-determined by the first byte.
|
|
179
|
+
* If not calling this from ConvertUTF8to*, then the length can be set by:
|
|
180
|
+
* length = trailingBytesForUTF8[*source]+1;
|
|
181
|
+
* and the sequence is illegal right away if there aren't that many bytes
|
|
182
|
+
* available.
|
|
183
|
+
* If presented with a length > 4, this returns false. The Unicode
|
|
184
|
+
* definition of UTF-8 goes up to 4-byte sequences.
|
|
185
|
+
*/
|
|
186
|
+
|
|
187
|
+
static inline bool isLegalUTF8(const UTF8 *source, int length) {
|
|
188
|
+
UTF8 a;
|
|
189
|
+
const UTF8 *srcptr = source+length;
|
|
190
|
+
switch (length) {
|
|
191
|
+
default: return false;
|
|
192
|
+
/* Everything else falls through when "true"... */
|
|
193
|
+
case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
|
|
194
|
+
case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
|
|
195
|
+
case 2: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
|
|
196
|
+
|
|
197
|
+
switch (*source) {
|
|
198
|
+
/* no fall-through in this inner switch */
|
|
199
|
+
case 0xE0: if (a < 0xA0) return false; break;
|
|
200
|
+
case 0xED: if (a > 0x9F) return false; break;
|
|
201
|
+
case 0xF0: if (a < 0x90) return false; break;
|
|
202
|
+
case 0xF4: if (a > 0x8F) return false; break;
|
|
203
|
+
default: if (a < 0x80) return false;
|
|
204
|
+
}
|
|
205
|
+
|
|
206
|
+
case 1: if (*source >= 0x80 && *source < 0xC2) return false;
|
|
207
|
+
}
|
|
208
|
+
if (*source > 0xF4) return false;
|
|
209
|
+
return true;
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
static ConversionResult ConvertUTF8toUTF16 (
|
|
213
|
+
const UTF8** sourceStart, const UTF8* sourceEnd,
|
|
214
|
+
UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
|
|
215
|
+
ConversionResult result = conversionOK;
|
|
216
|
+
const UTF8* source = *sourceStart;
|
|
217
|
+
UTF16* target = *targetStart;
|
|
218
|
+
while (source < sourceEnd) {
|
|
219
|
+
UTF32 ch = 0;
|
|
220
|
+
unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
|
|
221
|
+
if (extraBytesToRead >= sourceEnd - source) {
|
|
222
|
+
result = sourceExhausted; break;
|
|
223
|
+
}
|
|
224
|
+
/* Do this check whether lenient or strict */
|
|
225
|
+
if (!isLegalUTF8(source, extraBytesToRead+1)) {
|
|
226
|
+
result = sourceIllegal;
|
|
227
|
+
break;
|
|
228
|
+
}
|
|
229
|
+
/*
|
|
230
|
+
* The cases all fall through. See "Note A" below.
|
|
231
|
+
*/
|
|
232
|
+
switch (extraBytesToRead) {
|
|
233
|
+
case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
|
|
234
|
+
case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
|
|
235
|
+
case 3: ch += *source++; ch <<= 6;
|
|
236
|
+
case 2: ch += *source++; ch <<= 6;
|
|
237
|
+
case 1: ch += *source++; ch <<= 6;
|
|
238
|
+
case 0: ch += *source++;
|
|
239
|
+
}
|
|
240
|
+
ch -= offsetsFromUTF8[extraBytesToRead];
|
|
241
|
+
|
|
242
|
+
if (target >= targetEnd) {
|
|
243
|
+
source -= (extraBytesToRead+1); /* Back up source pointer! */
|
|
244
|
+
result = targetExhausted; break;
|
|
245
|
+
}
|
|
246
|
+
if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
|
|
247
|
+
/* UTF-16 surrogate values are illegal in UTF-32 */
|
|
248
|
+
if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
|
|
249
|
+
if (flags == strictConversion) {
|
|
250
|
+
source -= (extraBytesToRead+1); /* return to the illegal value itself */
|
|
251
|
+
result = sourceIllegal;
|
|
252
|
+
break;
|
|
253
|
+
} else {
|
|
254
|
+
*target++ = UNI_REPLACEMENT_CHAR;
|
|
255
|
+
}
|
|
256
|
+
} else {
|
|
257
|
+
*target++ = (UTF16)ch; /* normal case */
|
|
258
|
+
}
|
|
259
|
+
} else if (ch > UNI_MAX_UTF16) {
|
|
260
|
+
if (flags == strictConversion) {
|
|
261
|
+
result = sourceIllegal;
|
|
262
|
+
source -= (extraBytesToRead+1); /* return to the start */
|
|
263
|
+
break; /* Bail out; shouldn't continue */
|
|
264
|
+
} else {
|
|
265
|
+
*target++ = UNI_REPLACEMENT_CHAR;
|
|
266
|
+
}
|
|
267
|
+
} else {
|
|
268
|
+
/* target is a character in range 0xFFFF - 0x10FFFF. */
|
|
269
|
+
if (target + 1 >= targetEnd) {
|
|
270
|
+
source -= (extraBytesToRead+1); /* Back up source pointer! */
|
|
271
|
+
result = targetExhausted; break;
|
|
272
|
+
}
|
|
273
|
+
ch -= halfBase;
|
|
274
|
+
*target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
|
|
275
|
+
*target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
|
|
276
|
+
}
|
|
277
|
+
}
|
|
278
|
+
*sourceStart = source;
|
|
279
|
+
*targetStart = target;
|
|
280
|
+
return result;
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
|
|
284
|
+
ntlm_unicode_ctx *ntlm_unicode_ctx_init(ntlm_client *ntlm)
|
|
285
|
+
{
|
|
286
|
+
ntlm_unicode_ctx *ctx;
|
|
287
|
+
|
|
288
|
+
if ((ctx = malloc(sizeof(ntlm_unicode_ctx))) == NULL)
|
|
289
|
+
return NULL;
|
|
290
|
+
|
|
291
|
+
ctx->ntlm = ntlm;
|
|
292
|
+
return ctx;
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
typedef enum {
|
|
296
|
+
unicode_builtin_utf8_to_16,
|
|
297
|
+
unicode_builtin_utf16_to_8
|
|
298
|
+
} unicode_builtin_encoding_direction;
|
|
299
|
+
|
|
300
|
+
static inline bool unicode_builtin_encoding_convert(
|
|
301
|
+
char **converted,
|
|
302
|
+
size_t *converted_len,
|
|
303
|
+
ntlm_unicode_ctx *ctx,
|
|
304
|
+
const char *string,
|
|
305
|
+
size_t string_len,
|
|
306
|
+
unicode_builtin_encoding_direction direction)
|
|
307
|
+
{
|
|
308
|
+
const char *in_start, *in_end;
|
|
309
|
+
char *out, *out_start, *out_end, *new_out;
|
|
310
|
+
size_t out_size, out_len;
|
|
311
|
+
bool success = false;
|
|
312
|
+
ConversionResult result;
|
|
313
|
+
|
|
314
|
+
*converted = NULL;
|
|
315
|
+
*converted_len = 0;
|
|
316
|
+
|
|
317
|
+
in_start = string;
|
|
318
|
+
in_end = in_start + string_len;
|
|
319
|
+
|
|
320
|
+
/*
|
|
321
|
+
* When translating UTF8 to UTF16, these strings are only used
|
|
322
|
+
* internally, and we obey the given length, so we can simply
|
|
323
|
+
* use a buffer that is 2x the size. Add an extra byte to NUL
|
|
324
|
+
* terminate the results (two bytes for UTF16).
|
|
325
|
+
*/
|
|
326
|
+
if (direction == unicode_builtin_utf8_to_16)
|
|
327
|
+
out_size = (string_len * 2 + 2);
|
|
328
|
+
else
|
|
329
|
+
out_size = (string_len / 2 + 1);
|
|
330
|
+
|
|
331
|
+
/* Round to the nearest multiple of 8 */
|
|
332
|
+
out_size = (out_size + 7) & ~7;
|
|
333
|
+
|
|
334
|
+
if ((out = malloc(out_size)) == NULL) {
|
|
335
|
+
ntlm_client_set_errmsg(ctx->ntlm, "out of memory");
|
|
336
|
+
return false;
|
|
337
|
+
}
|
|
338
|
+
|
|
339
|
+
out_start = out;
|
|
340
|
+
out_end = out_start + out_size;
|
|
341
|
+
|
|
342
|
+
/* Make room for NUL termination */
|
|
343
|
+
if (direction == unicode_builtin_utf16_to_8)
|
|
344
|
+
out_end--;
|
|
345
|
+
|
|
346
|
+
while (true) {
|
|
347
|
+
if (direction == unicode_builtin_utf8_to_16)
|
|
348
|
+
result = ConvertUTF8toUTF16(
|
|
349
|
+
(const UTF8 **)&in_start, (UTF8 *)in_end,
|
|
350
|
+
(UTF16 **)&out_start, (UTF16 *)out_end, strictConversion);
|
|
351
|
+
else
|
|
352
|
+
result = ConvertUTF16toUTF8(
|
|
353
|
+
(const UTF16 **)&in_start, (UTF16 *)in_end,
|
|
354
|
+
(UTF8 **)&out_start, (UTF8 *)out_end, lenientConversion);
|
|
355
|
+
|
|
356
|
+
switch (result) {
|
|
357
|
+
case conversionOK:
|
|
358
|
+
success = true;
|
|
359
|
+
goto done;
|
|
360
|
+
case sourceExhausted:
|
|
361
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
362
|
+
"invalid unicode string; trailing data remains");
|
|
363
|
+
goto done;
|
|
364
|
+
case targetExhausted:
|
|
365
|
+
break;
|
|
366
|
+
case sourceIllegal:
|
|
367
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
368
|
+
"invalid unicode string; trailing data remains");
|
|
369
|
+
goto done;
|
|
370
|
+
default:
|
|
371
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
372
|
+
"unknown unicode conversion failure");
|
|
373
|
+
goto done;
|
|
374
|
+
}
|
|
375
|
+
|
|
376
|
+
/* Grow buffer size by 1.5 (rounded up to a multiple of 8) */
|
|
377
|
+
out_size = ((((out_size << 1) - (out_size >> 1)) + 7) & ~7);
|
|
378
|
+
|
|
379
|
+
if (out_size > NTLM_UNICODE_MAX_LEN) {
|
|
380
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
381
|
+
"unicode conversion too large");
|
|
382
|
+
goto done;
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
if ((new_out = realloc(out, out_size)) == NULL) {
|
|
386
|
+
ntlm_client_set_errmsg(ctx->ntlm, "out of memory");
|
|
387
|
+
goto done;
|
|
388
|
+
}
|
|
389
|
+
|
|
390
|
+
out_len = out_start - out;
|
|
391
|
+
|
|
392
|
+
out = new_out;
|
|
393
|
+
out_start = new_out + out_len;
|
|
394
|
+
out_end = out + out_size;
|
|
395
|
+
|
|
396
|
+
/* Make room for NUL termination */
|
|
397
|
+
out_end -= (direction == unicode_builtin_utf8_to_16) ? 2 : 1;
|
|
398
|
+
}
|
|
399
|
+
|
|
400
|
+
done:
|
|
401
|
+
if (!success) {
|
|
402
|
+
free(out);
|
|
403
|
+
return false;
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
out_len = (out_start - out);
|
|
407
|
+
|
|
408
|
+
/* NUL terminate */
|
|
409
|
+
out[out_len] = '\0';
|
|
410
|
+
|
|
411
|
+
if (direction == unicode_builtin_utf8_to_16)
|
|
412
|
+
out[out_len+1] = '\0';
|
|
413
|
+
|
|
414
|
+
*converted = out;
|
|
415
|
+
*converted_len = out_len;
|
|
416
|
+
return true;
|
|
417
|
+
}
|
|
418
|
+
|
|
419
|
+
bool ntlm_unicode_utf8_to_16(
|
|
420
|
+
char **converted,
|
|
421
|
+
size_t *converted_len,
|
|
422
|
+
ntlm_unicode_ctx *ctx,
|
|
423
|
+
const char *string,
|
|
424
|
+
size_t string_len)
|
|
425
|
+
{
|
|
426
|
+
return unicode_builtin_encoding_convert(converted, converted_len,
|
|
427
|
+
ctx, string, string_len, unicode_builtin_utf8_to_16);
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
bool ntlm_unicode_utf16_to_8(
|
|
431
|
+
char **converted,
|
|
432
|
+
size_t *converted_len,
|
|
433
|
+
ntlm_unicode_ctx *ctx,
|
|
434
|
+
const char *string,
|
|
435
|
+
size_t string_len)
|
|
436
|
+
{
|
|
437
|
+
return unicode_builtin_encoding_convert(converted, converted_len,
|
|
438
|
+
ctx, string, string_len, unicode_builtin_utf16_to_8);
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
void ntlm_unicode_ctx_free(ntlm_unicode_ctx *ctx)
|
|
442
|
+
{
|
|
443
|
+
if (ctx)
|
|
444
|
+
free(ctx);
|
|
445
|
+
}
|
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Copyright (c) Edward Thomson. All rights reserved.
|
|
3
|
+
*
|
|
4
|
+
* This file is part of ntlmclient, distributed under the MIT license.
|
|
5
|
+
* For full terms and copyright information, and for third-party
|
|
6
|
+
* copyright information, see the included LICENSE.txt file.
|
|
7
|
+
*/
|
|
8
|
+
|
|
9
|
+
#include <locale.h>
|
|
10
|
+
#include <iconv.h>
|
|
11
|
+
#include <string.h>
|
|
12
|
+
#include <errno.h>
|
|
13
|
+
|
|
14
|
+
#include "ntlmclient.h"
|
|
15
|
+
#include "unicode.h"
|
|
16
|
+
#include "ntlm.h"
|
|
17
|
+
#include "compat.h"
|
|
18
|
+
|
|
19
|
+
struct ntlm_unicode_ctx {
|
|
20
|
+
ntlm_client *ntlm;
|
|
21
|
+
iconv_t utf8_to_16;
|
|
22
|
+
iconv_t utf16_to_8;
|
|
23
|
+
};
|
|
24
|
+
|
|
25
|
+
ntlm_unicode_ctx *ntlm_unicode_ctx_init(ntlm_client *ntlm)
|
|
26
|
+
{
|
|
27
|
+
ntlm_unicode_ctx *ctx;
|
|
28
|
+
|
|
29
|
+
if ((ctx = calloc(1, sizeof(ntlm_unicode_ctx))) == NULL)
|
|
30
|
+
return NULL;
|
|
31
|
+
|
|
32
|
+
ctx->ntlm = ntlm;
|
|
33
|
+
ctx->utf8_to_16 = (iconv_t)-1;
|
|
34
|
+
ctx->utf16_to_8 = (iconv_t)-1;
|
|
35
|
+
|
|
36
|
+
return ctx;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
typedef enum {
|
|
40
|
+
unicode_iconv_utf8_to_16,
|
|
41
|
+
unicode_iconv_utf16_to_8
|
|
42
|
+
} unicode_iconv_encoding_direction;
|
|
43
|
+
|
|
44
|
+
static inline bool unicode_iconv_init(ntlm_unicode_ctx *ctx)
|
|
45
|
+
{
|
|
46
|
+
if (ctx->utf8_to_16 != (iconv_t)-1 || ctx->utf16_to_8 != (iconv_t)-1)
|
|
47
|
+
return true;
|
|
48
|
+
|
|
49
|
+
if ((ctx->utf8_to_16 = iconv_open("UTF-16LE", "UTF-8")) == (iconv_t)-1 ||
|
|
50
|
+
(ctx->utf16_to_8 = iconv_open("UTF-8", "UTF-16LE")) == (iconv_t)-1) {
|
|
51
|
+
if (errno == EINVAL)
|
|
52
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
53
|
+
"iconv does not support UTF8 <-> UTF16 conversion");
|
|
54
|
+
else
|
|
55
|
+
ntlm_client_set_errmsg(ctx->ntlm, strerror(errno));
|
|
56
|
+
|
|
57
|
+
return false;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
static inline bool unicode_iconv_encoding_convert(
|
|
64
|
+
char **converted,
|
|
65
|
+
size_t *converted_len,
|
|
66
|
+
ntlm_unicode_ctx *ctx,
|
|
67
|
+
const char *string,
|
|
68
|
+
size_t string_len,
|
|
69
|
+
unicode_iconv_encoding_direction direction)
|
|
70
|
+
{
|
|
71
|
+
char *in_start, *out_start, *out, *new_out;
|
|
72
|
+
size_t in_start_len, out_start_len, out_size, nul_size, ret, written = 0;
|
|
73
|
+
iconv_t converter;
|
|
74
|
+
|
|
75
|
+
*converted = NULL;
|
|
76
|
+
*converted_len = 0;
|
|
77
|
+
|
|
78
|
+
if (!unicode_iconv_init(ctx))
|
|
79
|
+
return false;
|
|
80
|
+
|
|
81
|
+
/*
|
|
82
|
+
* When translating UTF8 to UTF16, these strings are only used
|
|
83
|
+
* internally, and we obey the given length, so we can simply
|
|
84
|
+
* use a buffer that is 2x the size. When translating from UTF16
|
|
85
|
+
* to UTF8, we may need to return to callers, so we need to NUL
|
|
86
|
+
* terminate and expect an extra byte for UTF8, two for UTF16.
|
|
87
|
+
*/
|
|
88
|
+
if (direction == unicode_iconv_utf8_to_16) {
|
|
89
|
+
converter = ctx->utf8_to_16;
|
|
90
|
+
out_size = (string_len * 2) + 2;
|
|
91
|
+
nul_size = 2;
|
|
92
|
+
} else {
|
|
93
|
+
converter = ctx->utf16_to_8;
|
|
94
|
+
out_size = (string_len / 2) + 1;
|
|
95
|
+
nul_size = 1;
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/* Round to the nearest multiple of 8 */
|
|
99
|
+
out_size = (out_size + 7) & ~7;
|
|
100
|
+
|
|
101
|
+
if ((out = malloc(out_size)) == NULL) {
|
|
102
|
+
ntlm_client_set_errmsg(ctx->ntlm, "out of memory");
|
|
103
|
+
return false;
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
in_start = (char *)string;
|
|
107
|
+
in_start_len = string_len;
|
|
108
|
+
|
|
109
|
+
while (true) {
|
|
110
|
+
out_start = out + written;
|
|
111
|
+
out_start_len = (out_size - nul_size) - written;
|
|
112
|
+
|
|
113
|
+
ret = iconv(converter, &in_start, &in_start_len, &out_start, &out_start_len);
|
|
114
|
+
written = (out_size - nul_size) - out_start_len;
|
|
115
|
+
|
|
116
|
+
if (ret == 0)
|
|
117
|
+
break;
|
|
118
|
+
|
|
119
|
+
if (ret == (size_t)-1 && errno != E2BIG) {
|
|
120
|
+
ntlm_client_set_errmsg(ctx->ntlm, strerror(errno));
|
|
121
|
+
goto on_error;
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
/* Grow buffer size by 1.5 (rounded up to a multiple of 8) */
|
|
125
|
+
out_size = ((((out_size << 1) - (out_size >> 1)) + 7) & ~7);
|
|
126
|
+
|
|
127
|
+
if (out_size > NTLM_UNICODE_MAX_LEN) {
|
|
128
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
129
|
+
"unicode conversion too large");
|
|
130
|
+
goto on_error;
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
if ((new_out = realloc(out, out_size)) == NULL) {
|
|
134
|
+
ntlm_client_set_errmsg(ctx->ntlm, "out of memory");
|
|
135
|
+
goto on_error;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
out = new_out;
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
if (in_start_len != 0) {
|
|
142
|
+
ntlm_client_set_errmsg(ctx->ntlm,
|
|
143
|
+
"invalid unicode string; trailing data remains");
|
|
144
|
+
goto on_error;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/* NUL terminate */
|
|
148
|
+
out[written] = '\0';
|
|
149
|
+
|
|
150
|
+
if (direction == unicode_iconv_utf8_to_16)
|
|
151
|
+
out[written + 1] = '\0';
|
|
152
|
+
|
|
153
|
+
*converted = out;
|
|
154
|
+
|
|
155
|
+
if (converted_len)
|
|
156
|
+
*converted_len = written;
|
|
157
|
+
|
|
158
|
+
return true;
|
|
159
|
+
|
|
160
|
+
on_error:
|
|
161
|
+
free(out);
|
|
162
|
+
return false;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
bool ntlm_unicode_utf8_to_16(
|
|
166
|
+
char **converted,
|
|
167
|
+
size_t *converted_len,
|
|
168
|
+
ntlm_unicode_ctx *ctx,
|
|
169
|
+
const char *string,
|
|
170
|
+
size_t string_len)
|
|
171
|
+
{
|
|
172
|
+
return unicode_iconv_encoding_convert(
|
|
173
|
+
converted, converted_len, ctx, string, string_len,
|
|
174
|
+
unicode_iconv_utf8_to_16);
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
bool ntlm_unicode_utf16_to_8(
|
|
178
|
+
char **converted,
|
|
179
|
+
size_t *converted_len,
|
|
180
|
+
ntlm_unicode_ctx *ctx,
|
|
181
|
+
const char *string,
|
|
182
|
+
size_t string_len)
|
|
183
|
+
{
|
|
184
|
+
return unicode_iconv_encoding_convert(
|
|
185
|
+
converted, converted_len, ctx, string, string_len,
|
|
186
|
+
unicode_iconv_utf16_to_8);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
void ntlm_unicode_ctx_free(ntlm_unicode_ctx *ctx)
|
|
190
|
+
{
|
|
191
|
+
if (!ctx)
|
|
192
|
+
return;
|
|
193
|
+
|
|
194
|
+
if (ctx->utf16_to_8 != (iconv_t)-1)
|
|
195
|
+
iconv_close(ctx->utf16_to_8);
|
|
196
|
+
|
|
197
|
+
if (ctx->utf8_to_16 != (iconv_t)-1)
|
|
198
|
+
iconv_close(ctx->utf8_to_16);
|
|
199
|
+
|
|
200
|
+
free(ctx);
|
|
201
|
+
}
|