commit 629ed239a9d27f2b58697ef48d7a12c81e5d74cf
author Logan Chien <loganchien@google.com> Thu Aug 31 19:15:50 2017 +0800
committer Logan Chien <loganchien@google.com> Tue Sep 12 14:34:44 2017 +0800
tree 114f68e6444a78a0cb4dd6f432593a538210e59b
parent 581021037c04fb2cd8dcbfd643cd9b9545f6a2b2

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