diff options
| author | Kenny Root <kroot@google.com> | 2013-06-14 06:32:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-14 06:32:52 +0000 |
| commit | 591821186d22eaf4dbc6e85f54fbd673b587bfb7 (patch) | |
| tree | dae6381d2d1095755d42ecdc96bdf744cd635199 | |
| parent | aa47e52c0987e27a88f19e82249a056199267df4 (diff) | |
| parent | 3d96a573de0aa3dd59e14eea09164ce9f351405d (diff) | |
| download | scrypt-591821186d22eaf4dbc6e85f54fbd673b587bfb7.tar.gz | |
Merge "Remove patch for bionic"
| -rw-r--r-- | lib/crypto/crypto_scrypt-ref.c | 1 | ||||
| -rw-r--r-- | patches/bionic.patch | 12 | ||||
| -rw-r--r-- | scrypt.config | 5 |
3 files changed, 0 insertions, 18 deletions
diff --git a/lib/crypto/crypto_scrypt-ref.c b/lib/crypto/crypto_scrypt-ref.c index 60ef2aa..abe23ea 100644 --- a/lib/crypto/crypto_scrypt-ref.c +++ b/lib/crypto/crypto_scrypt-ref.c @@ -30,7 +30,6 @@ #include <errno.h> #include <stdint.h> -#include <limits.h> #include <stdlib.h> #include <string.h> diff --git a/patches/bionic.patch b/patches/bionic.patch deleted file mode 100644 index 4564ca0..0000000 --- a/patches/bionic.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/lib/crypto/crypto_scrypt-ref.c b/lib/crypto/crypto_scrypt-ref.c -index b47ca45..79a6f8f 100644 ---- a/lib/crypto/crypto_scrypt-ref.c -+++ b/lib/crypto/crypto_scrypt-ref.c -@@ -30,6 +30,7 @@ - - #include <errno.h> - #include <stdint.h> -+#include <limits.h> - #include <stdlib.h> - #include <string.h> - diff --git a/scrypt.config b/scrypt.config index f868cdf..3d3ec90 100644 --- a/scrypt.config +++ b/scrypt.config @@ -72,14 +72,9 @@ lib/crypto/crypto_scrypt-ref.c \ " SCRYPT_PATCHES="\ -bionic.patch \ use_openssl_pbkdf2.patch \ " -SCRYPT_PATCHES_bionic_SOURCES="\ -lib/crypto/crypto_scrypt-ref.c \ -" - SCRYPT_PATCHES_use_openssl_pbkdf2_SOURCES="\ lib/crypto/crypto_scrypt-ref.c \ " |