summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* external/boringssl: export EC_GROUP_set_point_conversion_form symbol.Adam Langley2015-04-211-2/+2
| | | | | | | | | | | In https://android-review.googlesource.com/#/c/147551/, I missed the OPENSSL_EXPORT tag thus the .so doesn't expose it as a dynamic symbol. BUG=20419899 (cherry picked from commit 217eaab310220731646f2a1a0159d71e4eb09d4a) Change-Id: Iec03fe771b131c9bc7547bd163c338eb6636a6e7
* am 830beae6: external/boringssl: add dummy EC_GROUP_set_point_conversion_form.Adam Langley2015-04-202-0/+12
|\ | | | | | | | | * commit '830beae6ebcc7761769f86a354a2d3d5fdc54507': external/boringssl: add dummy EC_GROUP_set_point_conversion_form.
| * external/boringssl: add dummy EC_GROUP_set_point_conversion_form.Adam Langley2015-04-202-0/+12
| | | | | | | | | | | | | | | | BoringSSL always uses uncompressed points. This function aborts if another form is requested or does nothing if uncompressed points are requested. Bug: 20419899 Change-Id: Ib5d0707c4e9eaee67e46a0d73d41be70ce0a9353
* | am eef60be9: external/boringssl: try to fix aarch64+Clang.Adam Langley2015-04-205-16/+14
|\ \ | |/ | | | | | | * commit 'eef60be96fb91dc632a18173b4a4f21e9813aba7': external/boringssl: try to fix aarch64+Clang.
| * external/boringssl: try to fix aarch64+Clang.Adam Langley2015-04-185-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | It appears that the version of Clang in Android doesn't support the .arch_extension directive. This change removes the .arch and .arch_extension lines (because they are triggering errors) and adds a -march option on the command line instead. The aarch64+Clang build is still broken with this change, but it's broken in binder rather than BoringSSL with it. Change-Id: I32c557bdfde4df66d26794ccdd650356f2bbaf8f
* | am dc5ad20a: Merge "Use a different arch feature indicator for clang"Kenny Root2015-04-184-2/+27
|\ \ | |/ | | | | | | * commit 'dc5ad20a799d19a4c8b2531ddae7489d87de7db2': Use a different arch feature indicator for clang
| * Merge "Use a different arch feature indicator for clang"Kenny Root2015-04-184-2/+27
| |\
| | * Use a different arch feature indicator for clangKenny Root2015-04-184-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | Clang doesn't currently understand the ".arch armv8-a+crypto" syntax and instead requires the specification of ".arch_extension" to enable the crypto functionality. Change-Id: Ib7bab562055e7c7925a47030044479ec172d0a34
* | | am 53b609c9: external/boringssl: update #define guards for x86_64-gcc.c.Adam Langley2015-04-180-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '53b609c9db503488fc065728d214c9db67ad5740': external/boringssl: update #define guards for x86_64-gcc.c.
| * | external/boringssl: update #define guards for x86_64-gcc.c.Adam Langley2015-04-181-2/+2
| |/ | | | | | | | | | | | | OS X builds with NO_ASM and was getting both generic.c and x86_64-gcc.c. This change updates the latter so that it's excluded in NO_ASM builds. Change-Id: Idf801013db636bd4d8f6c4588102c241fdb9fbf6
* | Merge "external/boringssl: update #define guards for x86_64-gcc.c."Kenny Root2015-04-181-2/+2
|\ \
| * | external/boringssl: update #define guards for x86_64-gcc.c.Adam Langley2015-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | OS X builds with NO_ASM and was getting both generic.c and x86_64-gcc.c. This change updates the latter so that it's excluded in NO_ASM builds. (cherry picked from commit 53b609c9db503488fc065728d214c9db67ad5740) Change-Id: Idf801013db636bd4d8f6c4588102c241fdb9fbf6
* | | am 49977fa7: external/boringssl: fix Clang build.Adam Langley2015-04-181-1/+1
|\ \ \ | | |/ | |/| | | | | | | * commit '49977fa7e3048d41518223b704c90f1b82588904': external/boringssl: fix Clang build.
| * | external/boringssl: fix Clang build.Adam Langley2015-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The immediate in this operation is too large for ARM. GCC will automatically rewrite it to use bic (where bic does an AND NOT). Clang, however doesn't, and reasonably throws an error. This change switches to using bic in the source file, thus making both happy. Change-Id: I117083f4f70c199e5d2f933c0a0516a6f4059a92
* | | am f1868207: external/boringssl: avoid unused argument warning.Adam Langley2015-04-181-1/+1
|\ \ \ | |/ / | | / | |/ |/| * commit 'f1868207a1695286a02f68006030fd9b26b8bb06': external/boringssl: avoid unused argument warning.
| * external/boringssl: avoid unused argument warning.Adam Langley2015-04-181-1/+1
| | | | | | | | | | | | Clang will warn that the argument to Speed is unused. Change-Id: Ic3a6a7e2f4638e8ad5435332077791db015d4779
* | Merge aosp/master into goog/masterKenny Root2015-04-170-0/+0
|/ | | | Change-Id: Icaf81a257919285358f4ed12da30cafa5b65ffeb
* BoringSSL: support AES-192.Adam Langley2015-04-083-14/+67
| | | | | | Keystore has added support for it so these functions are needed again. Change-Id: Id3bf3dd10e182fe7a9b1c51bd3184ecac4cfde8b
* Add compatibility functions for OpenSSH.Adam Langley2015-04-028-0/+51
| | | | Change-Id: I2fcb67fea859220e7e7bbbdb5dd910fb847c5600
* Changes to work with OpenSSH and wpa_supplicant.Adam Langley2015-03-2411-37/+204
| | | | Change-Id: I19ed78acc67bd0ad8b905ce0ac628b39da8bb161
* Merge "Switch an assert back to a check."Kenny Root2015-03-161-0/+4
|\
| * Switch an assert back to a check.Adam Langley2015-03-161-0/+4
| | | | | | | | | | | | | | The assert was supposed to be *added* in fcf25833 but instead replaced the check. Change-Id: I74d67f49a4375f6b9f1272cbfcf87a438b3b6f29
* | Support MIPS64.Adam Langley2015-03-161-1/+4
|/ | | | | | | | | | MIPS64 confusingly sets __mips__, but it's not a 32-bit platform. This change updates the defines in base.h to recognise MIPS64 based on both __mips__ and __LP64__ being defined. BUG: 19665578 Change-Id: I6290b6def9f999a01b500c918d1488a22fd57460
* Include .extern and .hidden in x86-64 asm.Adam Langley2015-03-0612-15/+33
| | | | | | | | This is backport of BoringSSL's d216b71f909fe56255813dab0a8d052534bdcb91 and https://boringssl-review.googlesource.com/3810 and should allow asm on x86-64 to build correctly. Change-Id: Id321768930182951223dbf90c4c910e24d9b6798
* Fix SHA-384 and -512 in NO_ASM mode.Adam Langley2015-03-061-1/+1
| | | | | | | This is a backport of e023ad2d83bb8a804e989d38e91e0685db179830 from BoringSSL. Change-Id: I77b074221f44081229d48f67ee791d5165b2598d
* Export the PSS padding functions.Adam Langley2015-03-052-9/+29
| | | | | | system/keymaster is using them now. Change-Id: I396e7001e6edf443ed2726d68d21704c7e557748
* Use libmingwex for gmtime_sKenny Root2015-03-041-0/+6
| | | | | | | | gmtime_s first appeared in MSVCR80, but libmingwex has a helper function that tries to find the symbol or falls back to an internal implementation. Change-Id: I5bc27e1cfcc208eb9ea1159d47791fcc90bc7794
* Android: disable assembly for Mac and WindowsKenny Root2015-03-042-0/+11
| | | | | | | There are various problems with assembly on both the Mac and Windows builds, so just disable it for now. Change-Id: I6163e97089c17f70ef9361279319badd22c354b2
* MinGW on Linux uses lowercase include filesKenny Root2015-03-0411-16/+16
| | | | | | | | On Windows this doesn't matter since the filesystems are case- insensitive, but building BoringSSL on Linux with MinGW has case-sensitive filesystems. Change-Id: Iefd319cfda89d2d1f8d43cea39c68295bfa65c83
* Merge "Add support for reading PKCS#7 data from PEM files."Kenny Root2015-02-273-1/+157
|\
| * Add support for reading PKCS#7 data from PEM files.Adam Langley2015-02-273-1/+157
| | | | | | | | | | | | | | (This is a backport of upstream BoringSSL's 4e581b5378d7ef435c9abe39ad5c2a334bd7b6e9.) Change-Id: If799791f28cd37ce810c0065939cf1942771c7f7
* | EC_GROUP_cmp: add back the ignored BN_CTX argKenny Root2015-02-271-1/+1
| | | | | | | | Change-Id: If7c25984fadcb98ea9fb26983e04b1be3b6a2ecd
* | Merge "EC_GROUP_cmp should return zero if the groups match."Kenny Root2015-02-273-7/+10
|\ \ | |/ |/|
| * EC_GROUP_cmp should return zero if the groups match.Adam Langley2015-02-253-7/+10
| | | | | | | | | | | | | | | | | | (I got this wrong when reading the OpenSSL code.) (Cherry-picked form upstream BoringSSL's 7c21925a10d451ed13ab201e0161dea40b974397) Change-Id: Icedaa45c9d17e7c2b95fa5be1f7c0bf41cac0880
* | Add functions to parse and generate PKCS#7 files with CRLs.Adam Langley2015-02-274-23/+334
|/ | | | | | | (This is a cherry-pick of upstream BoringSSL's 50073e8c5e81d8151718e05ec54b7c213372b878.) Change-Id: Id29ea889055dbecfbba4fc4a9e01af0c49b8073e
* Add the CTX parameter back to EC_GROUP_cmp.Adam Langley2015-02-253-3/+4
| | | | | | | | | It was a mistake to remove this in the first place. (Cherry-picked from upstream BoringSSL's 93531bd70f48bc63ad7d4aedf32d69c8095170bd.) Change-Id: Iee35482bf11dd8813622e36b0c0eb8f91538007a
* Mark OPENSSL_armcap_P as hidden in asm files.Adam Langley2015-02-136-0/+6
| | | | | | | | | | | | Without this, the linker says: (sha512-armv4.o): requires unsupported dynamic reloc R_ARM_REL32; recompile with -fPIC This is (I believe) a very misleading error message. The R_ARM_REL32 relocation type is the correct type for position independent code. But unless the target symbol is hidden then the linker doesn't know that it's not going to be overridden by a different ELF module. Change-Id: I9bb5f6b5f85c8de1ad5b6426cf27826976ce8248
* Specify a local SDK version.Adam Langley2015-02-131-0/+4
| | | | | | | | Without this the conscrypt build fails in `make checkbuild` because GCC emits calls to __memset_chk and friends, but the NDK doesn't provide them. Change-Id: I37d783f0e0e7d53a671fc03056e6450a4f5d1c95
* Revert "Disable boringssl build."Dan Albert2015-02-091-6/+0
| | | | | | | | The manifest change was reverted, so this isn't needed anymore. This reverts commit 54d4b126073e603f6be876fb1bca3420150d180e. Change-Id: I4d43b2362262d3a22d5b68d9a210ac6d1d150387
* Disable boringssl build.Dan Albert2015-02-091-0/+6
| | | | | | | | All these modules are defined in external/openssl as well, which is breaking the build. Disable everything in the makefile until someone that owns the project has a chance to clean it up. Change-Id: I732739999e89bb832005842a5776d1540fb6bdbb
* Initial commit of BoringSSL for Android.Adam Langley2015-01-30716-0/+396653