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 /mac-x86 | |
| 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 'mac-x86')
| -rw-r--r-- | mac-x86/crypto/fipsmodule/aesni-x86.S | 8 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/vpaes-x86.S | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mac-x86/crypto/fipsmodule/aesni-x86.S b/mac-x86/crypto/fipsmodule/aesni-x86.S index 17eeaeac..db7efffd 100644 --- a/mac-x86/crypto/fipsmodule/aesni-x86.S +++ b/mac-x86/crypto/fipsmodule/aesni-x86.S @@ -6,14 +6,14 @@ #include <boringssl_prefix_symbols_asm.h> #endif .text -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST #endif .globl _aes_hw_encrypt .private_extern _aes_hw_encrypt .align 4 _aes_hw_encrypt: L_aes_hw_encrypt_begin: -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST pushl %ebx pushl %edx call L000pic @@ -818,7 +818,7 @@ L_aes_hw_ctr32_encrypt_blocks_begin: pushl %ebx pushl %esi pushl %edi -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST pushl %ebx pushl %edx call L038pic @@ -2403,7 +2403,7 @@ L097bad_keybits: .align 4 _aes_hw_set_encrypt_key: L_aes_hw_set_encrypt_key_begin: -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST pushl %ebx pushl %edx call L116pic diff --git a/mac-x86/crypto/fipsmodule/vpaes-x86.S b/mac-x86/crypto/fipsmodule/vpaes-x86.S index 22043e2a..6b5a88b3 100644 --- a/mac-x86/crypto/fipsmodule/vpaes-x86.S +++ b/mac-x86/crypto/fipsmodule/vpaes-x86.S @@ -6,7 +6,7 @@ #include <boringssl_prefix_symbols_asm.h> #endif .text -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST #endif .align 6,0x90 L_vpaes_consts: @@ -468,7 +468,7 @@ L_vpaes_set_encrypt_key_begin: pushl %ebx pushl %esi pushl %edi -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST pushl %ebx pushl %edx call L016pic @@ -549,7 +549,7 @@ L_vpaes_encrypt_begin: pushl %ebx pushl %esi pushl %edi -#ifndef NDEBUG +#ifdef BORINGSSL_DISPATCH_TEST pushl %ebx pushl %edx call L019pic |