kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5ab5484044
boringssl/crypto/CMakeLists.txt

279 lines
6.6 KiB
CMake
Raw Normal View History

Move arm_arch.h and fix up lots of include paths. arm_arch.h is included from ARM asm files, but lives in crypto/, not openssl/include/. Since the asm files are often built from a different location than their position in the source tree, relative include paths are unlikely to work so, rather than having crypto/ be a de-facto, second global include path, this change moves arm_arch.h to include/openssl/. It also removes entries from many include paths because they should be needed as relative includes are always based on the locations of the source file. Change-Id: I638ff43d641ca043a4fc06c0d901b11c6ff73542 Reviewed-on: https://boringssl-review.googlesource.com/5746 Reviewed-by: Adam Langley <agl@google.com>
2015-08-25 02:03:17 +01:00
include_directories(../include)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
if(NOT OPENSSL_NO_ASM)
if(UNIX)
if (${ARCH} STREQUAL "aarch64")
# The "armx" Perl scripts look for "64" in the style argument
# in order to decide whether to generate 32- or 64-bit asm.
if (APPLE)
set(PERLASM_STYLE ios64)
else()
set(PERLASM_STYLE linux64)
endif()
elseif (${ARCH} STREQUAL "arm")
if (APPLE)
set(PERLASM_STYLE ios32)
else()
set(PERLASM_STYLE linux32)
endif()
elseif (${ARCH} STREQUAL "ppc64le")
set(PERLASM_STYLE linux64le)
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
else()
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
if (${ARCH} STREQUAL "x86")
set(PERLASM_FLAGS "-fPIC -DOPENSSL_IA32_SSE2")
endif()
if (APPLE)
set(PERLASM_STYLE macosx)
else()
set(PERLASM_STYLE elf)
endif()
endif()
set(ASM_EXT S)
enable_language(ASM)
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")
# Clang's integerated assembler does not support debug symbols.
if(NOT CMAKE_ASM_COMPILER_ID MATCHES "Clang")
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,-g")
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
endif()
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
# CMake does not add -isysroot and -arch flags to assembly.
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
if (APPLE)
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
if (CMAKE_OSX_SYSROOT)
Quote CMAKE_OSX_SYSROOT. In case the XCode install is at, say "/Applications/Xcode 9.app". This won't work if the path contains quotes, but it doesn't appear CMake itself makes any effort to handle that right. Change-Id: Ifecf6147d44ffdae8c2692b2d6c94bfafd8d7714 Reviewed-on: https://boringssl-review.googlesource.com/20944 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-10-02 20:09:04 +01:00
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -isysroot \"${CMAKE_OSX_SYSROOT}\"")
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
endif()
foreach(arch ${CMAKE_OSX_ARCHITECTURES})
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -arch ${arch}")
endforeach()
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
endif()
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
else()
Tidy up some Windows compiler assumptions. Someone tried to build us with Ubuntu's MinGW. This is too old to be supported (the tests rather badly fail to build), but some of the fixes will likely be useful for eventually building Clang for Windows standalone too. Change-Id: I6d279a0da1346b4e0813de51df3373b7412de33a Reviewed-on: https://boringssl-review.googlesource.com/19364 Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-08-16 20:25:27 +01:00
if (${ARCH} STREQUAL "x86_64")
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
set(PERLASM_STYLE nasm)
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
else()
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
set(PERLASM_STYLE win32n)
set(PERLASM_FLAGS "-DOPENSSL_IA32_SSE2")
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
endif()
Build with clang-cl standalone. Our build logic needed to revised and and clang implements more warnings than MSVC, so GTest needed more fixes. Bug: 200 Change-Id: I84c5dd0c51079dd9c990e08dbea7f9022a7d6842 Reviewed-on: https://boringssl-review.googlesource.com/21204 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-10-05 20:04:08 +01:00
set(CMAKE_ASM_NASM_FLAGS "-g cv8")
Fixing assembly coverage reporting. Due to issues with CMake enable_language, we have to delay setting CMAKE_ASM_FLAGS until after enable_language(ASM) has been called. We also need to remove the '.file' macro from x86gas.pl to prevent the filenames from being overridden from those provided by the build system. Change-Id: I436f57ec45e4751714af49e1211a0d7810e4e56a Reviewed-on: https://boringssl-review.googlesource.com/16127 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-10 16:52:23 +01:00
Don't enable ASM when OPENSSL_NO_ASM is set. When building with OPENSSL_NO_ASM do not try to enable_language(ASM). Even though the assembly source isn't being built this still causes CMake to look for the assembler which will fail on platforms where one is not available. Change-Id: Ie4893f606143e8f8ca0807114068e577dc1e23e9 Reviewed-on: https://boringssl-review.googlesource.com/16904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 16:25:35 +01:00
# On Windows, we use the NASM output, specifically built with Yasm.
set(ASM_EXT asm)
enable_language(ASM_NASM)
Add the start of standalone iOS build support. The built-in CMake support seems to basically work, though it believes you want to build a fat binary which doesn't work with how we build perlasm. (We'd need to stop conditioning on CMAKE_SYSTEM_PROCESSOR at all, wrap all the generated assembly files in ifdefs, and convince the build to emit more than one. Probably not worth bothering for now.) We still, of course, need to actually test the assembly on iOS before this can be shipped anywhere. BUG=48 Change-Id: I6ae71d98d706be03142b82f7844d1c9b02a2b832 Reviewed-on: https://boringssl-review.googlesource.com/14645 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-07 04:26:04 +01:00
endif()
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
endif()
function(perlasm dest src)
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
add_custom_command(
OUTPUT ${dest}
Switch perlasm calling convention. Depending on architecture, perlasm differed on which one or both of: perl foo.pl flavor output.S perl foo.pl flavor > output.S Upstream has now unified on the first form after making a number of changes to their files (the second does not even work for their x86 files anymore). Sync those portions of our perlasm scripts with upstream and update CMakeLists.txt and generate_build_files.py per the new convention. This imports various commits like this one: 184bc45f683c76531d7e065b6553ca9086564576 (this was done by taking a diff, so I don't have the full list) Confirmed that generate_build_files.py sees no change. BUG=14 Change-Id: Id2fb5b8bc2a7369d077221b5df9a6947d41f50d2 Reviewed-on: https://boringssl-review.googlesource.com/8518 Reviewed-by: Adam Langley <agl@google.com>
2016-06-26 18:18:50 +01:00
COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${PERLASM_STYLE} ${PERLASM_FLAGS} ${ARGN} ${dest}
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
DEPENDS
${src}
Add arm-xlate.pl and initial iOS asm support. This is as partial import of upstream's 9b05cbc33e7895ed033b1119e300782d9e0cf23c. It includes the perlasm changes, but not the CPU feature detection bits as we do those differently. This is largely so we don't diverge from upstream, but it'll help with iOS assembly in the future. sha512-armv8.pl is modified slightly from upstream to switch from conditioning on the output file to conditioning on an extra argument. This makes our previous change from upstream (removing the 'open STDOUT' line) more explicit. BUG=338886 Change-Id: Ic8ca1388ae20e94566f475bad3464ccc73f445df Reviewed-on: https://boringssl-review.googlesource.com/4405 Reviewed-by: Adam Langley <agl@google.com>
2015-04-20 18:25:46 +01:00
${PROJECT_SOURCE_DIR}/crypto/perlasm/arm-xlate.pl
Add PPC64LE assembly for AES-GCM. This change adds AES and GHASH assembly from upstream, with the aim of speeding up AES-GCM. The PPC64LE assembly matches the interface of the ARMv8 assembly so I've changed the prefix of both sets of asm functions to be the same ("aes_hw_"). Otherwise, the new assmebly files and Perlasm match exactly those from upstream's c536b6be1a (from their master branch). Before: Did 1879000 AES-128-GCM (16 bytes) seal operations in 1000428us (1878196.1 ops/sec): 30.1 MB/s Did 61000 AES-128-GCM (1350 bytes) seal operations in 1006660us (60596.4 ops/sec): 81.8 MB/s Did 11000 AES-128-GCM (8192 bytes) seal operations in 1072649us (10255.0 ops/sec): 84.0 MB/s Did 1665000 AES-256-GCM (16 bytes) seal operations in 1000591us (1664016.6 ops/sec): 26.6 MB/s Did 52000 AES-256-GCM (1350 bytes) seal operations in 1006971us (51640.0 ops/sec): 69.7 MB/s Did 8840 AES-256-GCM (8192 bytes) seal operations in 1013294us (8724.0 ops/sec): 71.5 MB/s After: Did 4994000 AES-128-GCM (16 bytes) seal operations in 1000017us (4993915.1 ops/sec): 79.9 MB/s Did 1389000 AES-128-GCM (1350 bytes) seal operations in 1000073us (1388898.6 ops/sec): 1875.0 MB/s Did 319000 AES-128-GCM (8192 bytes) seal operations in 1000101us (318967.8 ops/sec): 2613.0 MB/s Did 4668000 AES-256-GCM (16 bytes) seal operations in 1000149us (4667304.6 ops/sec): 74.7 MB/s Did 1202000 AES-256-GCM (1350 bytes) seal operations in 1000646us (1201224.0 ops/sec): 1621.7 MB/s Did 269000 AES-256-GCM (8192 bytes) seal operations in 1002804us (268247.8 ops/sec): 2197.5 MB/s Change-Id: Id848562bd4e1aa79a4683012501dfa5e6c08cfcc Reviewed-on: https://boringssl-review.googlesource.com/11262 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2016-09-23 20:47:24 +01:00
${PROJECT_SOURCE_DIR}/crypto/perlasm/ppc-xlate.pl
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
${PROJECT_SOURCE_DIR}/crypto/perlasm/x86_64-xlate.pl
${PROJECT_SOURCE_DIR}/crypto/perlasm/x86asm.pl
${PROJECT_SOURCE_DIR}/crypto/perlasm/x86gas.pl
${PROJECT_SOURCE_DIR}/crypto/perlasm/x86masm.pl
${PROJECT_SOURCE_DIR}/crypto/perlasm/x86nasm.pl
WORKING_DIRECTORY .
)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
endfunction()
# Level 0.1 - depends on nothing outside this set.
add_subdirectory(stack)
add_subdirectory(lhash)
add_subdirectory(err)
add_subdirectory(buf)
add_subdirectory(base64)
add_subdirectory(bytestring)
Add CRYPTO_BUFFER and CRYPTO_BUFFER_POOL. These structures allow for blobs of data (e.g. certificates) to be deduplicated in memory. Change-Id: Iebfec90b85d55565848a178b6951562b4ccc083e Reviewed-on: https://boringssl-review.googlesource.com/11820 Reviewed-by: Adam Langley <alangley@gmail.com> Commit-Queue: Adam Langley <alangley@gmail.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2016-10-26 01:33:49 +01:00
add_subdirectory(pool)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
# Level 0.2 - depends on nothing but itself
add_subdirectory(rc4)
add_subdirectory(conf)
ChaCha20-Poly1305 support.
2014-06-20 20:00:00 +01:00
add_subdirectory(chacha)
add_subdirectory(poly1305)
Add X25519 and Ed25519 support. (Ed25519 support is disabled when |OPENSSL_SMALL| is defined.) libcrypto.a sizes: x86-64 -O3 -march=native: +78012 (1584902 → 1662914) x86-64 -O3 -march=native -DOPENSSL_SMALL: +10596 (1356206 → 1366802) Android armv7 Thumb -O2 -DOPENSSL_SMALL: +13132 (1258462 → 1271594) Change-Id: I6a7e64d481e4ce4daa7d5057578081358746cfb9 Reviewed-on: https://boringssl-review.googlesource.com/6497 Reviewed-by: Adam Langley <agl@google.com>
2015-11-13 21:09:47 +00:00
add_subdirectory(curve25519)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
# Level 1, depends only on 0.*
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
add_subdirectory(digest_extra)
Move cipher/ into crypto/fipsmodule/ Change-Id: Id65e0988534056a72d9b40cc9ba5194e2d9b8a7c Reviewed-on: https://boringssl-review.googlesource.com/15904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-03 21:23:37 +01:00
add_subdirectory(cipher_extra)
Move much of rand/ into the FIPS module. Support for platforms that we don't support FIPS on doesn't need to be in the module. Also, functions for dealing with whether fork-unsafe buffering is enabled are left out because they aren't implementing any cryptography and they use global r/w state, making their inclusion painful. Change-Id: I71a0123db6f5449e9dfc7ec7dea0944428e661aa Reviewed-on: https://boringssl-review.googlesource.com/15084 Reviewed-by: Adam Langley <agl@google.com>
2017-04-14 19:16:20 +01:00
add_subdirectory(rand_extra)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(bio)
Move bn/ into crypto/fipsmodule/ Change-Id: I68aa4a740ee1c7f2a308a6536f408929f15b694c Reviewed-on: https://boringssl-review.googlesource.com/15647 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-28 22:47:06 +01:00
add_subdirectory(bn_extra)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(obj)
add_subdirectory(asn1)
# Level 2
add_subdirectory(engine)
add_subdirectory(dh)
add_subdirectory(dsa)
Move rsa/ to fipsmodule/rsa/ Change-Id: Id20d371ae7a88a91aaba7a9e23574eccb9caeb3c Reviewed-on: https://boringssl-review.googlesource.com/15849 Reviewed-by: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-03 19:50:51 +01:00
add_subdirectory(rsa_extra)
Move ec/ and ecdsa/ into fipsmodule/ The names in the P-224 code collided with the P-256 code and thus many of the functions and constants in the P-224 code have been prefixed. Change-Id: I6bcd304640c539d0483d129d5eaf1702894929a8 Reviewed-on: https://boringssl-review.googlesource.com/15847 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-02 22:25:39 +01:00
add_subdirectory(ec_extra)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(ecdh)
Move ec/ and ecdsa/ into fipsmodule/ The names in the P-224 code collided with the P-256 code and thus many of the functions and constants in the P-224 code have been prefixed. Change-Id: I6bcd304640c539d0483d129d5eaf1702894929a8 Reviewed-on: https://boringssl-review.googlesource.com/15847 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-02 22:25:39 +01:00
add_subdirectory(ecdsa_extra)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
# Level 3
Add support for CMAC (RFC 4493). The interface for this is very similar to upstream, but the code is quite different. Support for “resuming” (i.e. calling |CMAC_Final| and then computing the CMAC for an extension of the message) has been dropped. Also, calling |CMAC_Init| with magic argument to reset it has been replaced with |CMAC_Reset|. Lastly, a one-shot function has been added because it can save an allocation and that's what most callers actually appear to want to do. Change-Id: I9345220218bdb16ebe6ca356928d7c6f055d83f6 Reviewed-on: https://boringssl-review.googlesource.com/4630 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
2015-05-06 00:36:32 +01:00
add_subdirectory(cmac)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(evp)
Implement HKDF. See https://tools.ietf.org/html/rfc5869. Change-Id: I6d012d8c38806df80aa44350d3a86eaff499ac05 Reviewed-on: https://boringssl-review.googlesource.com/2533 Reviewed-by: Adam Langley <agl@google.com>
2014-12-09 23:51:28 +00:00
add_subdirectory(hkdf)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(pem)
add_subdirectory(x509)
add_subdirectory(x509v3)
# Level 4
Move PKCS#7 functions into their own directory. A follow-up change will add a CRYPTO_BUFFER variant. This makes the naming match the header and doesn't require including x509.h. (Though like ssl.h and pkcs8.h, some of the functions are implemented with code that depends on crypto/x509.) Change-Id: I5a7de209f4f775fe0027893f711326d89699ca1f Reviewed-on: https://boringssl-review.googlesource.com/15128 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-15 23:40:41 +01:00
add_subdirectory(pkcs7)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_subdirectory(pkcs8)
Add file-based test framework and convert hmac_test. This adds a file-based test framework to crypto/test. It knows how to parse formats similar to either upstream's evp_test and our aead_test. hmac_test has been converted to that with tests from upstream's evp_test. Upstream tests it against the deprecated EVP_PKEY_HMAC API, which will be tested by running evp_test against the same input file, to avoid having to duplicate the test vectors. hmac_test runs those same inputs against the supported HMAC_CTX APIs. Change-Id: I9d2b6adb9be519760d1db282b9d43efd6f9adffb Reviewed-on: https://boringssl-review.googlesource.com/4701 Reviewed-by: Adam Langley <agl@google.com>
2015-05-10 03:46:47 +01:00
# Test support code
add_subdirectory(test)
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
add_subdirectory(fipsmodule)
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
add_library(
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
crypto_base
OBJECT
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
Rewrite ARM feature detection. This removes the thread-unsafe SIGILL-based detection and the multi-consumer-hostile CRYPTO_set_NEON_capable API. (Changing OPENSSL_armcap_P after initialization is likely to cause problems.) The right way to detect ARM features on Linux is getauxval. On aarch64, we should be able to rely on this, so use it straight. Split this out into its own file. The #ifdefs in the old cpu-arm.c meant it shared all but no code with its arm counterpart anyway. Unfortunately, various versions of Android have different missing APIs, so, on arm, we need a series of workarounds. Previously, we used a SIGILL fallback based on OpenSSL's logic, but this is inherently not thread-safe. (SIGILL also does not tell us if the OS knows how to save and restore NEON state.) Instead, base the behavior on Android NDK's cpu-features library, what Chromium currently uses with CRYPTO_set_NEON_capable: - Android before API level 20 does not provide getauxval. Where missing, we can read from /proc/self/auxv. - On some versions of Android, /proc/self/auxv is also not readable, so use /proc/cpuinfo's Features line. - Linux only advertises optional features in /proc/cpuinfo. ARMv8 makes NEON mandatory, so /proc/cpuinfo can't be used without additional effort. Finally, we must blacklist a particular chip because the NEON unit is broken (https://crbug.com/341598). Unfortunately, this means CRYPTO_library_init now depends on /proc being available, which will require some care with Chromium's sandbox. The simplest solution is to just call CRYPTO_library_init before entering the sandbox. It's worth noting that Chromium's current EnsureOpenSSLInit function already depends on /proc/cpuinfo to detect the broken CPU, by way of base::CPU. android_getCpuFeatures also interally depends on it. We were already relying on both of those being stateful and primed prior to entering the sandbox. BUG=chromium:589200 Change-Id: Ic5d1c341aab5a614eb129d8aa5ada2809edd6af8 Reviewed-on: https://boringssl-review.googlesource.com/7506 Reviewed-by: David Benjamin <davidben@google.com>
2016-03-01 22:35:47 +00:00
cpu-aarch64-linux.c
cpu-arm.c
cpu-arm-linux.c
cpu-intel.c
Add PPC64LE assembly for AES-GCM. This change adds AES and GHASH assembly from upstream, with the aim of speeding up AES-GCM. The PPC64LE assembly matches the interface of the ARMv8 assembly so I've changed the prefix of both sets of asm functions to be the same ("aes_hw_"). Otherwise, the new assmebly files and Perlasm match exactly those from upstream's c536b6be1a (from their master branch). Before: Did 1879000 AES-128-GCM (16 bytes) seal operations in 1000428us (1878196.1 ops/sec): 30.1 MB/s Did 61000 AES-128-GCM (1350 bytes) seal operations in 1006660us (60596.4 ops/sec): 81.8 MB/s Did 11000 AES-128-GCM (8192 bytes) seal operations in 1072649us (10255.0 ops/sec): 84.0 MB/s Did 1665000 AES-256-GCM (16 bytes) seal operations in 1000591us (1664016.6 ops/sec): 26.6 MB/s Did 52000 AES-256-GCM (1350 bytes) seal operations in 1006971us (51640.0 ops/sec): 69.7 MB/s Did 8840 AES-256-GCM (8192 bytes) seal operations in 1013294us (8724.0 ops/sec): 71.5 MB/s After: Did 4994000 AES-128-GCM (16 bytes) seal operations in 1000017us (4993915.1 ops/sec): 79.9 MB/s Did 1389000 AES-128-GCM (1350 bytes) seal operations in 1000073us (1388898.6 ops/sec): 1875.0 MB/s Did 319000 AES-128-GCM (8192 bytes) seal operations in 1000101us (318967.8 ops/sec): 2613.0 MB/s Did 4668000 AES-256-GCM (16 bytes) seal operations in 1000149us (4667304.6 ops/sec): 74.7 MB/s Did 1202000 AES-256-GCM (1350 bytes) seal operations in 1000646us (1201224.0 ops/sec): 1621.7 MB/s Did 269000 AES-256-GCM (8192 bytes) seal operations in 1002804us (268247.8 ops/sec): 2197.5 MB/s Change-Id: Id848562bd4e1aa79a4683012501dfa5e6c08cfcc Reviewed-on: https://boringssl-review.googlesource.com/11262 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2016-09-23 20:47:24 +01:00
cpu-ppc64le.c
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
crypto.c
Add infrastructure for reference counts. OpenSSL has traditionally done reference counting with |int|s and the |CRYPTO_add| function. Unless a special callback is installed (rare), this is implemented by doing the reference count operations under a lock. This change adds infrastructure for handling reference counts and uses atomic operations when C11 support is available. Change-Id: Ia023ce432319efd00f77a7340da27d16ee4b63c3 Reviewed-on: https://boringssl-review.googlesource.com/4771 Reviewed-by: Adam Langley <agl@google.com>
2015-05-15 20:01:29 +01:00
ex_data.c
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
mem.c
Add infrastructure for reference counts. OpenSSL has traditionally done reference counting with |int|s and the |CRYPTO_add| function. Unless a special callback is installed (rare), this is implemented by doing the reference count operations under a lock. This change adds infrastructure for handling reference counts and uses atomic operations when C11 support is available. Change-Id: Ia023ce432319efd00f77a7340da27d16ee4b63c3 Reviewed-on: https://boringssl-review.googlesource.com/4771 Reviewed-by: Adam Langley <agl@google.com>
2015-05-15 20:01:29 +01:00
refcount_c11.c
refcount_lock.c
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
thread.c
Support Trusty, an embedded platform. Trusty doesn't have setjmp.h and nor does it have threads. Change-Id: I005f7a009a13e6632513be9fab2bbe62294519a4 Reviewed-on: https://boringssl-review.googlesource.com/4660 Reviewed-by: Adam Langley <agl@google.com>
2015-05-08 02:28:27 +01:00
thread_none.c
Add native support for onces and thread-local storage. Historically, OpenSSL has used callbacks for anything thread related, but we don't actually have that many threading libraries to worry about: just pthreads and Windows (I hope). That suggests that it's quite reasonable to handle threading ourselves, and eliminate the need for users to remember to install the thread callbacks. The first user of this would be ERR, which currently simulates thread-local storage using a lock around a hash table keyed by the TID. (Although I suspect that change will need some CMake work in order that libpthread is automatically included with libcrypto when linking tests etc, but not on Windows and without lots of ifs.) Change-Id: I4dd088e3794506747f875c1f3e92b9bc6700fad2 Reviewed-on: https://boringssl-review.googlesource.com/4010 Reviewed-by: Adam Langley <agl@google.com>
2015-03-16 19:48:56 +00:00
thread_pthread.c
thread_win.c
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
)
Switch to new delocate tool. Most importantly, this version of delocate works for ppc64le. It should also work for x86-64, but will need significant testing to make sure that it covers all the cases that the previous delocate.go covered. It's less stringtastic than the old code, however the parser isn't as nice as I would have liked. I thought that the reason we put up with AT&T syntax with Intel is so that assembly syntax could be somewhat consistent across platforms. At least for ppc64le, that does not appear to be the case. Change-Id: Ic7e3c6acc3803d19f2c3ff5620c5e39703d74212 Reviewed-on: https://boringssl-review.googlesource.com/16464 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-17 21:05:50 +01:00
if(FIPS_DELOCATE)
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES EXTERNAL_OBJECT true)
SET_SOURCE_FILES_PROPERTIES(fipsmodule/bcm.o PROPERTIES GENERATED true)
set(
CRYPTO_FIPS_OBJECTS
fipsmodule/bcm.o
)
endif()
add_library(
crypto
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
$<TARGET_OBJECTS:crypto_base>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:stack>
$<TARGET_OBJECTS:lhash>
$<TARGET_OBJECTS:err>
$<TARGET_OBJECTS:base64>
$<TARGET_OBJECTS:bytestring>
Add CRYPTO_BUFFER and CRYPTO_BUFFER_POOL. These structures allow for blobs of data (e.g. certificates) to be deduplicated in memory. Change-Id: Iebfec90b85d55565848a178b6951562b4ccc083e Reviewed-on: https://boringssl-review.googlesource.com/11820 Reviewed-by: Adam Langley <alangley@gmail.com> Commit-Queue: Adam Langley <alangley@gmail.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2016-10-26 01:33:49 +01:00
$<TARGET_OBJECTS:pool>
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
$<TARGET_OBJECTS:fipsmodule>
$<TARGET_OBJECTS:digest_extra>
Move cipher/ into crypto/fipsmodule/ Change-Id: Id65e0988534056a72d9b40cc9ba5194e2d9b8a7c Reviewed-on: https://boringssl-review.googlesource.com/15904 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-03 21:23:37 +01:00
$<TARGET_OBJECTS:cipher_extra>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:rc4>
$<TARGET_OBJECTS:conf>
$<TARGET_OBJECTS:chacha>
$<TARGET_OBJECTS:poly1305>
Add X25519 and Ed25519 support. (Ed25519 support is disabled when |OPENSSL_SMALL| is defined.) libcrypto.a sizes: x86-64 -O3 -march=native: +78012 (1584902 → 1662914) x86-64 -O3 -march=native -DOPENSSL_SMALL: +10596 (1356206 → 1366802) Android armv7 Thumb -O2 -DOPENSSL_SMALL: +13132 (1258462 → 1271594) Change-Id: I6a7e64d481e4ce4daa7d5057578081358746cfb9 Reviewed-on: https://boringssl-review.googlesource.com/6497 Reviewed-by: Adam Langley <agl@google.com>
2015-11-13 21:09:47 +00:00
$<TARGET_OBJECTS:curve25519>
Move curve25519 code to third_party/fiat. This change doesn't actually introduce any Fiat code yet. It sets up the directory structure to make the diffs in the next change clearer. Change-Id: I38a21fb36b18a08b0907f9d37b7ef5d7d3137ede Reviewed-on: https://boringssl-review.googlesource.com/22624 Reviewed-by: David Benjamin <davidben@google.com>
2017-10-30 15:58:33 +00:00
$<TARGET_OBJECTS:fiat>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:buf>
Move bn/ into crypto/fipsmodule/ Change-Id: I68aa4a740ee1c7f2a308a6536f408929f15b694c Reviewed-on: https://boringssl-review.googlesource.com/15647 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-28 22:47:06 +01:00
$<TARGET_OBJECTS:bn_extra>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:bio>
Move much of rand/ into the FIPS module. Support for platforms that we don't support FIPS on doesn't need to be in the module. Also, functions for dealing with whether fork-unsafe buffering is enabled are left out because they aren't implementing any cryptography and they use global r/w state, making their inclusion painful. Change-Id: I71a0123db6f5449e9dfc7ec7dea0944428e661aa Reviewed-on: https://boringssl-review.googlesource.com/15084 Reviewed-by: Adam Langley <agl@google.com>
2017-04-14 19:16:20 +01:00
$<TARGET_OBJECTS:rand_extra>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:obj>
$<TARGET_OBJECTS:asn1>
$<TARGET_OBJECTS:engine>
$<TARGET_OBJECTS:dh>
$<TARGET_OBJECTS:dsa>
Move rsa/ to fipsmodule/rsa/ Change-Id: Id20d371ae7a88a91aaba7a9e23574eccb9caeb3c Reviewed-on: https://boringssl-review.googlesource.com/15849 Reviewed-by: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-03 19:50:51 +01:00
$<TARGET_OBJECTS:rsa_extra>
Move ec/ and ecdsa/ into fipsmodule/ The names in the P-224 code collided with the P-256 code and thus many of the functions and constants in the P-224 code have been prefixed. Change-Id: I6bcd304640c539d0483d129d5eaf1702894929a8 Reviewed-on: https://boringssl-review.googlesource.com/15847 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-02 22:25:39 +01:00
$<TARGET_OBJECTS:ec_extra>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:ecdh>
Move ec/ and ecdsa/ into fipsmodule/ The names in the P-224 code collided with the P-256 code and thus many of the functions and constants in the P-224 code have been prefixed. Change-Id: I6bcd304640c539d0483d129d5eaf1702894929a8 Reviewed-on: https://boringssl-review.googlesource.com/15847 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-02 22:25:39 +01:00
$<TARGET_OBJECTS:ecdsa_extra>
Add support for CMAC (RFC 4493). The interface for this is very similar to upstream, but the code is quite different. Support for “resuming” (i.e. calling |CMAC_Final| and then computing the CMAC for an extension of the message) has been dropped. Also, calling |CMAC_Init| with magic argument to reset it has been replaced with |CMAC_Reset|. Lastly, a one-shot function has been added because it can save an allocation and that's what most callers actually appear to want to do. Change-Id: I9345220218bdb16ebe6ca356928d7c6f055d83f6 Reviewed-on: https://boringssl-review.googlesource.com/4630 Reviewed-by: David Benjamin <davidben@chromium.org> Reviewed-by: Adam Langley <agl@google.com>
2015-05-06 00:36:32 +01:00
$<TARGET_OBJECTS:cmac>
Change CMakeLists.txt to two-space indent. find -name CMakeLists.txt -type f | xargs sed -e 's/\t/ /g' -i Change-Id: I01636b1849c00ba918f48828252492d99b0403ac
2015-01-29 00:37:10 +00:00
$<TARGET_OBJECTS:evp>
$<TARGET_OBJECTS:hkdf>
$<TARGET_OBJECTS:pem>
$<TARGET_OBJECTS:x509>
$<TARGET_OBJECTS:x509v3>
Move PKCS#7 functions into their own directory. A follow-up change will add a CRYPTO_BUFFER variant. This makes the naming match the header and doesn't require including x509.h. (Though like ssl.h and pkcs8.h, some of the functions are implemented with code that depends on crypto/x509.) Change-Id: I5a7de209f4f775fe0027893f711326d89699ca1f Reviewed-on: https://boringssl-review.googlesource.com/15128 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-15 23:40:41 +01:00
$<TARGET_OBJECTS:pkcs7>
Add standalone PKCS#8 and SPKI fuzzers. We already had coverage for our new EVP_PKEY parsers, but it's good to have some that cover them directly. The initial corpus was generated manually with der-ascii and should cover most of the insanity around EC key serialization. BUG=15 Change-Id: I7aaf56876680bfd5a89f5e365c5052eee03ba862 Reviewed-on: https://boringssl-review.googlesource.com/7728 Reviewed-by: Adam Langley <agl@google.com>
2016-04-22 05:43:20 +01:00
$<TARGET_OBJECTS:pkcs8_lib>
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
${CRYPTO_FIPS_OBJECTS}
Inital import. Initial fork from f2d678e6e89b6508147086610e985d4e8416e867 (1.0.2 beta). (This change contains substantial changes from the original and effectively starts a new history.)
2014-06-20 20:00:00 +01:00
)
Switch to new delocate tool. Most importantly, this version of delocate works for ppc64le. It should also work for x86-64, but will need significant testing to make sure that it covers all the cases that the previous delocate.go covered. It's less stringtastic than the old code, however the parser isn't as nice as I would have liked. I thought that the reason we put up with AT&T syntax with Intel is so that assembly syntax could be somewhat consistent across platforms. At least for ppc64le, that does not appear to be the case. Change-Id: Ic7e3c6acc3803d19f2c3ff5620c5e39703d74212 Reviewed-on: https://boringssl-review.googlesource.com/16464 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-17 21:05:50 +01:00
if(FIPS_DELOCATE)
First part of the FIPS module. Change-Id: Ic3a91ccd2c8cdc364740f256fdb8a7ff66177947 Reviewed-on: https://boringssl-review.googlesource.com/14506 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-04-04 22:21:43 +01:00
add_dependencies(crypto bcm_o_target)
endif()
SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
Add support for building with the Android NDK. Previously I've been using the Linaro toolchains and just building static binaries. However, the Linaro toolchains have a broken pthread_rwlock_wrlock—it does nothing and then unlocking corrupts the lock. Building with the Android NDK avoids this. These build instructions depend on https://github.com/taka-no-me/android-cmake which people will need to clone into util/ if they want to use the Android NDK. Change-Id: Ic64919f9399af2a57e8df4fb4b3400865ddb2427 Reviewed-on: https://boringssl-review.googlesource.com/4600 Reviewed-by: Adam Langley <agl@google.com>
2015-04-29 01:46:58 +01:00
if(NOT MSVC AND NOT ANDROID)
Fix the standalone shared library build. BUG=473360 Change-Id: I6dc06eb425dd10c8d6a40d17f94405ea6f2f3905 Reviewed-on: https://boringssl-review.googlesource.com/4210 Reviewed-by: Adam Langley <agl@google.com>
2015-04-02 21:47:15 +01:00
target_link_libraries(crypto pthread)
endif()
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
# TODO(davidben): Convert the remaining tests to GTest.
add_executable(
crypto_test
Convert asn1_test to GTest. BUG=129 Change-Id: I0af881c6f50a558a220853084e53189b8919e41e Reviewed-on: https://boringssl-review.googlesource.com/14206 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-05 19:47:16 +00:00
asn1/asn1_test.cc
Convert base64_test to GTest. BUG=129 Change-Id: If91d97ea653177d55d5c703f091366ddce24da60 Reviewed-on: https://boringssl-review.googlesource.com/15006 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-17 15:04:39 +01:00
base64/base64_test.cc
Always process handshake records in full. This removes the last place where non-app-data hooks leave anything uncomsumed in rrec. (There is still a place where non-app-data hooks see a non-empty rrec an entrance. read_app_data calls into read_handshake. That'll be fixed in a later patch in this series.) This should not change behavior, though some error codes may change due to some processing happening in a slightly different order. Since we do this in a few places, this adds a BUF_MEM_append with tests. Change-Id: I9fe1fc0103e47f90e3c9f4acfe638927aecdeff6 Reviewed-on: https://boringssl-review.googlesource.com/21345 Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Reviewed-by: Steven Valdez <svaldez@google.com>
2017-10-06 23:26:36 +01:00
buf/buf_test.cc
Convert bio_test to GTest. BUG=129 Change-Id: Iaf07075afaa2ea447e19a8c53ec0d29560d625b3 Reviewed-on: https://boringssl-review.googlesource.com/14207 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-09 06:13:07 +00:00
bio/bio_test.cc
Convert bytestring_test to GTest. This also fixes TestGetUint to actually test CBS_get_last_u8's behavior. Right now it can't distinguish CBS_get_last_u8 and CBS_get_u8. BUG=129 Change-Id: Ie431bb1a828f1c6877938ba7e75c82305b54cf13 Reviewed-on: https://boringssl-review.googlesource.com/15007 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-12 04:07:13 +01:00
bytestring/bytestring_test.cc
Convert chacha_test to GTest. BUG=129 Change-Id: Ibbd6d0804a75cb17ff33f64d4cdf9ae80b26e9df Reviewed-on: https://boringssl-review.googlesource.com/13867 Reviewed-by: Steven Valdez <svaldez@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-02-15 15:33:19 +00:00
chacha/chacha_test.cc
Convert a number of tests to GTest. BUG=129 Change-Id: Ifcdacb2f5f59fd03b757f88778ceb1e672208fd9 Reviewed-on: https://boringssl-review.googlesource.com/16744 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-24 05:50:35 +01:00
cipher_extra/aead_test.cc
cipher_extra/cipher_test.cc
Convert cmac_test to GTest. BUG=129 Change-Id: I6578da36c4e9fb1464c79bf03b0a800ed25c7957 Reviewed-on: https://boringssl-review.googlesource.com/15464 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-23 16:55:32 +01:00
cmac/cmac_test.cc
Add a compiler test. C leaves some details as implementation-defined. We only support implementations which define things consistent with the obvious representation on current machines. Change-Id: I255a2e54a86c8a7d987dea51ea7168ad66ad9ddd Reviewed-on: https://boringssl-review.googlesource.com/15305 Reviewed-by: Adam Langley <agl@google.com>
2017-04-20 18:54:28 +01:00
compiler_test.cc
Convert constant_time_test to GTest. This ends up under half the size of the original file. BUG=129 Change-Id: Idec69d9517bd57cee6b3b83bc0cce05396565b70 Reviewed-on: https://boringssl-review.googlesource.com/14305 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-16 15:25:20 +00:00
constant_time_test.cc
Convert ed25519_test to GTest. BUG=129 Change-Id: I784a745f102d9d09d35b27542d94b2b85dfb332e Reviewed-on: https://boringssl-review.googlesource.com/16508 Reviewed-by: Adam Langley <agl@google.com>
2017-05-22 21:33:29 +01:00
curve25519/ed25519_test.cc
Convert spake25519_test to GTest. BUG=129 Change-Id: I5f812c87d6a02f5b4de0d9153afe7399e124382b Reviewed-on: https://boringssl-review.googlesource.com/15465 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-04-23 17:00:39 +01:00
curve25519/spake25519_test.cc
Convert x25519_test to GTest. This also adds a few missing assertions (X25519 returns true in normal cases and, even when it returns zero, it still writes to out.) BUG=129 Change-Id: I63f7e9025f88b2ec309382b66fc915acca6513a9 Reviewed-on: https://boringssl-review.googlesource.com/14030 Reviewed-by: Steven Valdez <svaldez@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-01 17:37:35 +00:00
curve25519/x25519_test.cc
Convert a number of tests to GTest. BUG=129 Change-Id: Ifcdacb2f5f59fd03b757f88778ceb1e672208fd9 Reviewed-on: https://boringssl-review.googlesource.com/16744 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-24 05:50:35 +01:00
ecdh/ecdh_test.cc
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
dh/dh_test.cc
Convert digest_test to GTest. BUG=129 Change-Id: I7ce961f136b9c63cd02a364d6a78fd875c240d25 Reviewed-on: https://boringssl-review.googlesource.com/16446 Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-18 01:30:18 +01:00
digest_extra/digest_test.cc
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
dsa/dsa_test.cc
Convert err_test to GTest. BUG=129 Change-Id: I227ffa2da4e220075de296fb5b94d043f4e032e0 Reviewed-on: https://boringssl-review.googlesource.com/13627 Reviewed-by: Steven Valdez <svaldez@google.com> Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-02-05 08:01:25 +00:00
err/err_test.cc
Convert evp_extra_test into GTest. BUG=129 Change-Id: Ie64a445a42fb3a6d16818b1fabba8481e6e9ad94 Reviewed-on: https://boringssl-review.googlesource.com/14029 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-01 16:53:41 +00:00
evp/evp_extra_test.cc
Convert evp_test to GTest. This is a fairly shallow conversion because of the somewhat screwy Error lines in the test which may target random functions like EVP_PKEY_CTX_set_signature_md. We probably should revise this, perhaps moving those to normal tests and leaving error codes to the core operation itself. BUG=129 Change-Id: I27dcc945058911b2de40cd48466d4e0366813a12 Reviewed-on: https://boringssl-review.googlesource.com/16988 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-08 21:00:10 +01:00
evp/evp_test.cc
Convert various tests to GTest. BUG=129 Change-Id: I4a501fa620b7b5b4c585731ec1ece94407e9b727 Reviewed-on: https://boringssl-review.googlesource.com/16510 Reviewed-by: Adam Langley <agl@google.com>
2017-05-20 14:48:45 +01:00
evp/pbkdf_test.cc
Implement scrypt from RFC 7914. This imports upstream's scrypt implementation, though it's been heavily revised. I lost track of words vs. blocks vs. bigger blocks too many times in the original code and introduced a typedef for the fixed-width Salsa20 blocks. The downside is going from bytes to blocks is a bit trickier, so I took advantage of our little-endian assumption. This also adds an missing check for N < 2^32. Upstream's code is making this assumption in Integerify. I'll send that change back upstream. I've also removed the weird edge case where a NULL out_key parameter means to validate N/r/p against max_mem and nothing else. That's just in there to get a different error code out of their PKCS#12 code. Performance-wise, the cleanup appears to be the same (up to what little precision I was able to get here), but an optimization to use bitwise AND rather than modulus makes us measurably faster. Though scrypt isn't a fast operation to begin with, so hopefully it isn't anyone's bottleneck. This CL does not route scrypt up to the PKCS#12 code, though we could write our own version of that if we need to later. BUG=chromium:731993 Change-Id: Ib2f43344017ed37b6bafd85a2c2b103d695020b8 Reviewed-on: https://boringssl-review.googlesource.com/17084 Reviewed-by: Adam Langley <agl@google.com>
2017-06-10 00:27:37 +01:00
evp/scrypt_test.cc
Convert aes_test to GTest. This introduces machinery to start embedding the test data files into the crypto_test binary. Figuring out every CI's test data story is more trouble than is worth it. The GTest FileTest runner is considerably different from the old one: - It returns void and expects failures to use the GTest EXPECT_* and ASSERT_* macros, rather than ExpectBytesEqual. This is more monkey work to convert, but ultimately less work to add new tests. I think it's also valuable for our FileTest and normal test patterns to align as much as possible. The line number is emitted via SCOPED_TRACE. - I've intentionally omitted the Error attribute handling, since that doesn't work very well with the new callback. This means evp_test.cc will take a little more work to convert, but this is again to keep our two test patterns aligned. - The callback takes a std::function rather than a C-style void pointer. This means we can go nuts with lambdas. It also places the path first so clang-format doesn't go nuts. BUG=129 Change-Id: I0d1920a342b00e64043e3ea05f5f5af57bfe77b3 Reviewed-on: https://boringssl-review.googlesource.com/16507 Reviewed-by: Adam Langley <agl@google.com>
2017-05-19 20:26:18 +01:00
fipsmodule/aes/aes_test.cc
Convert bn_test to GTest. BUG=129 Change-Id: I21570257c2f40a2c65587d30dbf249a546aa7d8e Reviewed-on: https://boringssl-review.googlesource.com/16885 Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-04 20:37:23 +01:00
fipsmodule/bn/bn_test.cc
Move ec/ and ecdsa/ into fipsmodule/ The names in the P-224 code collided with the P-256 code and thus many of the functions and constants in the P-224 code have been prefixed. Change-Id: I6bcd304640c539d0483d129d5eaf1702894929a8 Reviewed-on: https://boringssl-review.googlesource.com/15847 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-02 22:25:39 +01:00
fipsmodule/ec/ec_test.cc
Convert p256-x86_64_test to GTest. BUG=129 Change-Id: Ieda2c2cc08f83ae24a2dfdb243dc17b4c15ed5b2 Reviewed-on: https://boringssl-review.googlesource.com/16993 Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-09 01:04:08 +01:00
fipsmodule/ec/p256-x86_64_test.cc
Convert ECDSA tests to GTest. BUG=129 Change-Id: Ia8b0639489fea817be4bb24f0457629f0fd6a815 Reviewed-on: https://boringssl-review.googlesource.com/16947 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-06 15:22:22 +01:00
fipsmodule/ecdsa/ecdsa_test.cc
Convert a number of tests to GTest. BUG=129 Change-Id: Ifcdacb2f5f59fd03b757f88778ceb1e672208fd9 Reviewed-on: https://boringssl-review.googlesource.com/16744 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-24 05:50:35 +01:00
fipsmodule/modes/gcm_test.cc
Move much of rand/ into the FIPS module. Support for platforms that we don't support FIPS on doesn't need to be in the module. Also, functions for dealing with whether fork-unsafe buffering is enabled are left out because they aren't implementing any cryptography and they use global r/w state, making their inclusion painful. Change-Id: I71a0123db6f5449e9dfc7ec7dea0944428e661aa Reviewed-on: https://boringssl-review.googlesource.com/15084 Reviewed-by: Adam Langley <agl@google.com>
2017-04-14 19:16:20 +01:00
fipsmodule/rand/ctrdrbg_test.cc
Convert various tests to GTest. BUG=129 Change-Id: I4a501fa620b7b5b4c585731ec1ece94407e9b727 Reviewed-on: https://boringssl-review.googlesource.com/16510 Reviewed-by: Adam Langley <agl@google.com>
2017-05-20 14:48:45 +01:00
hkdf/hkdf_test.cc
Convert a number of tests to GTest. BUG=129 Change-Id: Ifcdacb2f5f59fd03b757f88778ceb1e672208fd9 Reviewed-on: https://boringssl-review.googlesource.com/16744 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-24 05:50:35 +01:00
hmac_extra/hmac_test.cc
Convert various tests to GTest. BUG=129 Change-Id: I4a501fa620b7b5b4c585731ec1ece94407e9b727 Reviewed-on: https://boringssl-review.googlesource.com/16510 Reviewed-by: Adam Langley <agl@google.com>
2017-05-20 14:48:45 +01:00
lhash/lhash_test.cc
Convert obj_tests to gtest Change-Id: I2e7b9e80419758a5ee4f53915f13334bbf8e0447 Reviewed-on: https://boringssl-review.googlesource.com/16965 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-02 13:55:16 +01:00
obj/obj_test.cc
Move pkcs{7,8}_test over to gtest BUG=129 Change-Id: I1fef45d662743e7210f93e4dc1bae0c55f75d3fe Reviewed-on: https://boringssl-review.googlesource.com/16864 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-02 12:24:46 +01:00
pkcs7/pkcs7_test.cc
pkcs8/pkcs8_test.cc
Convert remaining pkcs8 tests to gtest Change-Id: Ic22ea72b0134aa7884f1e75433dd5c18247f57ab Reviewed-on: https://boringssl-review.googlesource.com/16964 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-02 13:21:49 +01:00
pkcs8/pkcs12_test.cc
Convert a number of tests to GTest. BUG=129 Change-Id: Ifcdacb2f5f59fd03b757f88778ceb1e672208fd9 Reviewed-on: https://boringssl-review.googlesource.com/16744 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-24 05:50:35 +01:00
poly1305/poly1305_test.cc
Convert various tests to GTest. BUG=129 Change-Id: I4a501fa620b7b5b4c585731ec1ece94407e9b727 Reviewed-on: https://boringssl-review.googlesource.com/16510 Reviewed-by: Adam Langley <agl@google.com>
2017-05-20 14:48:45 +01:00
pool/pool_test.cc
refcount_test.cc
Move rsa/ to fipsmodule/rsa/ Change-Id: Id20d371ae7a88a91aaba7a9e23574eccb9caeb3c Reviewed-on: https://boringssl-review.googlesource.com/15849 Reviewed-by: David Benjamin <davidben@google.com> Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-05-03 19:50:51 +01:00
rsa_extra/rsa_test.cc
Convert various tests to GTest. BUG=129 Change-Id: I4a501fa620b7b5b4c585731ec1ece94407e9b727 Reviewed-on: https://boringssl-review.googlesource.com/16510 Reviewed-by: Adam Langley <agl@google.com>
2017-05-20 14:48:45 +01:00
test/file_test_gtest.cc
Convert thread_test to GTest. BUG=129 Change-Id: I46e83831dda9a6510c85e387578bd1ce0a86dfc4 Reviewed-on: https://boringssl-review.googlesource.com/16886 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Adam Langley <agl@google.com> Reviewed-by: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-04 20:57:20 +01:00
thread_test.cc
Convert x509_test to gtest Change-Id: I4e0da85857e820f8151e2fb50d699f14fedee97b Reviewed-on: https://boringssl-review.googlesource.com/16966 Reviewed-by: David Benjamin <davidben@google.com> Commit-Queue: David Benjamin <davidben@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-06-07 11:28:27 +01:00
x509/x509_test.cc
Convert the tests in x509v3 to GTest. Bug: 129 Change-Id: Ia9819fab436857dd6364a1f1abff49ad3e3b682a Reviewed-on: https://boringssl-review.googlesource.com/17668 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com>
2017-07-10 04:26:26 +01:00
x509v3/tab_test.cc
x509v3/v3name_test.cc
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
Convert aes_test to GTest. This introduces machinery to start embedding the test data files into the crypto_test binary. Figuring out every CI's test data story is more trouble than is worth it. The GTest FileTest runner is considerably different from the old one: - It returns void and expects failures to use the GTest EXPECT_* and ASSERT_* macros, rather than ExpectBytesEqual. This is more monkey work to convert, but ultimately less work to add new tests. I think it's also valuable for our FileTest and normal test patterns to align as much as possible. The line number is emitted via SCOPED_TRACE. - I've intentionally omitted the Error attribute handling, since that doesn't work very well with the new callback. This means evp_test.cc will take a little more work to convert, but this is again to keep our two test patterns aligned. - The callback takes a std::function rather than a C-style void pointer. This means we can go nuts with lambdas. It also places the path first so clang-format doesn't go nuts. BUG=129 Change-Id: I0d1920a342b00e64043e3ea05f5f5af57bfe77b3 Reviewed-on: https://boringssl-review.googlesource.com/16507 Reviewed-by: Adam Langley <agl@google.com>
2017-05-19 20:26:18 +01:00
$<TARGET_OBJECTS:crypto_test_data>
Rename all googletest CMake targets CMake targets are visible globally but gtest_main has boringssl-specific behavior that isn't appropriate for general use. This change makes it possible to use boringssl and abseil-cpp in the same project (since abseil-cpp expects gtest_main to exist and be useful for its own tests). Change-Id: Icc81c11b8bb4b1e21cea7c9fa725b6c082bd5369 Reviewed-on: https://boringssl-review.googlesource.com/24604 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2018-01-04 07:07:58 +00:00
$<TARGET_OBJECTS:boringssl_gtest_main>
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
$<TARGET_OBJECTS:test_support>
)
Rename all googletest CMake targets CMake targets are visible globally but gtest_main has boringssl-specific behavior that isn't appropriate for general use. This change makes it possible to use boringssl and abseil-cpp in the same project (since abseil-cpp expects gtest_main to exist and be useful for its own tests). Change-Id: Icc81c11b8bb4b1e21cea7c9fa725b6c082bd5369 Reviewed-on: https://boringssl-review.googlesource.com/24604 Reviewed-by: Adam Langley <agl@google.com> Commit-Queue: Adam Langley <agl@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2018-01-04 07:07:58 +00:00
target_link_libraries(crypto_test crypto boringssl_gtest)
Convert bio_test to GTest. BUG=129 Change-Id: Iaf07075afaa2ea447e19a8c53ec0d29560d625b3 Reviewed-on: https://boringssl-review.googlesource.com/14207 Commit-Queue: David Benjamin <davidben@google.com> Commit-Queue: Steven Valdez <svaldez@google.com> Reviewed-by: Steven Valdez <svaldez@google.com> CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
2017-03-09 06:13:07 +00:00
if (WIN32)
target_link_libraries(crypto_test ws2_32)
endif()
Do a cursory conversion of a few tests to GTest. For now, this is the laziest conversion possible. The intent is to just get the build setup ready so that we can get everything working in our consumers. The intended end state is: - The standalone build produces three test targets, one per library: {crypto,ssl,decrepit}_tests. - Each FOO_test is made up of: FOO/**/*_test.cc crypto/test/gtest_main.cc test_support - generate_build_files.py emits variables crypto_test_sources and ssl_test_sources. These variables are populated with FindCFiles, looking for *_test.cc. - The consuming file assembles those variables into the two test targets (plus decrepit) from there. This avoids having generate_build_files.py emit actual build rules. - Our standalone builders, Chromium, and Android just run the top-level test targets using whatever GTest-based reporting story they have. In transition, we start by converting one of two tests in each library to populate the three test targets. Those are added to all_tests.json and all_tests.go hacked to handle them transparently. This keeps our standalone builder working. generate_build_files.py, to start with, populates the new source lists manually and subtracts them out of the old machinery. We emit both for the time being. When this change rolls in, we'll write all the build glue needed to build the GTest-based tests and add it to consumers' continuous builders. Next, we'll subsume a file-based test and get the consumers working with that. (I.e. make sure the GTest targets can depend on a data file.) Once that's all done, we'll be sure all this will work. At that point, we start subsuming the remaining tests into the GTest targets and, asynchronously, rewriting tests to use GTest properly rather than cursory conversion here. When all non-GTest tests are gone, the old generate_build_files.py hooks will be removed, consumers updated to not depend on them, and standalone builders converted to not rely on all_tests.go, which can then be removed. (Unless bits end up being needed as a malloc test driver. I'm thinking we'll want to do something with --gtest_filter.) As part of this CL, I've bumped the CMake requirements (for target_include_directories) and added a few suppressions for warnings that GTest doesn't pass. BUG=129 Change-Id: I881b26b07a8739cc0b52dbb51a30956908e1b71a Reviewed-on: https://boringssl-review.googlesource.com/13232 Reviewed-by: Adam Langley <agl@google.com>
2017-01-20 00:05:47 +00:00
add_dependencies(all_tests crypto_test)
Reference in New Issue Copy Permalink