diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-20 00:58:46 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-06-20 00:58:46 +0000 |
| commit | 2fbd60ec4724bc5eebc0870e28620e75ae447922 (patch) | |
| tree | fc0773ee0b0110256bf52c4846f02ccaec2c6e6d /secure | |
| parent | c8d232d482fa2dcc270365dbdc76d2f8f5b1c3a7 (diff) | |
| parent | 729c67f5a7eb53b09f548cb60ebd3913e0922548 (diff) | |
| download | src-2fbd60ec4724bc5eebc0870e28620e75ae447922.tar.gz src-2fbd60ec4724bc5eebc0870e28620e75ae447922.zip | |
Merge from head @274131
Notes
Notes:
svn path=/projects/release-pkg/; revision=284621
Diffstat (limited to 'secure')
| -rw-r--r-- | secure/lib/libcrypt/crypt-blowfish.c | 3 | ||||
| -rw-r--r-- | secure/lib/libcrypto/Makefile.depend | 1 | ||||
| -rw-r--r-- | secure/lib/libssh/Makefile.depend | 1 | ||||
| -rw-r--r-- | secure/lib/libssl/Makefile.depend | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/secure/lib/libcrypt/crypt-blowfish.c b/secure/lib/libcrypt/crypt-blowfish.c index 35fb5818b6a9..acd9057b6e85 100644 --- a/secure/lib/libcrypt/crypt-blowfish.c +++ b/secure/lib/libcrypt/crypt-blowfish.c @@ -167,6 +167,9 @@ crypt_blowfish(const char *key, const char *salt) switch (salt[1]) { case 'a': /* 'ab' should not yield the same as 'abab' */ case 'b': /* cap input length at 72 bytes */ + case 'y': /* same as 'b', for compatibility + * with openwall crypt_blowfish + */ minr = salt[1]; salt++; break; diff --git a/secure/lib/libcrypto/Makefile.depend b/secure/lib/libcrypto/Makefile.depend index 0742ab226ec3..723f45ee46a4 100644 --- a/secure/lib/libcrypto/Makefile.depend +++ b/secure/lib/libcrypto/Makefile.depend @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ lib/msun \ + usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/secure/lib/libssh/Makefile.depend b/secure/lib/libssh/Makefile.depend index 51e45b4efd13..fbf95e59e8c0 100644 --- a/secure/lib/libssh/Makefile.depend +++ b/secure/lib/libssh/Makefile.depend @@ -17,6 +17,7 @@ DIRDEPS = \ lib/libz \ secure/lib/libcrypto \ secure/lib/libssl \ + usr.bin/xinstall.host \ .include <dirdeps.mk> diff --git a/secure/lib/libssl/Makefile.depend b/secure/lib/libssl/Makefile.depend index f318cc1a6b40..5d73f9748ce4 100644 --- a/secure/lib/libssl/Makefile.depend +++ b/secure/lib/libssl/Makefile.depend @@ -11,6 +11,7 @@ DIRDEPS = \ lib/libc \ lib/libcompiler_rt \ secure/lib/libcrypto \ + usr.bin/xinstall.host \ .include <dirdeps.mk> |