diff options
| author | Robert Sloan <varomodt@google.com> | 2017-04-17 10:52:19 -0700 |
|---|---|---|
| committer | Rob Sloan <varomodt@google.com> | 2017-04-21 15:32:53 +0000 |
| commit | 572a4e2e687520da9e518528d7371b794b1decc0 (patch) | |
| tree | 01e37d6026a12b36b9c98d5e2a1f2aecec60a0d6 /mac-x86 | |
| parent | 899a4fe0a1b9a593cbfeaebcf15ac6f585d5832b (diff) | |
| download | boringssl-572a4e2e687520da9e518528d7371b794b1decc0.tar.gz | |
external/boringssl: Sync to 2c45fa0b90f61b27973fa81893e014fc8c8e8999.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/faa539f877432814d0f2de19846eb99f2ea1e207..2c45fa0b90f61b27973fa81893e014fc8c8e8999
Test: BoringSSL CTS Presubmits
Change-Id: Ie6dc40e0c979168ec73fa1165cbc6e6b83793439
Diffstat (limited to 'mac-x86')
| -rw-r--r-- | mac-x86/crypto/fipsmodule/aes-586.S (renamed from mac-x86/crypto/aes/aes-586.S) | 0 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/aesni-x86.S (renamed from mac-x86/crypto/aes/aesni-x86.S) | 2 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/md5-586.S (renamed from mac-x86/crypto/md5/md5-586.S) | 2 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/sha1-586.S (renamed from mac-x86/crypto/sha/sha1-586.S) | 0 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/sha256-586.S (renamed from mac-x86/crypto/sha/sha256-586.S) | 0 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/sha512-586.S (renamed from mac-x86/crypto/sha/sha512-586.S) | 0 | ||||
| -rw-r--r-- | mac-x86/crypto/fipsmodule/vpaes-x86.S (renamed from mac-x86/crypto/aes/vpaes-x86.S) | 0 |
7 files changed, 2 insertions, 2 deletions
diff --git a/mac-x86/crypto/aes/aes-586.S b/mac-x86/crypto/fipsmodule/aes-586.S index d3dc6beb..d3dc6beb 100644 --- a/mac-x86/crypto/aes/aes-586.S +++ b/mac-x86/crypto/fipsmodule/aes-586.S diff --git a/mac-x86/crypto/aes/aesni-x86.S b/mac-x86/crypto/fipsmodule/aesni-x86.S index 07719ba7..07c7e1fd 100644 --- a/mac-x86/crypto/aes/aesni-x86.S +++ b/mac-x86/crypto/fipsmodule/aesni-x86.S @@ -1,5 +1,5 @@ #if defined(__i386__) -.file "src/crypto/aes/asm/aesni-x86.S" +.file "src/crypto/fipsmodule/aes/asm/aesni-x86.S" .text .globl _aesni_encrypt .private_extern _aesni_encrypt diff --git a/mac-x86/crypto/md5/md5-586.S b/mac-x86/crypto/fipsmodule/md5-586.S index 6830b164..40dae12f 100644 --- a/mac-x86/crypto/md5/md5-586.S +++ b/mac-x86/crypto/fipsmodule/md5-586.S @@ -1,5 +1,5 @@ #if defined(__i386__) -.file "src/crypto/md5/asm/md5-586.S" +.file "src/crypto/fipsmodule/md5/asm/md5-586.S" .text .globl _md5_block_asm_data_order .private_extern _md5_block_asm_data_order diff --git a/mac-x86/crypto/sha/sha1-586.S b/mac-x86/crypto/fipsmodule/sha1-586.S index 72a7205d..72a7205d 100644 --- a/mac-x86/crypto/sha/sha1-586.S +++ b/mac-x86/crypto/fipsmodule/sha1-586.S diff --git a/mac-x86/crypto/sha/sha256-586.S b/mac-x86/crypto/fipsmodule/sha256-586.S index 841854f7..841854f7 100644 --- a/mac-x86/crypto/sha/sha256-586.S +++ b/mac-x86/crypto/fipsmodule/sha256-586.S diff --git a/mac-x86/crypto/sha/sha512-586.S b/mac-x86/crypto/fipsmodule/sha512-586.S index 3066100e..3066100e 100644 --- a/mac-x86/crypto/sha/sha512-586.S +++ b/mac-x86/crypto/fipsmodule/sha512-586.S diff --git a/mac-x86/crypto/aes/vpaes-x86.S b/mac-x86/crypto/fipsmodule/vpaes-x86.S index 8b85709d..8b85709d 100644 --- a/mac-x86/crypto/aes/vpaes-x86.S +++ b/mac-x86/crypto/fipsmodule/vpaes-x86.S |