|
|
|
|
include_directories(../include)
|
|
|
|
|
|
|
|
|
|
if(NOT OPENSSL_NO_ASM)
|
|
|
|
|
if(UNIX)
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
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()
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
elseif(ARCH STREQUAL "arm")
|
|
|
|
|
if(APPLE)
|
|
|
|
|
set(PERLASM_STYLE ios32)
|
|
|
|
|
else()
|
|
|
|
|
set(PERLASM_STYLE linux32)
|
|
|
|
|
endif()
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
elseif(ARCH STREQUAL "ppc64le")
|
|
|
|
|
set(PERLASM_STYLE linux64le)
|
|
|
|
|
else()
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
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")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# CMake does not add -isysroot and -arch flags to assembly.
|
|
|
|
|
if(APPLE)
|
|
|
|
|
if(CMAKE_OSX_SYSROOT)
|
|
|
|
|
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -isysroot \"${CMAKE_OSX_SYSROOT}\"")
|
|
|
|
|
endif()
|
|
|
|
|
foreach(arch ${CMAKE_OSX_ARCHITECTURES})
|
|
|
|
|
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -arch ${arch}")
|
|
|
|
|
endforeach()
|
|
|
|
|
endif()
|
|
|
|
|
else()
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "aarch64")
|
|
|
|
|
set(PERLASM_STYLE win64)
|
|
|
|
|
set(ASM_EXT S)
|
|
|
|
|
enable_language(ASM)
|
|
|
|
|
else()
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "x86_64")
|
|
|
|
|
set(PERLASM_STYLE nasm)
|
|
|
|
|
else()
|
|
|
|
|
set(PERLASM_STYLE win32n)
|
|
|
|
|
set(PERLASM_FLAGS "-DOPENSSL_IA32_SSE2")
|
|
|
|
|
endif()
|
|
|
|
|
set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -gcv8")
|
|
|
|
|
|
|
|
|
|
# On Windows, we use the NASM output.
|
|
|
|
|
set(ASM_EXT asm)
|
|
|
|
|
enable_language(ASM_NASM)
|
|
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
function(perlasm dest src)
|
|
|
|
|
get_filename_component(dir ${dest} DIRECTORY)
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(dir STREQUAL "")
|
|
|
|
|
set(dir ".")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT ${dest}
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}
|
|
|
|
|
COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${PERLASM_STYLE} ${PERLASM_FLAGS} ${ARGN} ${dest}
|
|
|
|
|
DEPENDS
|
|
|
|
|
${src}
|
|
|
|
|
${PROJECT_SOURCE_DIR}/crypto/perlasm/arm-xlate.pl
|
|
|
|
|
${PROJECT_SOURCE_DIR}/crypto/perlasm/ppc-xlate.pl
|
|
|
|
|
${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 .
|
|
|
|
|
)
|
|
|
|
|
endfunction()
|
|
|
|
|
|
|
|
|
|
add_subdirectory(fipsmodule)
|
|
|
|
|
add_subdirectory(test)
|
|
|
|
|
|
|
|
|
|
if(FIPS_DELOCATE OR FIPS_SHARED)
|
|
|
|
|
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()
|
|
|
|
|
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "arm")
|
|
|
|
|
set(
|
|
|
|
|
CRYPTO_ARCH_SOURCES
|
|
|
|
|
|
|
|
|
|
chacha/chacha-armv4.${ASM_EXT}
|
|
|
|
|
curve25519/asm/x25519-asm-arm.S
|
|
|
|
|
poly1305/poly1305_arm_asm.S
|
|
|
|
|
test/trampoline-armv4.${ASM_EXT}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "aarch64")
|
|
|
|
|
set(
|
|
|
|
|
CRYPTO_ARCH_SOURCES
|
|
|
|
|
|
|
|
|
|
chacha/chacha-armv8.${ASM_EXT}
|
|
|
|
|
test/trampoline-armv8.${ASM_EXT}
|
ChaCha20-Poly1305 for Armv8 (AArch64)
This work continues on top of the CL opened by Vlad Krasnov
(https://boringssl-review.googlesource.com/c/boringssl/+/44364). The
CL was thoroughly reviewed by David Benjamin but not merged due to
some outstanding comments which this work addresses:
- The flag check when doing the final reduction in poly1305 was
changed from `eq` to `cs`
- The CFI prologues and epilogues of open/seal were modified as
recommended by David.
- Added Pointer Authentication instruction to the functions that are
exported from the assembly code as pointed out by David.
Testing:
- The current tests against ChaCha20-Poly1305 continue to pass.
- More test vectors were produced using a Python script to try and
prove that having `eq` instead of `cs` was a bug. They passed as
well, but didn't result in the most significant word being
non-zero after the reduction, which would have highlighted the
bug. An argument about why it's unlikely to find the vector is
detailed below.
- `objdump -W|Wf|WF` was used to confirm the value of the CFA and the
locations of the registers relative to the CFA were as expected. See
https://www.imperialviolet.org/2017/01/18/cfi.html.
Performance:
| Size | Before (MB/s) | After (MB/s) | Improvement |
| 16 bytes | 30.5 | 43.3 | 1.42x |
| 256 bytes | 220.7 | 361.5 | 1.64x |
| 1350 bytes | 285.9 | 639.4 | 2.24x |
| 8192 bytes | 329.6 | 798.3 | 2.42x |
| 16384 bytes | 331.9 | 814.9 | 2.46x |
Explanation of the unlikelihood of finding a test vector:
* the modulus is in t2:t1:t0 = 3 : FF..FF : FF..FB, each being a 64 bit
word; i.e. t2 = 3, t1 = all 1s.
* acc2 <= 4 after the previous reduction.
* It is highly likely to have borrow = 1 from acc1 - t1 since t1 is
all FFs.
* So for almost all test vectors we have acc2 <= 4 and borrow = 1,
thus (t2 = acc2 - t2 - borrow) will be 0 whenever acc >
modulus. **It would be highly unlikely to find such a test vector
with t2 > 0 after that final reduction:** Trying to craft that
vector requires having acc and r of high values before their
multiplication, yet ensuring that after the reduction (see Note) of
their product, the resulting value of the accumulator has t2 = 4,
all 1s in t1 and most of t0 so that no borrow occurs from acc1:acc0
- t1:t0.
* Note: the reduction is basically carried by folding over the top
64+62 bits once, then folding them again shifted left by 2,
resulting in adding 5 times those bits.
Change-Id: If7d86b7a9b74ec3615ac2d7a97f80100dbfaee7f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/51885
Reviewed-by: Adam Langley <alangley@gmail.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
cipher_extra/chacha20_poly1305_armv8.${ASM_EXT}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "ppc64le")
|
|
|
|
|
set(
|
|
|
|
|
CRYPTO_ARCH_SOURCES
|
|
|
|
|
|
|
|
|
|
test/trampoline-ppc.${ASM_EXT}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "x86")
|
|
|
|
|
set(
|
|
|
|
|
CRYPTO_ARCH_SOURCES
|
|
|
|
|
|
|
|
|
|
chacha/chacha-x86.${ASM_EXT}
|
|
|
|
|
test/trampoline-x86.${ASM_EXT}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
Avoid double-expanding variables in CMake.
CMake's language is rather fragile and unsound. For the most part, it is
a shell script with more parentheses. That is, it simply expands command
arguments into a list of strings and then evaluates it, complete with
shell-style differences between "${FOO}" and ${FOO}.
The if() command is special and internally also expands variables. That
is why things like if(FOO STREQUAL "BAR") work. CMake interprets "FOO"
as a variable if it can find a variable, or a string otherwise. In
addition to getting very confused on typos, it means that
if("${FOO}" STREQUAL "BAR") will double-expand, and it will do strange
things if BAR is a variable.
CMP0054 patches this (which we set by minimum version) so that if() only
expands if the token was unquoted. This fixes
if("${FOO}" STREQUAL "BAR"). However, if(${FOO} STREQUAL "BAR")
continues to double-expand FOO.
We had a mix of all three of FOO, ${FOO}, and "${FOO}". It's not clear
which is the canonical spelling at this point, but CMake own files
(mostly) use FOO, as do most of our lines, so I've standardized on that.
It's a little unsatisfying if we typo a variable, but I suppose ${FOO}
also silently ignores unset variables.
Bug: 423
Change-Id: Ib6baa27f4065eed159e8fb28820b71a0c99e0db0
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/48705
Reviewed-by: Adam Langley <agl@google.com>
4 years ago
|
|
|
if(ARCH STREQUAL "x86_64")
|
|
|
|
|
set(
|
|
|
|
|
CRYPTO_ARCH_SOURCES
|
|
|
|
|
|
|
|
|
|
chacha/chacha-x86_64.${ASM_EXT}
|
|
|
|
|
cipher_extra/aes128gcmsiv-x86_64.${ASM_EXT}
|
|
|
|
|
cipher_extra/chacha20_poly1305_x86_64.${ASM_EXT}
|
|
|
|
|
hrss/asm/poly_rq_mul.S
|
|
|
|
|
test/trampoline-x86_64.${ASM_EXT}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
perlasm(chacha/chacha-armv4.${ASM_EXT} chacha/asm/chacha-armv4.pl)
|
|
|
|
|
perlasm(chacha/chacha-armv8.${ASM_EXT} chacha/asm/chacha-armv8.pl)
|
|
|
|
|
perlasm(chacha/chacha-x86.${ASM_EXT} chacha/asm/chacha-x86.pl)
|
|
|
|
|
perlasm(chacha/chacha-x86_64.${ASM_EXT} chacha/asm/chacha-x86_64.pl)
|
|
|
|
|
perlasm(cipher_extra/aes128gcmsiv-x86_64.${ASM_EXT} cipher_extra/asm/aes128gcmsiv-x86_64.pl)
|
|
|
|
|
perlasm(cipher_extra/chacha20_poly1305_x86_64.${ASM_EXT} cipher_extra/asm/chacha20_poly1305_x86_64.pl)
|
ChaCha20-Poly1305 for Armv8 (AArch64)
This work continues on top of the CL opened by Vlad Krasnov
(https://boringssl-review.googlesource.com/c/boringssl/+/44364). The
CL was thoroughly reviewed by David Benjamin but not merged due to
some outstanding comments which this work addresses:
- The flag check when doing the final reduction in poly1305 was
changed from `eq` to `cs`
- The CFI prologues and epilogues of open/seal were modified as
recommended by David.
- Added Pointer Authentication instruction to the functions that are
exported from the assembly code as pointed out by David.
Testing:
- The current tests against ChaCha20-Poly1305 continue to pass.
- More test vectors were produced using a Python script to try and
prove that having `eq` instead of `cs` was a bug. They passed as
well, but didn't result in the most significant word being
non-zero after the reduction, which would have highlighted the
bug. An argument about why it's unlikely to find the vector is
detailed below.
- `objdump -W|Wf|WF` was used to confirm the value of the CFA and the
locations of the registers relative to the CFA were as expected. See
https://www.imperialviolet.org/2017/01/18/cfi.html.
Performance:
| Size | Before (MB/s) | After (MB/s) | Improvement |
| 16 bytes | 30.5 | 43.3 | 1.42x |
| 256 bytes | 220.7 | 361.5 | 1.64x |
| 1350 bytes | 285.9 | 639.4 | 2.24x |
| 8192 bytes | 329.6 | 798.3 | 2.42x |
| 16384 bytes | 331.9 | 814.9 | 2.46x |
Explanation of the unlikelihood of finding a test vector:
* the modulus is in t2:t1:t0 = 3 : FF..FF : FF..FB, each being a 64 bit
word; i.e. t2 = 3, t1 = all 1s.
* acc2 <= 4 after the previous reduction.
* It is highly likely to have borrow = 1 from acc1 - t1 since t1 is
all FFs.
* So for almost all test vectors we have acc2 <= 4 and borrow = 1,
thus (t2 = acc2 - t2 - borrow) will be 0 whenever acc >
modulus. **It would be highly unlikely to find such a test vector
with t2 > 0 after that final reduction:** Trying to craft that
vector requires having acc and r of high values before their
multiplication, yet ensuring that after the reduction (see Note) of
their product, the resulting value of the accumulator has t2 = 4,
all 1s in t1 and most of t0 so that no borrow occurs from acc1:acc0
- t1:t0.
* Note: the reduction is basically carried by folding over the top
64+62 bits once, then folding them again shifted left by 2,
resulting in adding 5 times those bits.
Change-Id: If7d86b7a9b74ec3615ac2d7a97f80100dbfaee7f
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/51885
Reviewed-by: Adam Langley <alangley@gmail.com>
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
perlasm(cipher_extra/chacha20_poly1305_armv8.${ASM_EXT} cipher_extra/asm/chacha20_poly1305_armv8.pl)
|
|
|
|
|
perlasm(test/trampoline-armv4.${ASM_EXT} test/asm/trampoline-armv4.pl)
|
|
|
|
|
perlasm(test/trampoline-armv8.${ASM_EXT} test/asm/trampoline-armv8.pl)
|
|
|
|
|
perlasm(test/trampoline-ppc.${ASM_EXT} test/asm/trampoline-ppc.pl)
|
|
|
|
|
perlasm(test/trampoline-x86.${ASM_EXT} test/asm/trampoline-x86.pl)
|
|
|
|
|
perlasm(test/trampoline-x86_64.${ASM_EXT} test/asm/trampoline-x86_64.pl)
|
|
|
|
|
|
|
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT err_data.c
|
|
|
|
|
COMMAND ${GO_EXECUTABLE} run err_data_generate.go > ${CMAKE_CURRENT_BINARY_DIR}/err_data.c
|
|
|
|
|
DEPENDS
|
|
|
|
|
err/err_data_generate.go
|
|
|
|
|
err/asn1.errordata
|
|
|
|
|
err/bio.errordata
|
|
|
|
|
err/bn.errordata
|
|
|
|
|
err/cipher.errordata
|
|
|
|
|
err/conf.errordata
|
|
|
|
|
err/dh.errordata
|
|
|
|
|
err/digest.errordata
|
|
|
|
|
err/dsa.errordata
|
|
|
|
|
err/ecdh.errordata
|
|
|
|
|
err/ecdsa.errordata
|
|
|
|
|
err/ec.errordata
|
|
|
|
|
err/engine.errordata
|
|
|
|
|
err/evp.errordata
|
|
|
|
|
err/hkdf.errordata
|
|
|
|
|
err/obj.errordata
|
|
|
|
|
err/pem.errordata
|
|
|
|
|
err/pkcs7.errordata
|
|
|
|
|
err/pkcs8.errordata
|
|
|
|
|
err/rsa.errordata
|
|
|
|
|
err/ssl.errordata
|
|
|
|
|
err/trust_token.errordata
|
|
|
|
|
err/x509.errordata
|
|
|
|
|
err/x509v3.errordata
|
|
|
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/err
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_library(
|
|
|
|
|
crypto
|
|
|
|
|
|
|
|
|
|
asn1/a_bitstr.c
|
|
|
|
|
asn1/a_bool.c
|
|
|
|
|
asn1/a_d2i_fp.c
|
|
|
|
|
asn1/a_dup.c
|
|
|
|
|
asn1/a_gentm.c
|
|
|
|
|
asn1/a_i2d_fp.c
|
|
|
|
|
asn1/a_int.c
|
|
|
|
|
asn1/a_mbstr.c
|
|
|
|
|
asn1/a_object.c
|
|
|
|
|
asn1/a_octet.c
|
|
|
|
|
asn1/a_strex.c
|
|
|
|
|
asn1/a_strnid.c
|
|
|
|
|
asn1/a_time.c
|
|
|
|
|
asn1/a_type.c
|
|
|
|
|
asn1/a_utctm.c
|
|
|
|
|
asn1/asn1_lib.c
|
|
|
|
|
asn1/asn1_par.c
|
|
|
|
|
asn1/asn_pack.c
|
|
|
|
|
asn1/f_int.c
|
|
|
|
|
asn1/f_string.c
|
|
|
|
|
asn1/tasn_dec.c
|
|
|
|
|
asn1/tasn_enc.c
|
|
|
|
|
asn1/tasn_fre.c
|
|
|
|
|
asn1/tasn_new.c
|
|
|
|
|
asn1/tasn_typ.c
|
|
|
|
|
asn1/tasn_utl.c
|
|
|
|
|
asn1/posix_time.c
|
|
|
|
|
base64/base64.c
|
|
|
|
|
bio/bio.c
|
|
|
|
|
bio/bio_mem.c
|
|
|
|
|
bio/connect.c
|
|
|
|
|
bio/fd.c
|
|
|
|
|
bio/file.c
|
|
|
|
|
bio/hexdump.c
|
|
|
|
|
bio/pair.c
|
|
|
|
|
bio/printf.c
|
|
|
|
|
bio/socket.c
|
|
|
|
|
bio/socket_helper.c
|
|
|
|
|
blake2/blake2.c
|
|
|
|
|
bn_extra/bn_asn1.c
|
|
|
|
|
bn_extra/convert.c
|
|
|
|
|
buf/buf.c
|
|
|
|
|
bytestring/asn1_compat.c
|
|
|
|
|
bytestring/ber.c
|
|
|
|
|
bytestring/cbb.c
|
|
|
|
|
bytestring/cbs.c
|
|
|
|
|
bytestring/unicode.c
|
|
|
|
|
chacha/chacha.c
|
|
|
|
|
cipher_extra/cipher_extra.c
|
|
|
|
|
cipher_extra/derive_key.c
|
|
|
|
|
cipher_extra/e_aesctrhmac.c
|
|
|
|
|
cipher_extra/e_aesgcmsiv.c
|
|
|
|
|
cipher_extra/e_chacha20poly1305.c
|
|
|
|
|
cipher_extra/e_des.c
|
|
|
|
|
cipher_extra/e_null.c
|
|
|
|
|
cipher_extra/e_rc2.c
|
|
|
|
|
cipher_extra/e_rc4.c
|
|
|
|
|
cipher_extra/e_tls.c
|
|
|
|
|
cipher_extra/tls_cbc.c
|
|
|
|
|
conf/conf.c
|
|
|
|
|
cpu_aarch64_apple.c
|
|
|
|
|
cpu_aarch64_freebsd.c
|
|
|
|
|
cpu_aarch64_fuchsia.c
|
|
|
|
|
cpu_aarch64_linux.c
|
|
|
|
|
cpu_aarch64_win.c
|
|
|
|
|
cpu_arm_freebsd.c
|
|
|
|
|
cpu_arm_linux.c
|
|
|
|
|
cpu_arm.c
|
|
|
|
|
cpu_intel.c
|
|
|
|
|
cpu_ppc64le.c
|
|
|
|
|
crypto.c
|
|
|
|
|
curve25519/curve25519.c
|
|
|
|
|
curve25519/spake25519.c
|
|
|
|
|
des/des.c
|
|
|
|
|
dh_extra/params.c
|
|
|
|
|
dh_extra/dh_asn1.c
|
|
|
|
|
digest_extra/digest_extra.c
|
|
|
|
|
dsa/dsa.c
|
|
|
|
|
dsa/dsa_asn1.c
|
|
|
|
|
ecdh_extra/ecdh_extra.c
|
|
|
|
|
ecdsa_extra/ecdsa_asn1.c
|
|
|
|
|
ec_extra/ec_asn1.c
|
|
|
|
|
ec_extra/ec_derive.c
|
|
|
|
|
ec_extra/hash_to_curve.c
|
|
|
|
|
err/err.c
|
|
|
|
|
err_data.c
|
|
|
|
|
engine/engine.c
|
|
|
|
|
evp/evp.c
|
|
|
|
|
evp/evp_asn1.c
|
|
|
|
|
evp/evp_ctx.c
|
|
|
|
|
evp/p_dsa_asn1.c
|
|
|
|
|
evp/p_ec.c
|
|
|
|
|
evp/p_ec_asn1.c
|
|
|
|
|
evp/p_ed25519.c
|
|
|
|
|
evp/p_ed25519_asn1.c
|
|
|
|
|
evp/p_hkdf.c
|
|
|
|
|
evp/p_rsa.c
|
|
|
|
|
evp/p_rsa_asn1.c
|
|
|
|
|
evp/p_x25519.c
|
|
|
|
|
evp/p_x25519_asn1.c
|
|
|
|
|
evp/pbkdf.c
|
|
|
|
|
evp/print.c
|
|
|
|
|
evp/scrypt.c
|
|
|
|
|
evp/sign.c
|
|
|
|
|
ex_data.c
|
|
|
|
|
hkdf/hkdf.c
|
|
|
|
|
hpke/hpke.c
|
|
|
|
|
hrss/hrss.c
|
|
|
|
|
lhash/lhash.c
|
|
|
|
|
mem.c
|
|
|
|
|
obj/obj.c
|
|
|
|
|
obj/obj_xref.c
|
|
|
|
|
pem/pem_all.c
|
|
|
|
|
pem/pem_info.c
|
|
|
|
|
pem/pem_lib.c
|
|
|
|
|
pem/pem_oth.c
|
|
|
|
|
pem/pem_pk8.c
|
|
|
|
|
pem/pem_pkey.c
|
|
|
|
|
pem/pem_x509.c
|
|
|
|
|
pem/pem_xaux.c
|
|
|
|
|
pkcs7/pkcs7.c
|
|
|
|
|
pkcs7/pkcs7_x509.c
|
|
|
|
|
pkcs8/pkcs8.c
|
|
|
|
|
pkcs8/pkcs8_x509.c
|
|
|
|
|
pkcs8/p5_pbev2.c
|
|
|
|
|
poly1305/poly1305.c
|
|
|
|
|
poly1305/poly1305_arm.c
|
|
|
|
|
poly1305/poly1305_vec.c
|
|
|
|
|
pool/pool.c
|
|
|
|
|
rand_extra/deterministic.c
|
|
|
|
|
rand_extra/forkunsafe.c
|
|
|
|
|
rand_extra/fuchsia.c
|
|
|
|
|
rand_extra/passive.c
|
|
|
|
|
rand_extra/rand_extra.c
|
|
|
|
|
rand_extra/windows.c
|
|
|
|
|
rc4/rc4.c
|
|
|
|
|
refcount_c11.c
|
|
|
|
|
refcount_lock.c
|
|
|
|
|
rsa_extra/rsa_asn1.c
|
|
|
|
|
rsa_extra/rsa_print.c
|
|
|
|
|
stack/stack.c
|
|
|
|
|
siphash/siphash.c
|
|
|
|
|
thread.c
|
|
|
|
|
thread_none.c
|
|
|
|
|
thread_pthread.c
|
|
|
|
|
thread_win.c
|
|
|
|
|
trust_token/pmbtoken.c
|
|
|
|
|
trust_token/trust_token.c
|
|
|
|
|
trust_token/voprf.c
|
|
|
|
|
x509/a_digest.c
|
|
|
|
|
x509/a_sign.c
|
|
|
|
|
x509/a_verify.c
|
|
|
|
|
x509/algorithm.c
|
|
|
|
|
x509/asn1_gen.c
|
|
|
|
|
x509/by_dir.c
|
|
|
|
|
x509/by_file.c
|
|
|
|
|
x509/i2d_pr.c
|
|
|
|
|
x509/name_print.c
|
|
|
|
|
x509/rsa_pss.c
|
|
|
|
|
x509/t_crl.c
|
|
|
|
|
x509/t_req.c
|
|
|
|
|
x509/t_x509.c
|
|
|
|
|
x509/t_x509a.c
|
|
|
|
|
x509/x509.c
|
|
|
|
|
x509/x509_att.c
|
|
|
|
|
x509/x509_cmp.c
|
|
|
|
|
x509/x509_d2.c
|
|
|
|
|
x509/x509_def.c
|
|
|
|
|
x509/x509_ext.c
|
|
|
|
|
x509/x509_lu.c
|
|
|
|
|
x509/x509_obj.c
|
|
|
|
|
x509/x509_req.c
|
|
|
|
|
x509/x509_set.c
|
|
|
|
|
x509/x509_trs.c
|
|
|
|
|
x509/x509_txt.c
|
|
|
|
|
x509/x509_v3.c
|
|
|
|
|
x509/x509_vfy.c
|
|
|
|
|
x509/x509_vpm.c
|
|
|
|
|
x509/x509cset.c
|
|
|
|
|
x509/x509name.c
|
|
|
|
|
x509/x509rset.c
|
|
|
|
|
x509/x509spki.c
|
|
|
|
|
x509/x_algor.c
|
|
|
|
|
x509/x_all.c
|
|
|
|
|
x509/x_attrib.c
|
|
|
|
|
x509/x_crl.c
|
|
|
|
|
x509/x_exten.c
|
|
|
|
|
x509/x_info.c
|
|
|
|
|
x509/x_name.c
|
|
|
|
|
x509/x_pkey.c
|
|
|
|
|
x509/x_pubkey.c
|
|
|
|
|
x509/x_req.c
|
|
|
|
|
x509/x_sig.c
|
|
|
|
|
x509/x_spki.c
|
|
|
|
|
x509/x_val.c
|
|
|
|
|
x509/x_x509.c
|
|
|
|
|
x509/x_x509a.c
|
|
|
|
|
x509v3/pcy_cache.c
|
|
|
|
|
x509v3/pcy_data.c
|
|
|
|
|
x509v3/pcy_map.c
|
|
|
|
|
x509v3/pcy_node.c
|
|
|
|
|
x509v3/pcy_tree.c
|
|
|
|
|
x509v3/v3_akey.c
|
|
|
|
|
x509v3/v3_akeya.c
|
|
|
|
|
x509v3/v3_alt.c
|
|
|
|
|
x509v3/v3_bcons.c
|
|
|
|
|
x509v3/v3_bitst.c
|
|
|
|
|
x509v3/v3_conf.c
|
|
|
|
|
x509v3/v3_cpols.c
|
|
|
|
|
x509v3/v3_crld.c
|
|
|
|
|
x509v3/v3_enum.c
|
|
|
|
|
x509v3/v3_extku.c
|
|
|
|
|
x509v3/v3_genn.c
|
|
|
|
|
x509v3/v3_ia5.c
|
|
|
|
|
x509v3/v3_info.c
|
|
|
|
|
x509v3/v3_int.c
|
|
|
|
|
x509v3/v3_lib.c
|
|
|
|
|
x509v3/v3_ncons.c
|
|
|
|
|
x509v3/v3_ocsp.c
|
|
|
|
|
x509v3/v3_pci.c
|
|
|
|
|
x509v3/v3_pcia.c
|
|
|
|
|
x509v3/v3_pcons.c
|
|
|
|
|
x509v3/v3_pmaps.c
|
|
|
|
|
x509v3/v3_prn.c
|
|
|
|
|
x509v3/v3_purp.c
|
|
|
|
|
x509v3/v3_skey.c
|
|
|
|
|
x509v3/v3_utl.c
|
|
|
|
|
|
|
|
|
|
$<TARGET_OBJECTS:fipsmodule>
|
|
|
|
|
|
|
|
|
|
${CRYPTO_ARCH_SOURCES}
|
|
|
|
|
${CRYPTO_FIPS_OBJECTS}
|
|
|
|
|
)
|
|
|
|
|
target_include_directories(crypto INTERFACE
|
|
|
|
|
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
|
|
|
|
|
$<INSTALL_INTERFACE:include>
|
|
|
|
|
)
|
|
|
|
|
install(TARGETS crypto EXPORT OpenSSLTargets
|
|
|
|
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
|
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
|
|
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
|
|
|
)
|
|
|
|
|
set_property(TARGET crypto PROPERTY EXPORT_NAME Crypto)
|
|
|
|
|
|
|
|
|
|
if(FIPS_SHARED)
|
|
|
|
|
# Rewrite libcrypto.so to inject the correct module hash value. This assumes
|
|
|
|
|
# UNIX-style library naming, but we only support FIPS mode on Linux anyway.
|
|
|
|
|
add_custom_command(
|
|
|
|
|
TARGET crypto POST_BUILD
|
|
|
|
|
COMMAND ${GO_EXECUTABLE} run
|
|
|
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../util/fipstools/inject_hash/inject_hash.go
|
|
|
|
|
-o libcrypto.so -in-object libcrypto.so
|
|
|
|
|
# The DEPENDS argument to a POST_BUILD rule appears to be ignored. Thus
|
|
|
|
|
# go_executable isn't used (as it doesn't get built), but we list this
|
|
|
|
|
# dependency anyway in case it starts working in some CMake version.
|
|
|
|
|
DEPENDS ../util/fipstools/inject_hash/inject_hash.go
|
|
|
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
add_dependencies(crypto global_target)
|
|
|
|
|
|
|
|
|
|
if(FIPS_DELOCATE OR FIPS_SHARED)
|
|
|
|
|
add_dependencies(crypto bcm_o_target)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
SET_TARGET_PROPERTIES(crypto PROPERTIES LINKER_LANGUAGE C)
|
|
|
|
|
|
|
|
|
|
if(WIN32)
|
|
|
|
|
target_link_libraries(crypto ws2_32)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(NOT ANDROID)
|
|
|
|
|
find_package(Threads REQUIRED)
|
|
|
|
|
target_link_libraries(crypto Threads::Threads)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# Every target depends on crypto, so we add libcxx as a dependency here to
|
|
|
|
|
# simplify injecting it everywhere.
|
|
|
|
|
if(USE_CUSTOM_LIBCXX)
|
|
|
|
|
target_link_libraries(crypto libcxx)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# urandom_test is a separate binary because it needs to be able to observe the
|
|
|
|
|
# PRNG initialisation, which means that it can't have other tests running before
|
|
|
|
|
# it does.
|
|
|
|
|
add_executable(
|
|
|
|
|
urandom_test
|
|
|
|
|
|
|
|
|
|
fipsmodule/rand/urandom_test.cc
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
target_link_libraries(urandom_test test_support_lib boringssl_gtest crypto)
|
|
|
|
|
|
|
|
|
|
add_dependencies(urandom_test global_target)
|
|
|
|
|
add_dependencies(all_tests urandom_test)
|
|
|
|
|
|
|
|
|
|
add_executable(
|
|
|
|
|
crypto_test
|
|
|
|
|
|
|
|
|
|
abi_self_test.cc
|
|
|
|
|
asn1/asn1_test.cc
|
|
|
|
|
base64/base64_test.cc
|
|
|
|
|
bio/bio_test.cc
|
|
|
|
|
blake2/blake2_test.cc
|
|
|
|
|
buf/buf_test.cc
|
|
|
|
|
bytestring/bytestring_test.cc
|
|
|
|
|
chacha/chacha_test.cc
|
|
|
|
|
cipher_extra/aead_test.cc
|
|
|
|
|
cipher_extra/cipher_test.cc
|
|
|
|
|
compiler_test.cc
|
|
|
|
|
conf/conf_test.cc
|
|
|
|
|
constant_time_test.cc
|
|
|
|
|
cpu_arm_linux_test.cc
|
|
|
|
|
crypto_test.cc
|
|
|
|
|
curve25519/ed25519_test.cc
|
|
|
|
|
curve25519/spake25519_test.cc
|
|
|
|
|
curve25519/x25519_test.cc
|
|
|
|
|
ecdh_extra/ecdh_test.cc
|
|
|
|
|
dh_extra/dh_test.cc
|
|
|
|
|
digest_extra/digest_test.cc
|
|
|
|
|
dsa/dsa_test.cc
|
|
|
|
|
err/err_test.cc
|
|
|
|
|
evp/evp_extra_test.cc
|
|
|
|
|
evp/evp_test.cc
|
|
|
|
|
evp/pbkdf_test.cc
|
|
|
|
|
evp/scrypt_test.cc
|
|
|
|
|
fipsmodule/aes/aes_test.cc
|
|
|
|
|
fipsmodule/bn/bn_test.cc
|
|
|
|
|
fipsmodule/cmac/cmac_test.cc
|
|
|
|
|
fipsmodule/ec/ec_test.cc
|
P-256 assembly optimisations for Aarch64.
The ARMv8 assembly code in this commit is mostly taken from OpenSSL's `ecp_nistz256-armv8.pl` at https://github.com/openssl/openssl/blob/19e277dd19f2897f6a7b7eb236abe46655e575bf/crypto/ec/asm/ecp_nistz256-armv8.pl (see Note 1), adapting it to the implementation in p256-x86_64.c.
Most of the assembly functions found in `crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl` required to support that code have their analogous functions in the imported OpenSSL ARMv8 Perl assembly implementation with the exception of the functions:
- ecp_nistz256_select_w5
- ecp_nistz256_select_w7
An implementation for these functions was added.
Summary of modifications to the imported code:
* Renamed to `p256-armv8-asm.pl`
* Modified the location of `arm-xlate.pl` and `arm_arch.h`
* Replaced the `scatter-gather subroutines` with `select subroutines`. The `select subroutines` are implemented for ARMv8 similarly to their x86_64 counterparts, `ecp_nistz256_select_w5` and `ecp_nistz256_select_w7`.
* `ecp_nistz256_add` is removed because it was conflicting during the static build with the function of the same name in p256-nistz.c. The latter calls another assembly function, `ecp_nistz256_point_add`.
* `__ecp_nistz256_add` renamed to `__ecp_nistz256_add_to` to avoid the conflict with the function `ecp_nistz256_add` during the static build.
* l. 924 `add sp,sp,#256` the calculation of the constant, 32*(12-4), is not left for the assembler to perform.
Other modifications:
* `beeu_mod_inverse_vartime()` was implemented for AArch64 in `p256_beeu-armv8-asm.pl` similarly to its implementation in `p256_beeu-x86_64-asm.pl`.
* The files containing `p256-x86_64` in their name were renamed to, `p256-nistz` since the functions and tests defined in them are hereby running on ARMv8 as well, if enabled.
* Updated `delocate.go` and `delocate.peg` to handle the offset calculation in the assembly instructions.
* Regenerated `delocate.peg.go`.
Notes:
1- The last commit in the history of the file is in master only, the previous commits are in OpenSSL 3.0.1
2- This change focuses on AArch64 (64-bit architecture of ARMv8). It does not support ARMv4 or ARMv7.
Testing the performance on Armv8 platform using -DCMAKE_BUILD_TYPE=Release:
Before:
```
Did 2596 ECDH P-256 operations in 1093956us (2373.0 ops/sec)
Did 6996 ECDSA P-256 signing operations in 1044630us (6697.1 ops/sec)
Did 2970 ECDSA P-256 verify operations in 1084848us (2737.7 ops/sec)
```
After:
```
Did 6699 ECDH P-256 operations in 1091684us (6136.4 ops/sec)
Did 20000 ECDSA P-256 signing operations in 1012944us (19744.4 ops/sec)
Did 7051 ECDSA P-256 verify operations in 1060000us (6651.9 ops/sec)
```
Change-Id: I9fdef12db365967a9264b5b32c07967b55ea48bd
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/51805
Reviewed-by: Adam Langley <agl@google.com>
Commit-Queue: Adam Langley <agl@google.com>
3 years ago
|
|
|
fipsmodule/ec/p256-nistz_test.cc
|
|
|
|
|
fipsmodule/ecdsa/ecdsa_test.cc
|
|
|
|
|
fipsmodule/md5/md5_test.cc
|
|
|
|
|
fipsmodule/modes/gcm_test.cc
|
|
|
|
|
fipsmodule/rand/ctrdrbg_test.cc
|
|
|
|
|
fipsmodule/rand/fork_detect_test.cc
|
|
|
|
|
fipsmodule/service_indicator/service_indicator_test.cc
|
|
|
|
|
fipsmodule/sha/sha_test.cc
|
|
|
|
|
hkdf/hkdf_test.cc
|
|
|
|
|
hpke/hpke_test.cc
|
|
|
|
|
hmac_extra/hmac_test.cc
|
|
|
|
|
hrss/hrss_test.cc
|
|
|
|
|
impl_dispatch_test.cc
|
|
|
|
|
lhash/lhash_test.cc
|
|
|
|
|
obj/obj_test.cc
|
|
|
|
|
pem/pem_test.cc
|
|
|
|
|
pkcs7/pkcs7_test.cc
|
|
|
|
|
pkcs8/pkcs8_test.cc
|
|
|
|
|
pkcs8/pkcs12_test.cc
|
|
|
|
|
poly1305/poly1305_test.cc
|
|
|
|
|
pool/pool_test.cc
|
|
|
|
|
rand_extra/rand_test.cc
|
|
|
|
|
refcount_test.cc
|
|
|
|
|
rsa_extra/rsa_test.cc
|
|
|
|
|
self_test.cc
|
|
|
|
|
stack/stack_test.cc
|
|
|
|
|
siphash/siphash_test.cc
|
|
|
|
|
test/file_test_gtest.cc
|
|
|
|
|
thread_test.cc
|
|
|
|
|
trust_token/trust_token_test.cc
|
|
|
|
|
x509/x509_test.cc
|
|
|
|
|
x509/x509_time_test.cc
|
|
|
|
|
x509v3/tab_test.cc
|
|
|
|
|
|
|
|
|
|
$<TARGET_OBJECTS:crypto_test_data>
|
|
|
|
|
$<TARGET_OBJECTS:boringssl_gtest_main>
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
add_dependencies(crypto_test global_target)
|
|
|
|
|
|
|
|
|
|
target_link_libraries(crypto_test test_support_lib boringssl_gtest crypto)
|
|
|
|
|
if(WIN32)
|
|
|
|
|
target_link_libraries(crypto_test ws2_32)
|
|
|
|
|
endif()
|
|
|
|
|
add_dependencies(all_tests crypto_test)
|
