summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-07-19Merge "external/scrypt: use proper nativehelper headers"android-o-iot-preview-5o-iot-preview-5Treehugger Robot
2017-07-18external/scrypt: use proper nativehelper headersSteven Moreland
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
2017-06-16Merge "Add OWNERS in external/scrypt"android-o-preview-4Chih-hung Hsieh
2017-06-15Add OWNERS in external/scryptChih-Hung Hsieh
* Owners are selected from top CL approvals or owners. They will be suggested to review/approve future CLs. * OWNERS files are recognized by the new find-owners plugin, see .md files in https://gerrit.googlesource.com/plugins/find-owners/+/master/src/main/resources/Documentation/ Test: build/make/tools/checkowners.py -c -v OWNERS Change-Id: I41d1076af8926ae570cffd7f3341a4c76f2dc196
2016-07-23Merge \\\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\\" am: 4b2bd9665c ↵android-wear-o-preview-4android-wear-o-preview-3android-o-preview-3android-o-preview-2android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1android-n-iot-preview-4o-previewn-iot-preview-4Dan Willemsen
am: b442b13773 am: 32be729d37 Change-Id: I13fec30c977a102b14e94b326ee292a64f79a17f
2016-07-23Merge \\"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\\" am: 4b2bd9665cDan Willemsen
am: b442b13773 Change-Id: I1b431113bfa436546c18f4bd361766ec237274d4
2016-07-23Merge \"Rename lib{crypto,ssl}-host to lib{crypto,ssl}\"android-n-mr1-preview-2android-n-mr1-preview-1Dan Willemsen
am: 4b2bd9665c Change-Id: Icd4ce38a012e91a709de21b1c377c580cdc12599
2016-07-23Merge "Rename lib{crypto,ssl}-host to lib{crypto,ssl}"Dan Willemsen
2016-07-21Rename lib{crypto,ssl}-host to lib{crypto,ssl}Dan Willemsen
There's no need to use a different name for target and host moudles. In Soong, it's better to use the same for both, as target and host modules can be defined at the same time. Change-Id: I47f356b4fdde5b3a0b75862b1e9d91723ca06f27
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358c am: ↵Elliott Hughes
3608597959 am: 540c0274be * commit '540c0274bedb28050223c305f9a5499b06df328e': scrypt doesn't need <machine/cpu-features.h>. Change-Id: I6242ca18c85c3cd98b9f4a558d54f934c6c5409b
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>." am: e6e09c358cElliott Hughes
am: 3608597959 * commit '36085979592293853cb18fadb61358f5b7f4f717': scrypt doesn't need <machine/cpu-features.h>. Change-Id: I724c161acbb6b2caa6ba9d438c1325e95ad4b830
2016-05-17Merge "scrypt doesn\'t need <machine/cpu-features.h>."Elliott Hughes
am: e6e09c358c * commit 'e6e09c358c249191cf3afa0e44db95b45ea332c4': scrypt doesn't need <machine/cpu-features.h>. Change-Id: Ia87611af260d74930786c044475da06928ab5d6b
2016-05-17Merge "scrypt doesn't need <machine/cpu-features.h>."android-wear-n-preview-2android-wear-7.1.1_r1android-n-preview-5android-n-preview-4android-n-iot-preview-2nougat-mr1-wear-releasen-iot-preview-2Elliott Hughes
2016-05-17scrypt doesn't need <machine/cpu-features.h>.Elliott Hughes
Bug: http://b/18556103 Change-Id: Ibccef334b4d1a2e68e327fc8b73e62e62d13df32
2016-03-03Merge "Don't hardcode gtest path."android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3android-n-preview-2android-n-preview-1Dan Albert
2016-03-03Don't hardcode gtest path.Dan Albert
Bug: http://b/16574165 Change-Id: Ieb63fb6a73f0fb2ab3260bc5eabca7d86d892fbd
2015-01-30Merge "Remove OpenSSL include paths."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-2android-m-preview-1android-m-previewandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-releasemaster-soongmarshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseKenny Root
2015-01-22Remove OpenSSL include paths.Adam Langley
The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: I1bc36094ecbc4ed2d9a4c62498f05580770f4a8a
2014-11-05Merge "Don't explicitly link gtest."android-wear-5.0.0_r1lollipop-wear-releaseDan Albert
2014-11-04Don't explicitly link gtest.Dan Albert
The build system does this for us. Since libgtest is the stlport version of the library, this causes build breakages when libc++ is the default STL. Bug: 15193147 Change-Id: Ief6f539de36f38d38bd1460b17efcdc09114d64d
2014-10-21Merge "Build this test with clang for ASAN_ALL."Dan Albert
2014-10-21Build this test with clang for ASAN_ALL.Dan Albert
Since some of the test's dependencies use clang, ASAN_ALL will cause those to be built with ASAN instrumentation, meaning the final executable needs to be linked with ASAN's runtime libraries. The simple fix is to just move the test to clang to let it link with ASAN when ASAN_ALL is provided. Change-Id: I8d134667347ec45fe59d557e3c792520eaf62f1b
2014-03-01Merge "Fix indirect miuse of $(my-dir)."android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewidea133-weekly-releaseYing Wang
2014-02-28Fix indirect miuse of $(my-dir).Ying Wang
Change-Id: I075938a7bcbe66aac7c6d0ab874ed8816a89a2c9
2013-09-11Merge "Use canonical UniquePtr.h header"idea133Kenny Root
2013-09-11Use canonical UniquePtr.h headerKenny Root
Change-Id: I5697885dec49f14d717ab0e5f2cbe618e724c2d1
2013-06-14Merge "Exclude NEON files for ARMs that do not have it"android-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-cts-4.4_r4android-cts-4.4_r1android-4.4w_r1android-4.4_r1.2.0.1android-4.4_r1.2android-4.4_r1.1.0.1android-4.4_r1.1android-4.4_r1.0.1android-4.4_r1android-4.4_r0.9android-4.4_r0.8android-4.4_r0.7android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1tools_r22.2kitkat-wearkitkat-releasekitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devkitkat-cts-releasekitkat-cts-devjb-mr1.1-dev-plus-aospKenny Root
2013-06-14Exclude NEON files for ARMs that do not have itKenny Root
full_eng is a target that doesn't emulate NEON. Presumably because qemu makes NEON slower than non-NEON. Change-Id: I2153a62da6aef7efa75eae9892822af861ef4476
2013-06-14Merge "Add NEON accelerated functions"Kenny Root
2013-06-14Add NEON accelerated functionsKenny Root
Reference implementation: ScryptTest.TestVectors (2588 ms) NEON acceleration: ScryptTest.TestVectors (1169 ms) Change-Id: I23974b2f0f64435696e75acfbdee1115a699abae
2013-06-14Merge "Add scrypt unit tests"Kenny Root
2013-06-13Add scrypt unit testsKenny Root
Make sure our scrypt library is passing the test vectors provided at: http://tools.ietf.org/html/draft-josefsson-scrypt-kdf-00#page-11 This will allow us to substitute in new Salsa20/8, PBKDF2, etc implementations that are faster without breaking compatibility. Change-Id: I89024b637e0075e5018526e4147148e6fc8e4d96
2013-06-14Merge "Remove patch for bionic"Kenny Root
2013-06-13Remove patch for bionicKenny Root
bionic did not have SIZE_MAX in stdint.h but this was fixed by bionic commit 7c89506e3af3ee97691a98329f0d7b5edef49218 so we no longer need this patch. Change-Id: I49006dafac6c09742004d2cf10bcf76b8ac2bcb5
2013-06-13Merge changes Ib3e9fcbd,Idcc14fedKenny Root
* changes: Use OpenSSL library for PBKDF2 functions Import initial version of scrypt library
2013-06-12Use OpenSSL library for PBKDF2 functionsKenny Root
Change-Id: Ib3e9fcbda26ee95b26c4e4d1c9a4aba78b3ac713
2013-06-12Import initial version of scrypt libraryKenny Root
Change-Id: Idcc14fed4878763ad26855cd99c5e6093ab5b3dd
2013-06-11Initial empty repositoryChad Jones
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 18:01:35 +0000