rugged 0.26.3 → 0.26.6

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 (62) hide show
  1. checksums.yaml +4 -4
  2. data/lib/rugged/version.rb +1 -1
  3. data/vendor/libgit2/CMakeLists.txt +1 -1
  4. data/vendor/libgit2/deps/winhttp/winhttp.h +6 -4
  5. data/vendor/libgit2/deps/zlib/adler32.c +14 -7
  6. data/vendor/libgit2/deps/zlib/crc32.c +29 -12
  7. data/vendor/libgit2/deps/zlib/deflate.c +499 -303
  8. data/vendor/libgit2/deps/zlib/deflate.h +18 -15
  9. data/vendor/libgit2/deps/zlib/gzguts.h +218 -0
  10. data/vendor/libgit2/deps/zlib/infback.c +2 -2
  11. data/vendor/libgit2/deps/zlib/inffast.c +34 -51
  12. data/vendor/libgit2/deps/zlib/inflate.c +86 -37
  13. data/vendor/libgit2/deps/zlib/inflate.h +7 -4
  14. data/vendor/libgit2/deps/zlib/inftrees.c +12 -14
  15. data/vendor/libgit2/deps/zlib/trees.c +38 -61
  16. data/vendor/libgit2/deps/zlib/zconf.h +499 -23
  17. data/vendor/libgit2/deps/zlib/zlib.h +298 -154
  18. data/vendor/libgit2/deps/zlib/zutil.c +27 -23
  19. data/vendor/libgit2/deps/zlib/zutil.h +35 -17
  20. data/vendor/libgit2/include/git2.h +1 -0
  21. data/vendor/libgit2/include/git2/sys/mempack.h +5 -4
  22. data/vendor/libgit2/include/git2/version.h +2 -2
  23. data/vendor/libgit2/src/checkout.c +34 -11
  24. data/vendor/libgit2/src/curl_stream.c +21 -0
  25. data/vendor/libgit2/src/curl_stream.h +1 -0
  26. data/vendor/libgit2/src/delta.c +30 -28
  27. data/vendor/libgit2/src/diff.c +0 -7
  28. data/vendor/libgit2/src/diff_file.c +3 -1
  29. data/vendor/libgit2/src/diff_generate.c +1 -1
  30. data/vendor/libgit2/src/diff_tform.c +3 -1
  31. data/vendor/libgit2/src/global.c +4 -2
  32. data/vendor/libgit2/src/hash/hash_openssl.h +18 -3
  33. data/vendor/libgit2/src/ignore.c +60 -36
  34. data/vendor/libgit2/src/index.c +59 -26
  35. data/vendor/libgit2/src/indexer.c +15 -2
  36. data/vendor/libgit2/src/merge.c +18 -8
  37. data/vendor/libgit2/src/odb_mempack.c +1 -0
  38. data/vendor/libgit2/src/oidarray.c +12 -0
  39. data/vendor/libgit2/src/oidarray.h +1 -0
  40. data/vendor/libgit2/src/openssl_stream.c +17 -4
  41. data/vendor/libgit2/src/pack.c +10 -7
  42. data/vendor/libgit2/src/path.c +180 -22
  43. data/vendor/libgit2/src/path.h +73 -0
  44. data/vendor/libgit2/src/posix.c +1 -1
  45. data/vendor/libgit2/src/posix.h +3 -0
  46. data/vendor/libgit2/src/proxy.c +6 -0
  47. data/vendor/libgit2/src/proxy.h +1 -0
  48. data/vendor/libgit2/src/push.c +3 -0
  49. data/vendor/libgit2/src/refdb_fs.c +2 -2
  50. data/vendor/libgit2/src/refs.c +7 -1
  51. data/vendor/libgit2/src/repository.c +9 -3
  52. data/vendor/libgit2/src/sha1_lookup.c +2 -2
  53. data/vendor/libgit2/src/signature.c +1 -0
  54. data/vendor/libgit2/src/socket_stream.c +1 -1
  55. data/vendor/libgit2/src/stransport_stream.c +3 -1
  56. data/vendor/libgit2/src/submodule.c +54 -7
  57. data/vendor/libgit2/src/submodule.h +13 -0
  58. data/vendor/libgit2/src/transports/smart_pkt.c +8 -2
  59. data/vendor/libgit2/src/transports/smart_protocol.c +6 -6
  60. data/vendor/libgit2/src/transports/winhttp.c +22 -0
  61. data/vendor/libgit2/src/tree.c +1 -1
  62. metadata +3 -2
