summaryrefslogtreecommitdiffstats
path: root/crypto/scrypt (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Switch between dependencies and modulesEthan Yonker2019-05-241-2/+10
| | | | | | | Use LOCAL_REQUIRED_MODULES for Pie and up and LOCAL_ADDITIONAL_DEPENDENCIES for Oreo and down. Change-Id: I5365e782f98f3bbf4bf246be22c8f573824b65ee
* Merge AOSP android-9.0.0_r3Ethan Yonker2018-08-241-2/+0
| | | | | | Fix conflicts and make it build in 5.1, 6.0, 7.1, 8.1, and 9.0 Change-Id: Ida0a64c29ff27d339b7f42a18d820930964ac6e4
* Enable arm64 neon scrypt implementationLogan Chien2018-05-251-1/+1
| | | | | | | | | | | 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: Ib451de642c7cc4548bfdc0879781981654b21b8f Merged-In: If40a30378b8038324aad44071107130d7722e28d
* external/scrypt: use proper nativehelper headersSteven Moreland2018-04-221-1/+1
| | | | | | | | | | libnativeheader exports headers under nativeheader. These were available before incorrectly as global headers in order to give access to jni.h. Test: modules using external/scrypt find headers Bug: 63762847 Change-Id: I9baf896015a1920f8a26daa2a0c549169628890f
* scrypt doesn't need <machine/cpu-features.h>.Elliott Hughes2018-04-222-3/+1
| | | | | Bug: http://b/18556103 Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
* scrypt: Don't hardcode gtest path.Dan Albert2018-04-221-3/+1
| | | | | Bug: http://b/16574165 Change-Id: Ieb63fb6a73f0fb2ab3260bc5eabca7d86d892fbd
* Merge up to AOSP marshmallow-releaseEthan Yonker2015-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to maintain compatibility with older trees, we now have minadbd.old and minui.old. I had to use a TARGET_GLOBAL_CFLAG to handle ifdef issues in minui/minui.d because healthd includes minui/minui.h and there was no other alternative to make minui.h compatible with older trees without having to modify healthd rules which is outside of TWRP. Note that the new minui does not currently have support for qcom overlay graphics. Support for this graphics mode will likely be added in a later patch set. If you are building in a 6.0 tree and have a device that needs qcom overlay graphics, be warned, as off mode charging may not work properly. A dead battery in this case could potentially brick your device if it is unable to charge as healthd handles charging duties. Update rules for building toolbox and add rules for making toybox Use permissive.sh in init.rc which will follow symlinks so we do not have to worry about what binary is supplying the setenforce functionality (toolbox, toybox, or busybox). Fix a few warnings in the main recovery binary source code. Fix a few includes that were missing that prevented compiling in 6.0 Change-Id: Ia67aa2107d260883da5e365475a19bea538e8b97
* Fix include paths in cryptoEthan Yonker2014-12-181-2/+2
| | | | Change-Id: Ia9fd0cd75bd6ee6e14909890cb18a8edb3b22267
* Fixes for compiling crypto in older treesDees Troy2014-12-122-1/+2
| | | | | | | | | | | | | Some of these fixes needed to be made anyway. Note that older trees will still need to have files / repos copied into them from newer trees. Namely we need: system/security/softkeymaster hardware/libhardware/include/hardware/keymaster.h Maybe others as I did not document very carefully what I was pulling in. Change-Id: I465fd1fbe228803ec02fba047b151f07ea13d5ca
* Reduce libs needed for decrypt and clean up old decypt filesEthan Yonker2014-12-044-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | Trim cryptfs.c to remove functions that TWRP does not use for decrypt and remove the need for libfs_mgr from cryptfs.c by passing some items to cryptfs.c from the partition manager. Add support for new fstab flags: encryptable and forceencrypt=/path/to/cryptokey For example: flags=forceencrypt=/dev/block/platform/sdhci-tegra.3/by-name/MD1 Note that "footer" is the default, so you do not need to set this flag on devices that use the footer for the crypto key. Also add mounttodecrypt if you need to mount a partition during the decrypt cycle for firmware of proprietary libs. Clean up decrypt and only support one version Android 5.0 lollipop decrypt should be backwards compatible with older versions so we will only support one version, 1.3 that came with 5.0 lollipop. Remove support for Samsung TouchWiz decrypt. It does not work with the latest versions of Samsung encryption anyway and it has not been updated to work with any AOSP decryption higher than 1.1 Change-Id: I2d9c6e31df50268c91ee642c2fa090f901d9d5c9
* Fix potential tree conflicts with scryptEthan Yonker2014-11-082-2/+2
| | | | Change-Id: Iac40957e40cb9c10795dd6a1f67ca902c95dd9bc
* Recovery: Fix my-dir must be called before including any other makefileRob2014-11-061-2/+1
| | | | Change-Id: I70c867961ae779bd99839e4ce7cb1dc8d154158f
* Remove dependence on build hax in makefilesMatt Mower2014-11-031-2/+0
| | | | | | | | | Update makefiles to no longer rely on INTERNAL_RECOVERY_FILES. Define LOCAL_ADDITIONAL_DEPENDENCIES instead. Set LOCAL_LDFLAGS to properly link recovery executable. Change-Id: I4542104c69399b5a19674b9772ab89c3709efa72
* Build block TWRP with RECOVERY_VARIANTMatt Mower2014-09-031-2/+2
| | | | | | | | | | | | | Enable TWRP to reside alongside other recoveries with the naming convention: bootable/recovery(-flag). If TWRP resides at bootable/recovery and a device does not specify RECOVERY_VARIANT, then it will build like normal. If TWRP resides at bootable/recovery-twrp, then its makefiles will only be parsed if a device specifies 'RECOVERY_VARIANT := twrp'. This prevents TWRP specific makefile warnings/errors (notably, missing DEVICE_RESOLUTION) when another recovery is being built. Change-Id: I8f02fffcd79c309c7123b9428eedc69af02e126e
* Update decrypt for 4.4Dees Troy2013-11-1024-0/+2843
Change-Id: I8d5d7b6a49890e4707d70de8b429563de0d2ad99