Merge branch 'master' into sftp-xattrs

.gitignore

@@ -38,6 +38,7 @@ tests/api-tests
 tests/api-tests.log
 utils/*.[0-9]
 *.a
+*.gcno
 *.la
 *.lo
 *.log

.travis.yml

@@ -6,6 +6,10 @@ compiler:
   - clang
 
 install:
+  # Need to add other repos for e.g. libsodium
+  - sudo add-apt-repository -y ppa:chris-lea/libsodium
+  - echo "deb http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list > /dev/null
+  - echo "deb-src http://ppa.launchpad.net/chris-lea/libsodium/ubuntu trusty main" | sudo tee -a /etc/apt/sources.list > /dev/null
   - sudo apt-get update -qq
   # for unit tests
   - sudo apt-get install -y check
@@ -27,6 +31,8 @@ install:
   - sudo apt-get install -y libpq-dev
   # for OpenSSL support
   - sudo apt-get install -y libssl-dev
+  # for Sodium support
+  - sudo apt-get install -y libsodium-dev
   # for mod_sql_sqlite
   - sudo apt-get install -y libsqlite3-dev sqlite3
   # for PCRE support

NEWS

@@ -13,6 +13,10 @@
 - Bug 4222 - Add support for curve25519-sha256@libssh.org key exchange.
 - Bug 4186 - ProFTPD creates name-based vhost when it should not.
 - Bug 4233 - Support enforcing minimum key lengths for SFTP/SCP.
+- Bug 4235 - Recursive SCP uploads of directories fail with "No such file or
+  directory".
+- Bug 4154 - Support for scrypt in mod_sql_passwd.  This also includes
+  support for Argon2, assuming use of libsodium-1.0.9 or later.
 
 1.3.6rc2 - Released 10-Mar-2016
 --------------------------------

RELEASE_NOTES

@@ -11,12 +11,16 @@ ChangeLog files.
 
   + mod_sftp uses SHA256 for publickey fingerprints by default, rather than
     SHA1 or MD5.
+  + mod_sql_passwd supports Scrypt and Argon2 password hashing algorithms
+    when built using libsodium.
 
-
+  
   + New Configuration Directives:
 
     SFTPKeyLimits (Bug#4233)
 
+    SQLPasswordCost (Bug#4154)
+
 
   + Changed Configuration Directives:
 

config.h.in

@@ -696,6 +696,9 @@
 /* Define if you have the <signal.h> header file.  */
 #undef HAVE_SIGNAL_H
 
+/* Define if you have the <sodium.h> header file.  */
+#undef HAVE_SODIUM_H
+
 /* Define if you have the <string.h> header file.  */
 #undef HAVE_STRING_H
 
@@ -993,6 +996,9 @@
 /* Define if using nonblocking open of log files.  */
 #undef PR_USE_NONBLOCKING_LOG_OPEN
 
+/* Define if Sodiumm support, if available, should be used.  */
+#undef PR_USE_SODIUM
+
 /* Define if OpenSSL support, if available, should be used.  */
 #undef PR_USE_OPENSSL