From 629ed239a9d27f2b58697ef48d7a12c81e5d74cf Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 31 Aug 2017 19:15:50 +0800 Subject: Fix import_scrypt.sh This commit fixes various issues in import_scrypt.sh: * Add `-N` option to `diff` command so that arm_neon.diff can be generated by import_scrypt.sh * Rename SCRYPT_PATCHES_bionic_SOURCES to SCRYPT_PATCHES_arm_neon_SOURCES * Reorder SCRYPT_PATCHES_arm_neon_SOURCES to mimic git-diff output * Add missing `lib/crypto/crypto_scrypt-sse.c` file for use_openssl_pbkdf2.patch * Add `-f` to `rm` command in the `generate` command because `config.h` is not in the upstream release tarball * Replace typo `$SCRYPT_DIR_ORIG_ORIG` with `$SCRYPT_DIR_ORIG` * Rename arm-neon.patch to arm_neon.patch (for consistency) Bug: 65425184 Test: ./import_scrypt.sh import upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/arm_neon.patch \ upstream/scrypt-1.1.6.tgz Test: ./import_scrypt.sh generate patches/use_openssl_pbkdf2.patch \ upstream/scrypt-1.1.6.tgz Change-Id: I843a21440527ed4037525468e9f66630f24b4cee --- import_scrypt.sh | 6 +- patches/README | 2 +- patches/arm-neon.patch | 436 ------------------------------------------------- patches/arm_neon.patch | 436 +++++++++++++++++++++++++++++++++++++++++++++++++ scrypt.config | 7 +- 5 files changed, 444 insertions(+), 443 deletions(-) delete mode 100644 patches/arm-neon.patch create mode 100644 patches/arm_neon.patch diff --git a/import_scrypt.sh b/import_scrypt.sh index 324eae6..d85d763 100755 --- a/import_scrypt.sh +++ b/import_scrypt.sh @@ -90,7 +90,7 @@ function main() { declare -r patch=$1 shift || usage "No patch file specified." [ -d $SCRYPT_DIR ] || usage "$SCRYPT_DIR not found, did you mean to use generate?" - [ -d $SCRYPT_DIR_ORIG_ORIG ] || usage "$SCRYPT_DIR_ORIG not found, did you mean to use generate?" + [ -d $SCRYPT_DIR_ORIG ] || usage "$SCRYPT_DIR_ORIG not found, did you mean to use generate?" regenerate $patch elif [ "$command" = "generate" ]; then declare -r patch=$1 @@ -395,7 +395,7 @@ function generate() { for i in $NEEDED_SOURCES; do echo "Restoring $i" - rm -r $SCRYPT_DIR/$i + rm -rf $SCRYPT_DIR/$i cp -rf $i $SCRYPT_DIR/$i done @@ -484,7 +484,7 @@ function generatepatch() { rm -f $patch touch $patch for i in $sources; do - LC_ALL=C TZ=UTC0 diff -aup $SCRYPT_DIR_ORIG/$i $SCRYPT_DIR/$i >> $patch && die "ERROR: No diff for patch $path in file $i" + LC_ALL=C TZ=UTC0 diff -aupN $SCRYPT_DIR_ORIG/$i $SCRYPT_DIR/$i >> $patch && die "ERROR: No diff for patch $path in file $i" done echo "Generated patch $patch" echo "NOTE To make sure there are not unwanted changes from conflicting patches, be sure to review the generated patch." diff --git a/patches/README b/patches/README index 353ddbb..018cac5 100644 --- a/patches/README +++ b/patches/README @@ -6,6 +6,6 @@ use_openssl_pbkdf2.patch: Uses the PBKDF2 function from OpenSSL (it uses accelerated SHA256) -arm-neon.patch: +arm_neon.patch: Adds NEON acceleration for the Salsa20/8 mixing function. diff --git a/patches/arm-neon.patch b/patches/arm-neon.patch deleted file mode 100644 index 02ff357..0000000 --- a/patches/arm-neon.patch +++ /dev/null @@ -1,436 +0,0 @@ -diff --git a/lib/crypto/crypto_scrypt-neon-salsa208.h b/lib/crypto/crypto_scrypt-neon-salsa208.h -new file mode 100644 -index 0000000..a3b1019 ---- /dev/null -+++ b/lib/crypto/crypto_scrypt-neon-salsa208.h -@@ -0,0 +1,120 @@ -+/* -+ * version 20110505 -+ * D. J. Bernstein -+ * Public domain. -+ * -+ * Based on crypto_core/salsa208/armneon/core.c from SUPERCOP 20130419 -+ */ -+ -+#define ROUNDS 8 -+static void -+salsa20_8_intrinsic(void * input) -+{ -+ int i; -+ -+ const uint32x4_t abab = {-1,0,-1,0}; -+ -+ /* -+ * This is modified since we only have one argument. Usually you'd rearrange -+ * the constant, key, and input bytes, but we just have one linear array to -+ * rearrange which is a bit easier. -+ */ -+ -+ /* -+ * Change the input to be diagonals as if it's a 4x4 matrix of 32-bit values. -+ */ -+ uint32x4_t x0x5x10x15; -+ uint32x4_t x12x1x6x11; -+ uint32x4_t x8x13x2x7; -+ uint32x4_t x4x9x14x3; -+ -+ uint32x4_t x0x1x10x11; -+ uint32x4_t x12x13x6x7; -+ uint32x4_t x8x9x2x3; -+ uint32x4_t x4x5x14x15; -+ -+ uint32x4_t x0x1x2x3; -+ uint32x4_t x4x5x6x7; -+ uint32x4_t x8x9x10x11; -+ uint32x4_t x12x13x14x15; -+ -+ x0x1x2x3 = vld1q_u8((uint8_t *) input); -+ x4x5x6x7 = vld1q_u8(16 + (uint8_t *) input); -+ x8x9x10x11 = vld1q_u8(32 + (uint8_t *) input); -+ x12x13x14x15 = vld1q_u8(48 + (uint8_t *) input); -+ -+ x0x1x10x11 = vcombine_u32(vget_low_u32(x0x1x2x3), vget_high_u32(x8x9x10x11)); -+ x4x5x14x15 = vcombine_u32(vget_low_u32(x4x5x6x7), vget_high_u32(x12x13x14x15)); -+ x8x9x2x3 = vcombine_u32(vget_low_u32(x8x9x10x11), vget_high_u32(x0x1x2x3)); -+ x12x13x6x7 = vcombine_u32(vget_low_u32(x12x13x14x15), vget_high_u32(x4x5x6x7)); -+ -+ x0x5x10x15 = vbslq_u32(abab,x0x1x10x11,x4x5x14x15); -+ x8x13x2x7 = vbslq_u32(abab,x8x9x2x3,x12x13x6x7); -+ x4x9x14x3 = vbslq_u32(abab,x4x5x14x15,x8x9x2x3); -+ x12x1x6x11 = vbslq_u32(abab,x12x13x6x7,x0x1x10x11); -+ -+ uint32x4_t start0 = x0x5x10x15; -+ uint32x4_t start1 = x12x1x6x11; -+ uint32x4_t start3 = x4x9x14x3; -+ uint32x4_t start2 = x8x13x2x7; -+ -+ /* From here on this should be the same as the SUPERCOP version. */ -+ -+ uint32x4_t diag0 = start0; -+ uint32x4_t diag1 = start1; -+ uint32x4_t diag2 = start2; -+ uint32x4_t diag3 = start3; -+ -+ uint32x4_t a0; -+ uint32x4_t a1; -+ uint32x4_t a2; -+ uint32x4_t a3; -+ -+ for (i = ROUNDS;i > 0;i -= 2) { -+ a0 = diag1 + diag0; -+ diag3 ^= vsriq_n_u32(vshlq_n_u32(a0,7),a0,25); -+ a1 = diag0 + diag3; -+ diag2 ^= vsriq_n_u32(vshlq_n_u32(a1,9),a1,23); -+ a2 = diag3 + diag2; -+ diag1 ^= vsriq_n_u32(vshlq_n_u32(a2,13),a2,19); -+ a3 = diag2 + diag1; -+ diag0 ^= vsriq_n_u32(vshlq_n_u32(a3,18),a3,14); -+ -+ diag3 = vextq_u32(diag3,diag3,3); -+ diag2 = vextq_u32(diag2,diag2,2); -+ diag1 = vextq_u32(diag1,diag1,1); -+ -+ a0 = diag3 + diag0; -+ diag1 ^= vsriq_n_u32(vshlq_n_u32(a0,7),a0,25); -+ a1 = diag0 + diag1; -+ diag2 ^= vsriq_n_u32(vshlq_n_u32(a1,9),a1,23); -+ a2 = diag1 + diag2; -+ diag3 ^= vsriq_n_u32(vshlq_n_u32(a2,13),a2,19); -+ a3 = diag2 + diag3; -+ diag0 ^= vsriq_n_u32(vshlq_n_u32(a3,18),a3,14); -+ -+ diag1 = vextq_u32(diag1,diag1,3); -+ diag2 = vextq_u32(diag2,diag2,2); -+ diag3 = vextq_u32(diag3,diag3,1); -+ } -+ -+ x0x5x10x15 = diag0 + start0; -+ x12x1x6x11 = diag1 + start1; -+ x8x13x2x7 = diag2 + start2; -+ x4x9x14x3 = diag3 + start3; -+ -+ x0x1x10x11 = vbslq_u32(abab,x0x5x10x15,x12x1x6x11); -+ x12x13x6x7 = vbslq_u32(abab,x12x1x6x11,x8x13x2x7); -+ x8x9x2x3 = vbslq_u32(abab,x8x13x2x7,x4x9x14x3); -+ x4x5x14x15 = vbslq_u32(abab,x4x9x14x3,x0x5x10x15); -+ -+ x0x1x2x3 = vcombine_u32(vget_low_u32(x0x1x10x11),vget_high_u32(x8x9x2x3)); -+ x4x5x6x7 = vcombine_u32(vget_low_u32(x4x5x14x15),vget_high_u32(x12x13x6x7)); -+ x8x9x10x11 = vcombine_u32(vget_low_u32(x8x9x2x3),vget_high_u32(x0x1x10x11)); -+ x12x13x14x15 = vcombine_u32(vget_low_u32(x12x13x6x7),vget_high_u32(x4x5x14x15)); -+ -+ vst1q_u8((uint8_t *) input,(uint8x16_t) x0x1x2x3); -+ vst1q_u8(16 + (uint8_t *) input,(uint8x16_t) x4x5x6x7); -+ vst1q_u8(32 + (uint8_t *) input,(uint8x16_t) x8x9x10x11); -+ vst1q_u8(48 + (uint8_t *) input,(uint8x16_t) x12x13x14x15); -+} -diff --git a/lib/crypto/crypto_scrypt-neon.c b/lib/crypto/crypto_scrypt-neon.c -new file mode 100644 -index 0000000..a3bf052 ---- /dev/null -+++ b/lib/crypto/crypto_scrypt-neon.c -@@ -0,0 +1,304 @@ -+/*- -+ * Copyright 2009 Colin Percival -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * This file was originally written by Colin Percival as part of the Tarsnap -+ * online backup system. -+ */ -+#include "scrypt_platform.h" -+ -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#ifdef USE_OPENSSL_PBKDF2 -+#include -+#else -+#include "sha256.h" -+#endif -+#include "sysendian.h" -+ -+#include "crypto_scrypt.h" -+ -+#include "crypto_scrypt-neon-salsa208.h" -+ -+static void blkcpy(void *, void *, size_t); -+static void blkxor(void *, void *, size_t); -+void crypto_core_salsa208_armneon2(void *); -+static void blockmix_salsa8(uint8x16_t *, uint8x16_t *, uint8x16_t *, size_t); -+static uint64_t integerify(void *, size_t); -+static void smix(uint8_t *, size_t, uint64_t, void *, void *); -+ -+static void -+blkcpy(void * dest, void * src, size_t len) -+{ -+ uint8x16_t * D = dest; -+ uint8x16_t * S = src; -+ size_t L = len / 16; -+ size_t i; -+ -+ for (i = 0; i < L; i++) -+ D[i] = S[i]; -+} -+ -+static void -+blkxor(void * dest, void * src, size_t len) -+{ -+ uint8x16_t * D = dest; -+ uint8x16_t * S = src; -+ size_t L = len / 16; -+ size_t i; -+ -+ for (i = 0; i < L; i++) -+ D[i] = veorq_u8(D[i], S[i]); -+} -+ -+/** -+ * blockmix_salsa8(B, Y, r): -+ * Compute B = BlockMix_{salsa20/8, r}(B). The input B must be 128r bytes in -+ * length; the temporary space Y must also be the same size. -+ */ -+static void -+blockmix_salsa8(uint8x16_t * Bin, uint8x16_t * Bout, uint8x16_t * X, size_t r) -+{ -+ size_t i; -+ -+ /* 1: X <-- B_{2r - 1} */ -+ blkcpy(X, &Bin[8 * r - 4], 64); -+ -+ /* 2: for i = 0 to 2r - 1 do */ -+ for (i = 0; i < r; i++) { -+ /* 3: X <-- H(X \xor B_i) */ -+ blkxor(X, &Bin[i * 8], 64); -+ salsa20_8_intrinsic((void *) X); -+ -+ /* 4: Y_i <-- X */ -+ /* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */ -+ blkcpy(&Bout[i * 4], X, 64); -+ -+ /* 3: X <-- H(X \xor B_i) */ -+ blkxor(X, &Bin[i * 8 + 4], 64); -+ salsa20_8_intrinsic((void *) X); -+ -+ /* 4: Y_i <-- X */ -+ /* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */ -+ blkcpy(&Bout[(r + i) * 4], X, 64); -+ } -+} -+ -+/** -+ * integerify(B, r): -+ * Return the result of parsing B_{2r-1} as a little-endian integer. -+ */ -+static uint64_t -+integerify(void * B, size_t r) -+{ -+ uint8_t * X = (void*)((uintptr_t)(B) + (2 * r - 1) * 64); -+ -+ return (le64dec(X)); -+} -+ -+/** -+ * smix(B, r, N, V, XY): -+ * Compute B = SMix_r(B, N). The input B must be 128r bytes in length; the -+ * temporary storage V must be 128rN bytes in length; the temporary storage -+ * XY must be 256r bytes in length. The value N must be a power of 2. -+ */ -+static void -+smix(uint8_t * B, size_t r, uint64_t N, void * V, void * XY) -+{ -+ uint8x16_t * X = XY; -+ uint8x16_t * Y = (void *)((uintptr_t)(XY) + 128 * r); -+ uint8x16_t * Z = (void *)((uintptr_t)(XY) + 256 * r); -+ uint32_t * X32 = (void *)X; -+ uint64_t i, j; -+ size_t k; -+ -+ /* 1: X <-- B */ -+ blkcpy(X, B, 128 * r); -+ -+ /* 2: for i = 0 to N - 1 do */ -+ for (i = 0; i < N; i += 2) { -+ /* 3: V_i <-- X */ -+ blkcpy((void *)((uintptr_t)(V) + i * 128 * r), X, 128 * r); -+ -+ /* 4: X <-- H(X) */ -+ blockmix_salsa8(X, Y, Z, r); -+ -+ /* 3: V_i <-- X */ -+ blkcpy((void *)((uintptr_t)(V) + (i + 1) * 128 * r), -+ Y, 128 * r); -+ -+ /* 4: X <-- H(X) */ -+ blockmix_salsa8(Y, X, Z, r); -+ } -+ -+ /* 6: for i = 0 to N - 1 do */ -+ for (i = 0; i < N; i += 2) { -+ /* 7: j <-- Integerify(X) mod N */ -+ j = integerify(X, r) & (N - 1); -+ -+ /* 8: X <-- H(X \xor V_j) */ -+ blkxor(X, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r); -+ blockmix_salsa8(X, Y, Z, r); -+ -+ /* 7: j <-- Integerify(X) mod N */ -+ j = integerify(Y, r) & (N - 1); -+ -+ /* 8: X <-- H(X \xor V_j) */ -+ blkxor(Y, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r); -+ blockmix_salsa8(Y, X, Z, r); -+ } -+ -+ /* 10: B' <-- X */ -+ blkcpy(B, X, 128 * r); -+} -+ -+/** -+ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen): -+ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r, -+ * p, buflen) and write the result into buf. The parameters r, p, and buflen -+ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N -+ * must be a power of 2. -+ * -+ * Return 0 on success; or -1 on error. -+ */ -+int -+crypto_scrypt(const uint8_t * passwd, size_t passwdlen, -+ const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p, -+ uint8_t * buf, size_t buflen) -+{ -+ void * B0, * V0, * XY0; -+ uint8_t * B; -+ uint32_t * V; -+ uint32_t * XY; -+ uint32_t i; -+ -+ /* Sanity-check parameters. */ -+#if SIZE_MAX > UINT32_MAX -+ if (buflen > (((uint64_t)(1) << 32) - 1) * 32) { -+ errno = EFBIG; -+ goto err0; -+ } -+#endif -+ if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) { -+ errno = EFBIG; -+ goto err0; -+ } -+ if (((N & (N - 1)) != 0) || (N == 0)) { -+ errno = EINVAL; -+ goto err0; -+ } -+ if ((r > SIZE_MAX / 128 / p) || -+#if SIZE_MAX / 256 <= UINT32_MAX -+ (r > SIZE_MAX / 256) || -+#endif -+ (N > SIZE_MAX / 128 / r)) { -+ errno = ENOMEM; -+ goto err0; -+ } -+ -+ /* Allocate memory. */ -+#ifdef HAVE_POSIX_MEMALIGN -+ if ((errno = posix_memalign(&B0, 64, 128 * r * p)) != 0) -+ goto err0; -+ B = (uint8_t *)(B0); -+ if ((errno = posix_memalign(&XY0, 64, 256 * r + 64)) != 0) -+ goto err1; -+ XY = (uint32_t *)(XY0); -+#ifndef MAP_ANON -+ if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0) -+ goto err2; -+ V = (uint32_t *)(V0); -+#endif -+#else -+ if ((B0 = malloc(128 * r * p + 63)) == NULL) -+ goto err0; -+ B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63)); -+ if ((XY0 = malloc(256 * r + 64 + 63)) == NULL) -+ goto err1; -+ XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63)); -+#ifndef MAP_ANON -+ if ((V0 = malloc(128 * r * N + 63)) == NULL) -+ goto err2; -+ V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63)); -+#endif -+#endif -+#ifdef MAP_ANON -+ if ((V0 = mmap(NULL, 128 * r * N, PROT_READ | PROT_WRITE, -+#ifdef MAP_NOCORE -+ MAP_ANON | MAP_PRIVATE | MAP_NOCORE, -+#else -+ MAP_ANON | MAP_PRIVATE, -+#endif -+ -1, 0)) == MAP_FAILED) -+ goto err2; -+ V = (uint32_t *)(V0); -+#endif -+ -+ /* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */ -+#ifdef USE_OPENSSL_PBKDF2 -+ PKCS5_PBKDF2_HMAC((const char *)passwd, passwdlen, salt, saltlen, 1, EVP_sha256(), p * 128 * r, B); -+#else -+ PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r); -+#endif -+ -+ /* 2: for i = 0 to p - 1 do */ -+ for (i = 0; i < p; i++) { -+ /* 3: B_i <-- MF(B_i, N) */ -+ smix(&B[i * 128 * r], r, N, V, XY); -+ } -+ -+ /* 5: DK <-- PBKDF2(P, B, 1, dkLen) */ -+#ifdef USE_OPENSSL_PBKDF2 -+ PKCS5_PBKDF2_HMAC((const char *)passwd, passwdlen, B, p * 128 * r, 1, EVP_sha256(), buflen, buf); -+#else -+ PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen); -+#endif -+ -+ /* Free memory. */ -+#ifdef MAP_ANON -+ if (munmap(V0, 128 * r * N)) -+ goto err2; -+#else -+ free(V0); -+#endif -+ free(XY0); -+ free(B0); -+ -+ /* Success! */ -+ return (0); -+ -+err2: -+ free(XY0); -+err1: -+ free(B0); -+err0: -+ /* Failure! */ -+ return (-1); -+} diff --git a/patches/arm_neon.patch b/patches/arm_neon.patch new file mode 100644 index 0000000..02ff357 --- /dev/null +++ b/patches/arm_neon.patch @@ -0,0 +1,436 @@ +diff --git a/lib/crypto/crypto_scrypt-neon-salsa208.h b/lib/crypto/crypto_scrypt-neon-salsa208.h +new file mode 100644 +index 0000000..a3b1019 +--- /dev/null ++++ b/lib/crypto/crypto_scrypt-neon-salsa208.h +@@ -0,0 +1,120 @@ ++/* ++ * version 20110505 ++ * D. J. Bernstein ++ * Public domain. ++ * ++ * Based on crypto_core/salsa208/armneon/core.c from SUPERCOP 20130419 ++ */ ++ ++#define ROUNDS 8 ++static void ++salsa20_8_intrinsic(void * input) ++{ ++ int i; ++ ++ const uint32x4_t abab = {-1,0,-1,0}; ++ ++ /* ++ * This is modified since we only have one argument. Usually you'd rearrange ++ * the constant, key, and input bytes, but we just have one linear array to ++ * rearrange which is a bit easier. ++ */ ++ ++ /* ++ * Change the input to be diagonals as if it's a 4x4 matrix of 32-bit values. ++ */ ++ uint32x4_t x0x5x10x15; ++ uint32x4_t x12x1x6x11; ++ uint32x4_t x8x13x2x7; ++ uint32x4_t x4x9x14x3; ++ ++ uint32x4_t x0x1x10x11; ++ uint32x4_t x12x13x6x7; ++ uint32x4_t x8x9x2x3; ++ uint32x4_t x4x5x14x15; ++ ++ uint32x4_t x0x1x2x3; ++ uint32x4_t x4x5x6x7; ++ uint32x4_t x8x9x10x11; ++ uint32x4_t x12x13x14x15; ++ ++ x0x1x2x3 = vld1q_u8((uint8_t *) input); ++ x4x5x6x7 = vld1q_u8(16 + (uint8_t *) input); ++ x8x9x10x11 = vld1q_u8(32 + (uint8_t *) input); ++ x12x13x14x15 = vld1q_u8(48 + (uint8_t *) input); ++ ++ x0x1x10x11 = vcombine_u32(vget_low_u32(x0x1x2x3), vget_high_u32(x8x9x10x11)); ++ x4x5x14x15 = vcombine_u32(vget_low_u32(x4x5x6x7), vget_high_u32(x12x13x14x15)); ++ x8x9x2x3 = vcombine_u32(vget_low_u32(x8x9x10x11), vget_high_u32(x0x1x2x3)); ++ x12x13x6x7 = vcombine_u32(vget_low_u32(x12x13x14x15), vget_high_u32(x4x5x6x7)); ++ ++ x0x5x10x15 = vbslq_u32(abab,x0x1x10x11,x4x5x14x15); ++ x8x13x2x7 = vbslq_u32(abab,x8x9x2x3,x12x13x6x7); ++ x4x9x14x3 = vbslq_u32(abab,x4x5x14x15,x8x9x2x3); ++ x12x1x6x11 = vbslq_u32(abab,x12x13x6x7,x0x1x10x11); ++ ++ uint32x4_t start0 = x0x5x10x15; ++ uint32x4_t start1 = x12x1x6x11; ++ uint32x4_t start3 = x4x9x14x3; ++ uint32x4_t start2 = x8x13x2x7; ++ ++ /* From here on this should be the same as the SUPERCOP version. */ ++ ++ uint32x4_t diag0 = start0; ++ uint32x4_t diag1 = start1; ++ uint32x4_t diag2 = start2; ++ uint32x4_t diag3 = start3; ++ ++ uint32x4_t a0; ++ uint32x4_t a1; ++ uint32x4_t a2; ++ uint32x4_t a3; ++ ++ for (i = ROUNDS;i > 0;i -= 2) { ++ a0 = diag1 + diag0; ++ diag3 ^= vsriq_n_u32(vshlq_n_u32(a0,7),a0,25); ++ a1 = diag0 + diag3; ++ diag2 ^= vsriq_n_u32(vshlq_n_u32(a1,9),a1,23); ++ a2 = diag3 + diag2; ++ diag1 ^= vsriq_n_u32(vshlq_n_u32(a2,13),a2,19); ++ a3 = diag2 + diag1; ++ diag0 ^= vsriq_n_u32(vshlq_n_u32(a3,18),a3,14); ++ ++ diag3 = vextq_u32(diag3,diag3,3); ++ diag2 = vextq_u32(diag2,diag2,2); ++ diag1 = vextq_u32(diag1,diag1,1); ++ ++ a0 = diag3 + diag0; ++ diag1 ^= vsriq_n_u32(vshlq_n_u32(a0,7),a0,25); ++ a1 = diag0 + diag1; ++ diag2 ^= vsriq_n_u32(vshlq_n_u32(a1,9),a1,23); ++ a2 = diag1 + diag2; ++ diag3 ^= vsriq_n_u32(vshlq_n_u32(a2,13),a2,19); ++ a3 = diag2 + diag3; ++ diag0 ^= vsriq_n_u32(vshlq_n_u32(a3,18),a3,14); ++ ++ diag1 = vextq_u32(diag1,diag1,3); ++ diag2 = vextq_u32(diag2,diag2,2); ++ diag3 = vextq_u32(diag3,diag3,1); ++ } ++ ++ x0x5x10x15 = diag0 + start0; ++ x12x1x6x11 = diag1 + start1; ++ x8x13x2x7 = diag2 + start2; ++ x4x9x14x3 = diag3 + start3; ++ ++ x0x1x10x11 = vbslq_u32(abab,x0x5x10x15,x12x1x6x11); ++ x12x13x6x7 = vbslq_u32(abab,x12x1x6x11,x8x13x2x7); ++ x8x9x2x3 = vbslq_u32(abab,x8x13x2x7,x4x9x14x3); ++ x4x5x14x15 = vbslq_u32(abab,x4x9x14x3,x0x5x10x15); ++ ++ x0x1x2x3 = vcombine_u32(vget_low_u32(x0x1x10x11),vget_high_u32(x8x9x2x3)); ++ x4x5x6x7 = vcombine_u32(vget_low_u32(x4x5x14x15),vget_high_u32(x12x13x6x7)); ++ x8x9x10x11 = vcombine_u32(vget_low_u32(x8x9x2x3),vget_high_u32(x0x1x10x11)); ++ x12x13x14x15 = vcombine_u32(vget_low_u32(x12x13x6x7),vget_high_u32(x4x5x14x15)); ++ ++ vst1q_u8((uint8_t *) input,(uint8x16_t) x0x1x2x3); ++ vst1q_u8(16 + (uint8_t *) input,(uint8x16_t) x4x5x6x7); ++ vst1q_u8(32 + (uint8_t *) input,(uint8x16_t) x8x9x10x11); ++ vst1q_u8(48 + (uint8_t *) input,(uint8x16_t) x12x13x14x15); ++} +diff --git a/lib/crypto/crypto_scrypt-neon.c b/lib/crypto/crypto_scrypt-neon.c +new file mode 100644 +index 0000000..a3bf052 +--- /dev/null ++++ b/lib/crypto/crypto_scrypt-neon.c +@@ -0,0 +1,304 @@ ++/*- ++ * Copyright 2009 Colin Percival ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ++ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE ++ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ * SUCH DAMAGE. ++ * ++ * This file was originally written by Colin Percival as part of the Tarsnap ++ * online backup system. ++ */ ++#include "scrypt_platform.h" ++ ++#include ++ ++#include ++#include ++#include ++#include ++#include ++ ++#ifdef USE_OPENSSL_PBKDF2 ++#include ++#else ++#include "sha256.h" ++#endif ++#include "sysendian.h" ++ ++#include "crypto_scrypt.h" ++ ++#include "crypto_scrypt-neon-salsa208.h" ++ ++static void blkcpy(void *, void *, size_t); ++static void blkxor(void *, void *, size_t); ++void crypto_core_salsa208_armneon2(void *); ++static void blockmix_salsa8(uint8x16_t *, uint8x16_t *, uint8x16_t *, size_t); ++static uint64_t integerify(void *, size_t); ++static void smix(uint8_t *, size_t, uint64_t, void *, void *); ++ ++static void ++blkcpy(void * dest, void * src, size_t len) ++{ ++ uint8x16_t * D = dest; ++ uint8x16_t * S = src; ++ size_t L = len / 16; ++ size_t i; ++ ++ for (i = 0; i < L; i++) ++ D[i] = S[i]; ++} ++ ++static void ++blkxor(void * dest, void * src, size_t len) ++{ ++ uint8x16_t * D = dest; ++ uint8x16_t * S = src; ++ size_t L = len / 16; ++ size_t i; ++ ++ for (i = 0; i < L; i++) ++ D[i] = veorq_u8(D[i], S[i]); ++} ++ ++/** ++ * blockmix_salsa8(B, Y, r): ++ * Compute B = BlockMix_{salsa20/8, r}(B). The input B must be 128r bytes in ++ * length; the temporary space Y must also be the same size. ++ */ ++static void ++blockmix_salsa8(uint8x16_t * Bin, uint8x16_t * Bout, uint8x16_t * X, size_t r) ++{ ++ size_t i; ++ ++ /* 1: X <-- B_{2r - 1} */ ++ blkcpy(X, &Bin[8 * r - 4], 64); ++ ++ /* 2: for i = 0 to 2r - 1 do */ ++ for (i = 0; i < r; i++) { ++ /* 3: X <-- H(X \xor B_i) */ ++ blkxor(X, &Bin[i * 8], 64); ++ salsa20_8_intrinsic((void *) X); ++ ++ /* 4: Y_i <-- X */ ++ /* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */ ++ blkcpy(&Bout[i * 4], X, 64); ++ ++ /* 3: X <-- H(X \xor B_i) */ ++ blkxor(X, &Bin[i * 8 + 4], 64); ++ salsa20_8_intrinsic((void *) X); ++ ++ /* 4: Y_i <-- X */ ++ /* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */ ++ blkcpy(&Bout[(r + i) * 4], X, 64); ++ } ++} ++ ++/** ++ * integerify(B, r): ++ * Return the result of parsing B_{2r-1} as a little-endian integer. ++ */ ++static uint64_t ++integerify(void * B, size_t r) ++{ ++ uint8_t * X = (void*)((uintptr_t)(B) + (2 * r - 1) * 64); ++ ++ return (le64dec(X)); ++} ++ ++/** ++ * smix(B, r, N, V, XY): ++ * Compute B = SMix_r(B, N). The input B must be 128r bytes in length; the ++ * temporary storage V must be 128rN bytes in length; the temporary storage ++ * XY must be 256r bytes in length. The value N must be a power of 2. ++ */ ++static void ++smix(uint8_t * B, size_t r, uint64_t N, void * V, void * XY) ++{ ++ uint8x16_t * X = XY; ++ uint8x16_t * Y = (void *)((uintptr_t)(XY) + 128 * r); ++ uint8x16_t * Z = (void *)((uintptr_t)(XY) + 256 * r); ++ uint32_t * X32 = (void *)X; ++ uint64_t i, j; ++ size_t k; ++ ++ /* 1: X <-- B */ ++ blkcpy(X, B, 128 * r); ++ ++ /* 2: for i = 0 to N - 1 do */ ++ for (i = 0; i < N; i += 2) { ++ /* 3: V_i <-- X */ ++ blkcpy((void *)((uintptr_t)(V) + i * 128 * r), X, 128 * r); ++ ++ /* 4: X <-- H(X) */ ++ blockmix_salsa8(X, Y, Z, r); ++ ++ /* 3: V_i <-- X */ ++ blkcpy((void *)((uintptr_t)(V) + (i + 1) * 128 * r), ++ Y, 128 * r); ++ ++ /* 4: X <-- H(X) */ ++ blockmix_salsa8(Y, X, Z, r); ++ } ++ ++ /* 6: for i = 0 to N - 1 do */ ++ for (i = 0; i < N; i += 2) { ++ /* 7: j <-- Integerify(X) mod N */ ++ j = integerify(X, r) & (N - 1); ++ ++ /* 8: X <-- H(X \xor V_j) */ ++ blkxor(X, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r); ++ blockmix_salsa8(X, Y, Z, r); ++ ++ /* 7: j <-- Integerify(X) mod N */ ++ j = integerify(Y, r) & (N - 1); ++ ++ /* 8: X <-- H(X \xor V_j) */ ++ blkxor(Y, (void *)((uintptr_t)(V) + j * 128 * r), 128 * r); ++ blockmix_salsa8(Y, X, Z, r); ++ } ++ ++ /* 10: B' <-- X */ ++ blkcpy(B, X, 128 * r); ++} ++ ++/** ++ * crypto_scrypt(passwd, passwdlen, salt, saltlen, N, r, p, buf, buflen): ++ * Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r, ++ * p, buflen) and write the result into buf. The parameters r, p, and buflen ++ * must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N ++ * must be a power of 2. ++ * ++ * Return 0 on success; or -1 on error. ++ */ ++int ++crypto_scrypt(const uint8_t * passwd, size_t passwdlen, ++ const uint8_t * salt, size_t saltlen, uint64_t N, uint32_t r, uint32_t p, ++ uint8_t * buf, size_t buflen) ++{ ++ void * B0, * V0, * XY0; ++ uint8_t * B; ++ uint32_t * V; ++ uint32_t * XY; ++ uint32_t i; ++ ++ /* Sanity-check parameters. */ ++#if SIZE_MAX > UINT32_MAX ++ if (buflen > (((uint64_t)(1) << 32) - 1) * 32) { ++ errno = EFBIG; ++ goto err0; ++ } ++#endif ++ if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) { ++ errno = EFBIG; ++ goto err0; ++ } ++ if (((N & (N - 1)) != 0) || (N == 0)) { ++ errno = EINVAL; ++ goto err0; ++ } ++ if ((r > SIZE_MAX / 128 / p) || ++#if SIZE_MAX / 256 <= UINT32_MAX ++ (r > SIZE_MAX / 256) || ++#endif ++ (N > SIZE_MAX / 128 / r)) { ++ errno = ENOMEM; ++ goto err0; ++ } ++ ++ /* Allocate memory. */ ++#ifdef HAVE_POSIX_MEMALIGN ++ if ((errno = posix_memalign(&B0, 64, 128 * r * p)) != 0) ++ goto err0; ++ B = (uint8_t *)(B0); ++ if ((errno = posix_memalign(&XY0, 64, 256 * r + 64)) != 0) ++ goto err1; ++ XY = (uint32_t *)(XY0); ++#ifndef MAP_ANON ++ if ((errno = posix_memalign(&V0, 64, 128 * r * N)) != 0) ++ goto err2; ++ V = (uint32_t *)(V0); ++#endif ++#else ++ if ((B0 = malloc(128 * r * p + 63)) == NULL) ++ goto err0; ++ B = (uint8_t *)(((uintptr_t)(B0) + 63) & ~ (uintptr_t)(63)); ++ if ((XY0 = malloc(256 * r + 64 + 63)) == NULL) ++ goto err1; ++ XY = (uint32_t *)(((uintptr_t)(XY0) + 63) & ~ (uintptr_t)(63)); ++#ifndef MAP_ANON ++ if ((V0 = malloc(128 * r * N + 63)) == NULL) ++ goto err2; ++ V = (uint32_t *)(((uintptr_t)(V0) + 63) & ~ (uintptr_t)(63)); ++#endif ++#endif ++#ifdef MAP_ANON ++ if ((V0 = mmap(NULL, 128 * r * N, PROT_READ | PROT_WRITE, ++#ifdef MAP_NOCORE ++ MAP_ANON | MAP_PRIVATE | MAP_NOCORE, ++#else ++ MAP_ANON | MAP_PRIVATE, ++#endif ++ -1, 0)) == MAP_FAILED) ++ goto err2; ++ V = (uint32_t *)(V0); ++#endif ++ ++ /* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */ ++#ifdef USE_OPENSSL_PBKDF2 ++ PKCS5_PBKDF2_HMAC((const char *)passwd, passwdlen, salt, saltlen, 1, EVP_sha256(), p * 128 * r, B); ++#else ++ PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, p * 128 * r); ++#endif ++ ++ /* 2: for i = 0 to p - 1 do */ ++ for (i = 0; i < p; i++) { ++ /* 3: B_i <-- MF(B_i, N) */ ++ smix(&B[i * 128 * r], r, N, V, XY); ++ } ++ ++ /* 5: DK <-- PBKDF2(P, B, 1, dkLen) */ ++#ifdef USE_OPENSSL_PBKDF2 ++ PKCS5_PBKDF2_HMAC((const char *)passwd, passwdlen, B, p * 128 * r, 1, EVP_sha256(), buflen, buf); ++#else ++ PBKDF2_SHA256(passwd, passwdlen, B, p * 128 * r, 1, buf, buflen); ++#endif ++ ++ /* Free memory. */ ++#ifdef MAP_ANON ++ if (munmap(V0, 128 * r * N)) ++ goto err2; ++#else ++ free(V0); ++#endif ++ free(XY0); ++ free(B0); ++ ++ /* Success! */ ++ return (0); ++ ++err2: ++ free(XY0); ++err1: ++ free(B0); ++err0: ++ /* Failure! */ ++ return (-1); ++} diff --git a/scrypt.config b/scrypt.config index 3ccb4d0..bcb158d 100644 --- a/scrypt.config +++ b/scrypt.config @@ -81,14 +81,15 @@ lib/crypto/crypto_scrypt-ref.c \ SCRYPT_PATCHES="\ use_openssl_pbkdf2.patch \ -arm-neon.patch \ +arm_neon.patch \ " SCRYPT_PATCHES_use_openssl_pbkdf2_SOURCES="\ lib/crypto/crypto_scrypt-ref.c \ +lib/crypto/crypto_scrypt-sse.c \ " -SCRYPT_PATCHES_bionic_SOURCES="\ -lib/crypto/crypto_scrypt-neon.c \ +SCRYPT_PATCHES_arm_neon_SOURCES="\ lib/crypto/crypto_scrypt-neon-salsa208.h \ +lib/crypto/crypto_scrypt-neon.c \ " -- cgit v1.2.3 From ee1d014f108d3578425ce594c636be211c50ecfb Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 31 Aug 2017 15:38:01 +0800 Subject: Convert Android.mk to Android.bp This commit converts Android.mk, android-config.mk, Scrypt.mk, and Scrypt-config.mk files to an Android.bp file. If BOARD_VNDK_VERSION is set to current, vendor modules won't be allowed to link libscrypt_static. To make libscrypt_static available to vendor modules, we have to set vendor_available to true. However, vendor_available is an Android.bp feature, thus we have to convert Android.mk to Android.bp first. Bug: 65425184 Test: mm -j8 && adb sync && adb shell /data/nativetest/scrypt_test/scrypt_test Test: mm -j8 && adb sync && \ adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: I8e901b0b1bec172d5e57f529ca76eae1c57def6a --- Android.bp | 32 +++++++ Android.mk | 13 --- Scrypt-config.mk | 105 ---------------------- Scrypt.mk | 46 ---------- android-config.mk | 16 ---- build-config.mk | 6 -- import_scrypt.sh | 262 ++++++++++++++++++++++++------------------------------ scrypt.config | 10 ++- sources.bp | 70 +++++++++++++++ tests/Android.mk | 23 ----- 10 files changed, 227 insertions(+), 356 deletions(-) create mode 100644 Android.bp delete mode 100644 Android.mk delete mode 100644 Scrypt-config.mk delete mode 100644 Scrypt.mk delete mode 100644 android-config.mk delete mode 100644 build-config.mk create mode 100644 sources.bp delete mode 100644 tests/Android.mk diff --git a/Android.bp b/Android.bp new file mode 100644 index 0000000..f3aa4d0 --- /dev/null +++ b/Android.bp @@ -0,0 +1,32 @@ +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +build = ["sources.bp"] + +cc_library_static { + name: "libscrypt_static", + defaults: ["libscrypt_sources"], + shared_libs: ["libcrypto"], + sdk_version: "9", + host_supported: true, +} + +cc_test { + name: "scrypt_test", + srcs: ["tests/scrypt_test.cpp"], + shared_libs: ["libcrypto"], + static_libs: ["libscrypt_static"], +} diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 4514f94..0000000 --- a/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# Enable to be able to use ALOG* with #include "cutils/log.h" -#log_c_includes += system/core/include -#log_shared_libraries := liblog - -# These makefiles are here instead of being Android.mk files in the -# respective crypto, ssl, and apps directories so -# that import_openssl.sh import won't remove them. -include $(LOCAL_PATH)/build-config.mk -include $(LOCAL_PATH)/Scrypt.mk - -include $(LOCAL_PATH)/tests/Android.mk diff --git a/Scrypt-config.mk b/Scrypt-config.mk deleted file mode 100644 index bbe1063..0000000 --- a/Scrypt-config.mk +++ /dev/null @@ -1,105 +0,0 @@ -# Auto-generated - DO NOT EDIT! -# To regenerate, edit scrypt.config, then run: -# ./import_scrypt.sh import /path/to/scrypt-1.1.6.tar.gz -# -# Before including this file, the local Android.mk must define the following -# variables: -# -# local_c_flags -# local_c_includes -# local_additional_dependencies -# -# This script will define the following variables: -# -# target_c_flags -# target_c_includes -# target_src_files -# -# host_c_flags -# host_c_includes -# host_src_files -# - -# Ensure these are empty. -unknown_arch_c_flags := -unknown_arch_src_files := -unknown_arch_exclude_files := - - -common_c_flags := - -common_src_files := \ - lib/crypto/crypto_scrypt-ref.c \ - -common_c_includes := \ - lib/crypto \ - lib/util \ - -arm_c_flags := - -arm_src_files := - -arm_exclude_files := - -arm_neon_c_flags := - -arm_neon_src_files := \ - lib/crypto/crypto_scrypt-neon.c \ - -arm_neon_exclude_files := \ - lib/crypto/crypto_scrypt-ref.c \ - -x86_c_flags := - -x86_src_files := \ - lib/crypto/crypto_scrypt-sse.c \ - -x86_exclude_files := \ - lib/crypto/crypto_scrypt-ref.c \ - -x86_64_c_flags := - -x86_64_src_files := \ - lib/crypto/crypto_scrypt-sse.c \ - -x86_64_exclude_files := \ - lib/crypto/crypto_scrypt-ref.c \ - -mips_c_flags := - -mips_src_files := - -mips_exclude_files := - -target_arch := $(TARGET_ARCH) -ifeq ($(target_arch)-$(TARGET_HAS_BIGENDIAN),mips-true) -target_arch := unknown_arch -endif - -target_c_flags := $(common_c_flags) $($(target_arch)_c_flags) $(local_c_flags) -target_c_includes := $(addprefix external/scrypt/,$(common_c_includes)) $(local_c_includes) -target_src_files := $(common_src_files) $($(target_arch)_src_files) -target_src_files := $(filter-out $($(target_arch)_exclude_files), $(target_src_files)) - -# Hacks for ARM NEON support -ifeq ($(target_arch),arm) -ifeq ($(ARCH_ARM_HAVE_NEON),true) -target_c_flags += $(arm_neon_c_flags) -target_src_files += $(arm_neon_src_files) -target_src_files := $(filter-out $(arm_neon_exclude_files), $(target_src_files)) -endif -endif - -ifeq ($(HOST_OS)-$(HOST_ARCH),linux-x86) -host_arch := x86 -else -host_arch := unknown_arch -endif - -host_c_flags := $(common_c_flags) $($(host_arch)_c_flags) $(local_c_flags) -host_c_includes := $(addprefix external/scrypt/,$(common_c_includes)) $(local_c_includes) -host_src_files := $(common_src_files) $($(host_arch)_src_files) -host_src_files := $(filter-out $($(host_arch)_exclude_files), $(host_src_files)) - -local_additional_dependencies += $(LOCAL_PATH)/Scrypt-config.mk - diff --git a/Scrypt.mk b/Scrypt.mk deleted file mode 100644 index 3fca7aa..0000000 --- a/Scrypt.mk +++ /dev/null @@ -1,46 +0,0 @@ -local_c_flags := -DUSE_OPENSSL_PBKDF2 - -local_c_includes := $(log_c_includes) - -local_additional_dependencies := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Scrypt.mk - -include $(LOCAL_PATH)/Scrypt-config.mk - -####################################### -# target static library -include $(CLEAR_VARS) -include $(LOCAL_PATH)/android-config.mk - -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto - -# If we're building an unbundled build, don't try to use clang since it's not -# in the NDK yet. This can be removed when a clang version that is fast enough -# in the NDK. -ifeq (,$(TARGET_BUILD_APPS)) -LOCAL_CLANG := true -else -LOCAL_SDK_VERSION := 9 -endif - -LOCAL_SRC_FILES += $(target_src_files) -LOCAL_CFLAGS += $(target_c_flags) -LOCAL_C_INCLUDES += $(target_c_includes) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= libscrypt_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) -include $(BUILD_STATIC_LIBRARY) - -######################################## -# host static library - -include $(CLEAR_VARS) -include $(LOCAL_PATH)/android-config.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto -LOCAL_SRC_FILES += $(host_src_files) -LOCAL_CFLAGS += $(host_c_flags) -LOCAL_C_INCLUDES += $(host_c_includes) -LOCAL_LDLIBS += -ldl -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= libscrypt_static -LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) -include $(BUILD_HOST_STATIC_LIBRARY) diff --git a/android-config.mk b/android-config.mk deleted file mode 100644 index 326e113..0000000 --- a/android-config.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -# These flags represent the build-time configuration of scrypt for Android -# -# The value of $(scrypt_cflags) was pruned from the Makefile generated -# by running ./configure from import_scrypt.sh. -# -# This script performs minor but required patching for the Android build. -# - -LOCAL_CFLAGS += $(scrypt_cflags) - -# Add in flags to let config.h be read properly -LOCAL_CFLAGS += "-DHAVE_CONFIG_H" - -# Add clang here when it works on host -# LOCAL_CLANG := true diff --git a/build-config.mk b/build-config.mk deleted file mode 100644 index 3d2ab91..0000000 --- a/build-config.mk +++ /dev/null @@ -1,6 +0,0 @@ -# Auto-generated - DO NOT EDIT! -# To regenerate, edit scrypt.config, then run: -# ./import_scrypt.sh import /path/to/scrypt-1.1.6.tar.gz -# -scrypt_cflags := \ - diff --git a/import_scrypt.sh b/import_scrypt.sh index d85d763..0aa5168 100755 --- a/import_scrypt.sh +++ b/import_scrypt.sh @@ -166,37 +166,15 @@ function filter_by_egrep() { # $1: space-separated list # Out: new space-separated list function uniq_sort () { - echo "$@" | tr ' ' '\n' | sort -u | tr '\n' ' ' + echo "$@" | tr ' ' '\n' | sort -u | tr '\n' ' ' | \ + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' } function print_autogenerated_header() { - echo "# Auto-generated - DO NOT EDIT!" - echo "# To regenerate, edit scrypt.config, then run:" - echo "# ./import_scrypt.sh import /path/to/scrypt-$SCRYPT_VERSION.tar.gz" - echo "#" -} - -function generate_build_config_mk() { - ./configure $CONFIGURE_ARGS - #rm -f apps/CA.pl.bak crypto/scryptconf.h.bak - - declare -r tmpfile=$(mktemp) - (grep -e -D Makefile | grep -v CONFIGURE_ARGS= | grep -v OPTIONS=) > $tmpfile - - declare -r cflags=$(filter_by_egrep "^-D" $(grep -e "^CFLAG=" $tmpfile)) - declare -r depflags=$(filter_by_egrep "^-D" $(grep -e "^DEPFLAG=" $tmpfile)) - rm -f $tmpfile - - echo "Generating $(basename $1)" - ( - print_autogenerated_header - - echo "scrypt_cflags := \\" - for cflag in $cflags $depflags; do - echo " $cflag \\" - done - echo "" - ) > $1 + echo "// Auto-generated - DO NOT EDIT!" + echo "// To regenerate, edit scrypt.config, then run:" + echo "// ./import_scrypt.sh import /path/to/scrypt-$SCRYPT_VERSION.tar.gz" + echo "//" } # Return the value of a computed variable name. @@ -219,134 +197,130 @@ var_sorted_value() { uniq_sort $(var_value $1) } -# Print the definition of a given variable in a GNU Make build file. -# $1: Variable name (e.g. common_src_files) -# $2+: Variable value (e.g. list of sources) -print_vardef_in_mk() { - declare -r varname=$1 +# $1: Property name +# $2: Indent +# $3: Values +print_list_in_bp() { + declare -r indent="$1" shift - if [ -z "$1" ]; then - echo "$varname :=" - else - echo "$varname := \\" - for src; do - echo " $src \\" - done - fi - echo "" -} - -# Same as print_vardef_in_mk, but print a CFLAGS definition from -# a list of compiler defines. -# $1: Variable name (e.g. common_c_flags) -# $2: List of defines (e.g. SCRYPT_NO_DONKEYS ...) -print_defines_in_mk() { - declare -r varname=$1 + declare -r name="$1" shift - if [ -z "$1" ]; then - echo "$varname :=" - else - echo "$varname := \\" - for def; do - echo " -D$def \\" + + if [ -n "$*" ]; then + echo "${indent}${name}: [" + for value in "$@"; do + echo "${indent} \"${value}\"," done + echo "${indent}]," fi - echo "" } -# Generate a configuration file like Scrypt-config.mk -# This uses variable definitions from scrypt.config to build a config -# file that can compute the list of target- and host-specific sources / -# compiler flags for a given component. -# -# $1: Target file name. (e.g. Scrypt-config.mk) -function generate_config_mk() { - declare -r output="$1" - declare -r all_archs="arm arm_neon x86 x86_64 mips" +# Print an architecture-specific section +# $1: Arch +# $2: Arch variant +print_arch_section_in_bp() { + declare -r arch="$1" + declare -r variant="$2" - echo "Generating $(basename $output)" - ( - print_autogenerated_header - echo \ -"# Before including this file, the local Android.mk must define the following -# variables: -# -# local_c_flags -# local_c_includes -# local_additional_dependencies -# -# This script will define the following variables: -# -# target_c_flags -# target_c_includes -# target_src_files -# -# host_c_flags -# host_c_includes -# host_src_files -# + declare -r srcs="$(var_sorted_value SCRYPT_SOURCES_${arch})" + declare -r exclude_srcs="$(var_sorted_value SCRYPT_SOURCES_EXCLUDES_${arch})" -# Ensure these are empty. -unknown_arch_c_flags := -unknown_arch_src_files := -unknown_arch_exclude_files := + declare -r srcs_variant="$(var_sorted_value SCRYPT_SOURCES_${arch}_${variant})" + declare -r exclude_srcs_variant="$(var_sorted_value SCRYPT_SOURCES_EXCLUDES_${arch}_${variant})" -" - common_defines=$(var_sorted_value SCRYPT_DEFINES) - print_defines_in_mk common_c_flags $common_defines + if [ -n "${srcs}${exclude_srcs}${srcs_variant}${exclude_srcs_variant}" ]; then + echo " ${arch}: {" - common_sources=$(var_sorted_value SCRYPT_SOURCES) - print_vardef_in_mk common_src_files $common_sources + print_list_in_bp " " "srcs" ${srcs} + print_list_in_bp " " "exclude_srcs" ${exclude_srcs} - common_includes=$(var_sorted_value SCRYPT_INCLUDES) - print_vardef_in_mk common_c_includes $common_includes + if [ -n "${src_variant}${exclude_srcs_variant}" ]; then + echo " ${variant}: {" + print_list_in_bp " " "srcs" ${srcs_variant} + print_list_in_bp " " "exclude_srcs" ${exclude_srcs_variant} + echo " }," + fi - for arch in $all_archs; do - arch_defines=$(var_sorted_value SCRYPT_DEFINES_${arch}) - print_defines_in_mk ${arch}_c_flags $arch_defines + echo " }," + fi +} - arch_sources=$(var_sorted_value SCRYPT_SOURCES_${arch}) - print_vardef_in_mk ${arch}_src_files $arch_sources +# Generate sources.bp from scrypt.config +# +# $1: Target file name. (e.g. sources.bp) +function generate_android_bp() { + declare -r output="$1" - arch_exclude_sources=$(var_sorted_value SCRYPT_SOURCES_EXCLUDES_${arch}) - print_vardef_in_mk ${arch}_exclude_files $arch_exclude_sources + # Extract cflags from upstream `./configure` script + cd $SCRYPT_DIR - done + ./configure $CONFIGURE_ARGS + + declare -r tmpfile=$(mktemp) + (grep -e -D Makefile | grep -v CONFIGURE_ARGS= | grep -v OPTIONS=) > $tmpfile + + declare -r ac_cflags=$(filter_by_egrep "^-D" $(grep -e "^CFLAG=" $tmpfile)) + declare -r ac_depflags=$(filter_by_egrep "^-D" $(grep -e "^DEPFLAG=" $tmpfile)) + rm -f $tmpfile - echo "\ -target_arch := \$(TARGET_ARCH) -ifeq (\$(target_arch)-\$(TARGET_HAS_BIGENDIAN),mips-true) -target_arch := unknown_arch -endif - -target_c_flags := \$(common_c_flags) \$(\$(target_arch)_c_flags) \$(local_c_flags) -target_c_includes := \$(addprefix external/scrypt/,\$(common_c_includes)) \$(local_c_includes) -target_src_files := \$(common_src_files) \$(\$(target_arch)_src_files) -target_src_files := \$(filter-out \$(\$(target_arch)_exclude_files), \$(target_src_files)) - -# Hacks for ARM NEON support -ifeq (\$(target_arch),arm) -ifeq (\$(ARCH_ARM_HAVE_NEON),true) -target_c_flags += \$(arm_neon_c_flags) -target_src_files += \$(arm_neon_src_files) -target_src_files := \$(filter-out \$(arm_neon_exclude_files), \$(target_src_files)) -endif -endif - -ifeq (\$(HOST_OS)-\$(HOST_ARCH),linux-x86) -host_arch := x86 -else -host_arch := unknown_arch -endif - -host_c_flags := \$(common_c_flags) \$(\$(host_arch)_c_flags) \$(local_c_flags) -host_c_includes := \$(addprefix external/scrypt/,\$(common_c_includes)) \$(local_c_includes) -host_src_files := \$(common_src_files) \$(\$(host_arch)_src_files) -host_src_files := \$(filter-out \$(\$(host_arch)_exclude_files), \$(host_src_files)) - -local_additional_dependencies += \$(LOCAL_PATH)/$(basename $output) -" + cd .. + # Generate sources.bp + echo "Generating $(basename $output)" + ( + print_autogenerated_header + + cat <<__EOF__ + +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_defaults { + name: "libscrypt_sources", + +__EOF__ + + print_list_in_bp " " "cflags" \ + $(var_sorted_value SCRYPT_CFLAGS) ${ac_cflags} ${ac_depflags} + echo + + print_list_in_bp " " "export_include_dirs" \ + $(var_sorted_value SCRYPT_EXPORT_C_INCLUDE_DIRS) + echo + + print_list_in_bp " " "local_include_dirs" \ + $(var_sorted_value SCRYPT_INCLUDES) + echo + + print_list_in_bp " " "srcs" $(var_sorted_value SCRYPT_SOURCES) + echo + + echo " arch: {" + + print_arch_section_in_bp "arm" "neon" + print_arch_section_in_bp "arm64" + print_arch_section_in_bp "x86" + print_arch_section_in_bp "x86_64" + print_arch_section_in_bp "mips" + print_arch_section_in_bp "mips64" + + cat <<__EOF__ + }, +} +__EOF__ ) > "$output" } @@ -356,15 +330,11 @@ function import() { untar $SCRYPT_SOURCE readonly applypatches $SCRYPT_DIR - cd $SCRYPT_DIR - - generate_build_config_mk ../build-config.mk - - touch ../MODULE_LICENSE_BSD_LIKE + cd $SCRYPT_DIR/.. - cd .. + touch MODULE_LICENSE_BSD_LIKE - generate_config_mk Scrypt-config.mk + generate_android_bp "sources.bp" # Prune unnecessary sources prune diff --git a/scrypt.config b/scrypt.config index bcb158d..8099182 100644 --- a/scrypt.config +++ b/scrypt.config @@ -34,8 +34,16 @@ lib \ scrypt_platform.h \ " -SCRYPT_INCLUDES="\ +SCRYPT_CFLAGS="\ +-DHAVE_CONFIG_H \ +-DUSE_OPENSSL_PBKDF2 \ +" + +SCRYPT_EXPORT_C_INCLUDE_DIRS="\ lib/crypto \ +" + +SCRYPT_INCLUDES="\ lib/util \ " diff --git a/sources.bp b/sources.bp new file mode 100644 index 0000000..39216b1 --- /dev/null +++ b/sources.bp @@ -0,0 +1,70 @@ +// Auto-generated - DO NOT EDIT! +// To regenerate, edit scrypt.config, then run: +// ./import_scrypt.sh import /path/to/scrypt-1.1.6.tar.gz +// + +// +// Copyright (C) 2017 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +cc_defaults { + name: "libscrypt_sources", + + cflags: [ + "-DHAVE_CONFIG_H", + "-DUSE_OPENSSL_PBKDF2", + ], + + export_include_dirs: [ + "lib/crypto", + ], + + local_include_dirs: [ + "lib/util", + ], + + srcs: [ + "lib/crypto/crypto_scrypt-ref.c", + ], + + arch: { + arm: { + neon: { + srcs: [ + "lib/crypto/crypto_scrypt-neon.c", + ], + exclude_srcs: [ + "lib/crypto/crypto_scrypt-ref.c", + ], + }, + }, + x86: { + srcs: [ + "lib/crypto/crypto_scrypt-sse.c", + ], + exclude_srcs: [ + "lib/crypto/crypto_scrypt-ref.c", + ], + }, + x86_64: { + srcs: [ + "lib/crypto/crypto_scrypt-sse.c", + ], + exclude_srcs: [ + "lib/crypto/crypto_scrypt-ref.c", + ], + }, + }, +} diff --git a/tests/Android.mk b/tests/Android.mk deleted file mode 100644 index cfec2d6..0000000 --- a/tests/Android.mk +++ /dev/null @@ -1,23 +0,0 @@ -# Build the scrypt unit tests - -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - -LOCAL_CLANG := true - -LOCAL_SRC_FILES:= \ - scrypt_test.cpp - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../lib/crypto - -LOCAL_SHARED_LIBRARIES := \ - libcrypto - -LOCAL_STATIC_LIBRARIES := \ - libscrypt_static \ - -LOCAL_MODULE := scrypt_test - -include $(BUILD_NATIVE_TEST) -- cgit v1.2.3 From 430d10a7f45ce03e332bca49f653cc24248791f4 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 31 Aug 2017 21:21:35 +0800 Subject: Mark libscrypt_static as vendor_available This commit marks libscrypt_static as vendor_available so that vendor modules can depend on libscrypt_static. Bug: 65425184 Test: BOARD_VNDK_VERSION=current mm -j8 Change-Id: I06bcc80cb71c60d75bf15873632042e72bf3f57c --- Android.bp | 1 + 1 file changed, 1 insertion(+) diff --git a/Android.bp b/Android.bp index f3aa4d0..ef9b8a0 100644 --- a/Android.bp +++ b/Android.bp @@ -22,6 +22,7 @@ cc_library_static { shared_libs: ["libcrypto"], sdk_version: "9", host_supported: true, + vendor_available: true, } cc_test { -- cgit v1.2.3 From 8db5d07cefdae3008e19ee3fdf63b7a10d14dbff Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Thu, 31 Aug 2017 21:48:38 +0800 Subject: Enable arm64 neon scrypt implementation It seems that old Scrypt-config.mk is unaware of arm64 architecture. In fact, crypto_scrypt-neon.c can be compiled into arm64 as well. This CL adds an arch section for arm64. Bug: 65425184 Test: adb shell /data/nativetest64/scrypt_test/scrypt_test Change-Id: If40a30378b8038324aad44071107130d7722e28d --- scrypt.config | 8 ++++++++ sources.bp | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/scrypt.config b/scrypt.config index 8099182..f00a3f6 100644 --- a/scrypt.config +++ b/scrypt.config @@ -65,6 +65,14 @@ SCRYPT_SOURCES_EXCLUDES_arm_neon="\ lib/crypto/crypto_scrypt-ref.c \ " +SCRYPT_SOURCES_arm64="\ +lib/crypto/crypto_scrypt-neon.c \ +" + +SCRYPT_SOURCES_EXCLUDES_arm64="\ +lib/crypto/crypto_scrypt-ref.c \ +" + SCRYPT_SOURCES_mips="\ " diff --git a/sources.bp b/sources.bp index 39216b1..a2ba3f4 100644 --- a/sources.bp +++ b/sources.bp @@ -50,6 +50,14 @@ cc_defaults { ], }, }, + arm64: { + srcs: [ + "lib/crypto/crypto_scrypt-neon.c", + ], + exclude_srcs: [ + "lib/crypto/crypto_scrypt-ref.c", + ], + }, x86: { srcs: [ "lib/crypto/crypto_scrypt-sse.c", -- cgit v1.2.3