diff options
| author | bapt <bapt@FreeBSD.org> | 2015-06-20 00:58:46 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2015-06-20 00:58:46 +0000 |
| commit | bb8dfd5e7e9ae9f11af6d8bc1e6993e7490d8530 (patch) | |
| tree | fc0773ee0b0110256bf52c4846f02ccaec2c6e6d /secure | |
| parent | dfe0a3d0ebe1a9f827bcae5ac6c246fa0b50e817 (diff) | |
| parent | b7b105f7f3482125c0a0cd3901ba022144b964b1 (diff) | |
| download | FreeBSD-src-bb8dfd5e7e9ae9f11af6d8bc1e6993e7490d8530.zip FreeBSD-src-bb8dfd5e7e9ae9f11af6d8bc1e6993e7490d8530.tar.gz | |
Merge from head @274131
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 35fb581..acd9057 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 0742ab2..723f45e 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 51e45b4..fbf95e5 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 f318cc1..5d73f97 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> |