@@ -37,6 +37,14 @@
37
37
  #define WINHTTP_IGNORE_REQUEST_TOTAL_LENGTH 0
38
38
  #endif
39
39
 
40
+ #ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS_1_1
41
+ # define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 0x00000200
42
+ #endif
43
+
44
+ #ifndef WINHTTP_FLAG_SECURE_PROTOCOL_TLS_1_2
45
+ # define WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2 0x00000800
46
+ #endif
47
+
40
48
  static const char *prefix_https = "https://";
41
49
  static const char *upload_pack_service = "upload-pack";
42
50
  static const char *upload_pack_ls_service_url = "/info/refs?service=git-upload-pack";
@@ -747,6 +755,10 @@ static int winhttp_connect(
747
755
  int error = -1;
748
756
  int default_timeout = TIMEOUT_INFINITE;
749
757
  int default_connect_timeout = DEFAULT_CONNECT_TIMEOUT;
758
+ DWORD protocols =
759
+ WINHTTP_FLAG_SECURE_PROTOCOL_TLS1 |
760
+ WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_1 |
761
+ WINHTTP_FLAG_SECURE_PROTOCOL_TLS1_2;
750
762
 
751
763
  t->session = NULL;
752
764
  t->connection = NULL;
@@ -788,6 +800,16 @@ static int winhttp_connect(
788
800
  goto on_error;
789
801
  }
790
802
 
803
+ /*
804
+ * Do a best-effort attempt to enable TLS 1.2 but allow this to
805
+ * fail; if TLS 1.2 support is not available for some reason,
806
+ * ignore the failure (it will keep the default protocols).
807
+ */
808
+ WinHttpSetOption(t->session,
809
+ WINHTTP_OPTION_SECURE_PROTOCOLS,
810
+ &protocols,
811
+ sizeof(protocols));
812
+
791
813
  if (!WinHttpSetTimeouts(t->session, default_timeout, default_connect_timeout, default_timeout, default_timeout)) {
792
814
  giterr_set(GITERR_OS, "failed to set timeouts for WinHTTP");
793
815
  goto on_error;
@@ -54,7 +54,7 @@ GIT_INLINE(git_filemode_t) normalize_filemode(git_filemode_t filemode)
54
54
  static int valid_entry_name(git_repository *repo, const char *filename)
55
55
  {
56
56
  return *filename != '\0' &&
57
- git_path_isvalid(repo, filename,
57
+ git_path_isvalid(repo, filename, 0,
58
58
  GIT_PATH_REJECT_TRAVERSAL | GIT_PATH_REJECT_DOT_GIT | GIT_PATH_REJECT_SLASH);
59
59
  }
60
60
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rugged
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.26.3
4
+ version: 0.26.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Scott Chacon
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-03-26 00:00:00.000000000 Z
12
+ date: 2018-08-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rake-compiler
@@ -147,6 +147,7 @@ files:
147
147
  - vendor/libgit2/deps/zlib/crc32.h
148
148
  - vendor/libgit2/deps/zlib/deflate.c
149
149
  - vendor/libgit2/deps/zlib/deflate.h
150
+ - vendor/libgit2/deps/zlib/gzguts.h
150
151
  - vendor/libgit2/deps/zlib/infback.c
151
152
  - vendor/libgit2/deps/zlib/inffast.c
152
153
  - vendor/libgit2/deps/zlib/inffast.h