Merged DomBlack#4 into Master.

Conflict; crypto/crypto_scrypt-sse.c

Author: DomBlack

.gitignore

@@ -24,6 +24,16 @@ mkinstalldirs
 run-tests.php
 modules
 
+#
+# Test Output
+#
+tests/*.diff
+tests/*.exp
+tests/*.log
+tests/*.out
+tests/*.php
+tests/*.sh
+
 #
 # Visual Studio
 #
@@ -46,4 +56,4 @@ obj/
 Thumbs.db
 
 # OSX store fiels
-.DS_Store
+.DS_Store

VS2008/VS2008.vcproj

@@ -175,7 +175,7 @@
 			Name="crypto"
 			>
 			<File
-				RelativePath="..\crypto\crypto_scrypt.c"
+				RelativePath="..\crypto\crypto_scrypt-nosse.c"
 				>
 			</File>
 			<File

crypto/crypto_scrypt-sse.c

@@ -26,6 +26,11 @@
  * This file was originally written by Colin Percival as part of the Tarsnap
  * online backup system.
  */
+#include "php.h"
+#ifdef PHP_WIN32
+#include "zend_config.w32.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/mman.h>
 
@@ -270,23 +275,27 @@ crypto_scrypt(const uint8_t * passwd, size_t passwdlen,
     /* Sanity-check parameters. */
 #if SIZE_MAX > UINT32_MAX
     if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
+        php_error(1, "Invalid Parameters: $keyLength too big");
         errno = EFBIG;
         goto err0;
     }
 #endif
     if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
         errno = EFBIG;
+        php_error(1, "Invalid Parameters; $r * $p is >= 2^30");
         goto err0;
     }
     if (((N & (N - 1)) != 0) || (N == 0)) {
         errno = EINVAL;
+        php_error(1, "Invalid Parameters; $N is not a power of two greater than 1");
         goto err0;
     }
     if ((r > SIZE_MAX / 128 / p) ||
 #if SIZE_MAX / 256 <= UINT32_MAX
         (r > (SIZE_MAX - 64) / 256) ||
 #endif
         (N > SIZE_MAX / 128 / r)) {
+        php_error(1, "Invalid Parameters");
         errno = ENOMEM;
         goto err0;
     }

php-scrypt.sublime-project

@@ -22,7 +22,11 @@
                 "Makefile*",
                 "missing",
                 "mkinstalldirs",
-                "run-tests.php"
+                "run-tests.php",
+                "tests/*.diff",
+                "tests/*.exp",
+                "tests/*.log",
+                "tests/*.out"
             ],
             "folder_exclude_patterns":
             [