diff options
| author | Michael Forney <mforney@mforney.org> | 2017-05-27 19:53:40 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2017-05-27 19:53:40 -0700 |
| commit | 3d04093e74f1d948d359106fef7c72f908196b5a (patch) | |
| tree | 6a92e30bf86e6436a358bf60706e1feed4156770 /pkg | |
| parent | 4c2436940b29ee6fc13f717c8670a0d071039476 (diff) | |
git: Use the DC SHA1 implementation
This is now the default in 2.13.0 and it detects collision attacks.
Also, it removes the libcrypto dependency.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/git/config.h | 2 | ||||
| -rw-r--r-- | pkg/git/gen.rc | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pkg/git/config.h b/pkg/git/config.h index ca107532..47675e39 100644 --- a/pkg/git/config.h +++ b/pkg/git/config.h @@ -12,4 +12,4 @@ #define GIT_VERSION "2.13.0" #define NO_SYS_POLL_H #define PAGER_ENV "LESS=FRX LV=-c" -#define SHA1_OPENSSL +#define SHA1_DC diff --git a/pkg/git/gen.rc b/pkg/git/gen.rc index 92b13aa7..feefdd1b 100644 --- a/pkg/git/gen.rc +++ b/pkg/git/gen.rc @@ -186,9 +186,11 @@ lib libgit.a -d '$dir'/deps\ xdiff-interface.c\ zlib.c\ \ + sha1dc/sha1.c\ + sha1dc/ubc_check.c\ thread-utils.c\ libxdiff.a\ - '$builddir'/pkg/^(libressl/libcrypto.a.d zlib/libz.a) + '$builddir'/pkg/zlib/libz.a # src/Makefile:/^XDIFF_OBJS.\+= lib libxdiff.a xdiff/^(\ |