diff options
| author | Pete Bentley <prb@google.com> | 2019-10-02 14:44:32 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-10-02 14:45:07 +0100 |
| commit | 470a930d9734686d23d8e4cba31c7319d47b915b (patch) | |
| tree | 126461a6a9981186897891a4084acf9760fb2684 /linux-x86_64 | |
| parent | 22f5f872dbaa32b19038a9f2c45aeaa57d290cc1 (diff) | |
| download | boringssl-470a930d9734686d23d8e4cba31c7319d47b915b.tar.gz | |
external/boringssl: Sync to 6e7255c17e1a7348a2377fbc804441dd284806e2.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/3a3552247ecb0bfb260a36d9da7a3bce7fdc3f8a..6e7255c17e1a7348a2377fbc804441dd284806e2
Key changes for Android are
1458b49 Switch to using SHA-256 for FIPS integrity check on Android.
9638f8f Use a smaller hex digest in FIPS flag files when SHA-256 used.
6e7255c Use a pointer to module_hash in boringssl_fips_self_test() args.
Bug: 141710485
Test: atest CtsLibcoreTestCases CtsLibcoreOkHttpTestCases
Change-Id: Ie3900ac71bf6c8ea3e413ee4c3438b4822560df4
Diffstat (limited to 'linux-x86_64')
| -rw-r--r-- | linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S | 4 | ||||
| -rw-r--r-- | linux-x86_64/crypto/fipsmodule/aesni-x86_64.S | 12 | ||||
| -rw-r--r-- | linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S b/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S index 240cb5d4..98365a87 100644 --- a/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S +++ b/linux-x86_64/crypto/fipsmodule/aesni-gcm-x86_64.S @@ -556,13 +556,11 @@ _aesni_ctr32_6x: .align 32 aesni_gcm_encrypt: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit movb $1,BORINGSSL_function_hit+2(%rip) #endif -#endif xorq %r10,%r10 diff --git a/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S b/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S index 42e55307..de309533 100644 --- a/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S +++ b/linux-x86_64/crypto/fipsmodule/aesni-x86_64.S @@ -20,13 +20,11 @@ .align 16 aes_hw_encrypt: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit movb $1,BORINGSSL_function_hit+1(%rip) #endif -#endif movups (%rdi),%xmm2 movl 240(%rdx),%eax movups (%rdx),%xmm0 @@ -887,11 +885,9 @@ aes_hw_ecb_encrypt: .align 16 aes_hw_ctr32_encrypt_blocks: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST movb $1,BORINGSSL_function_hit(%rip) #endif -#endif cmpq $1,%rdx jne .Lctr32_bulk @@ -2111,11 +2107,9 @@ aes_hw_set_decrypt_key: aes_hw_set_encrypt_key: __aesni_set_encrypt_key: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST movb $1,BORINGSSL_function_hit+3(%rip) #endif -#endif .byte 0x48,0x83,0xEC,0x08 .cfi_adjust_cfa_offset 8 movq $-1,%rax diff --git a/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S b/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S index 0fc93f9a..8546d0d8 100644 --- a/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S +++ b/linux-x86_64/crypto/fipsmodule/vpaes-x86_64.S @@ -812,13 +812,11 @@ _vpaes_schedule_mangle: .align 16 vpaes_set_encrypt_key: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit movb $1,BORINGSSL_function_hit+5(%rip) #endif -#endif movl %esi,%eax shrl $5,%eax @@ -863,13 +861,11 @@ vpaes_set_decrypt_key: .align 16 vpaes_encrypt: .cfi_startproc -#ifndef NDEBUG -#ifndef BORINGSSL_FIPS +#ifdef BORINGSSL_DISPATCH_TEST .extern BORINGSSL_function_hit .hidden BORINGSSL_function_hit movb $1,BORINGSSL_function_hit+4(%rip) #endif -#endif movdqu (%rdi),%xmm0 call _vpaes_preheat call _vpaes_encrypt_core |