Skip to content

Commit d497af3

Browse files
committed
Merge BoringSSL fd49993: First part of the FIPS module.
Most of this infrastructure for FIPS is not relevant to *ring* in its current state (though that may change in the future) so most of it is ignored. BoringSSL changed the way that the assembly language code accesses the CPU feature flags to add a new level of indirection to support their needs for FIPS. That would be a regression (a miniscule one) with no upside for *ring*, so don't merge that change. That means the asm code will be slightly different between *ring* and BoringSSL, but that was already the case due to the symbol renaming we did. We assume no tests were added in the BoringSSL commit.
2 parents 1c5ba62 + fd49993 commit d497af3

12 files changed

+15
-394
lines changed

build.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ const RING_SRCS: &'static [(&'static [&'static str], &'static str)] = &[
8585
(&[X86], "crypto/ec/asm/ecp_nistz256-x86.pl"),
8686
(&[X86], "crypto/modes/asm/ghash-x86.pl"),
8787
(&[X86], "crypto/poly1305/asm/poly1305-x86.pl"),
88-
(&[X86], "crypto/sha/asm/sha256-586.pl"),
89-
(&[X86], "crypto/sha/asm/sha512-586.pl"),
88+
(&[X86], "crypto/fipsmodule/sha/asm/sha256-586.pl"),
89+
(&[X86], "crypto/fipsmodule/sha/asm/sha512-586.pl"),
9090

9191
(&[X86_64], "crypto/curve25519/x25519-x86_64.c"),
9292

@@ -118,8 +118,8 @@ const RING_SRCS: &'static [(&'static [&'static str], &'static str)] = &[
118118
(&[ARM], "crypto/ec/asm/ecp_nistz256-armv4.pl"),
119119
(&[ARM], "crypto/modes/asm/ghash-armv4.pl"),
120120
(&[ARM], "crypto/poly1305/asm/poly1305-armv4.pl"),
121-
(&[ARM], "crypto/sha/asm/sha256-armv4.pl"),
122-
(&[ARM], "crypto/sha/asm/sha512-armv4.pl"),
121+
(&[ARM], "crypto/fipsmodule/sha/asm/sha256-armv4.pl"),
122+
(&[ARM], "crypto/fipsmodule/sha/asm/sha512-armv4.pl"),
123123

124124
(&[AARCH64], "crypto/bn/asm/armv8-mont.pl"),
125125
(&[AARCH64], "crypto/cpu-aarch64-linux.c"),
@@ -129,11 +129,11 @@ const RING_SRCS: &'static [(&'static [&'static str], &'static str)] = &[
129129
(&[AARCH64], SHA512_ARMV8),
130130
];
131131

132-
const SHA256_X86_64: &'static str = "crypto/sha/asm/sha256-x86_64.pl";
133-
const SHA512_X86_64: &'static str = "crypto/sha/asm/sha512-x86_64.pl";
132+
const SHA256_X86_64: &'static str = "crypto/fipsmodule/sha/asm/sha256-x86_64.pl";
133+
const SHA512_X86_64: &'static str = "crypto/fipsmodule/sha/asm/sha512-x86_64.pl";
134134

135-
const SHA256_ARMV8: &'static str = "crypto/sha/asm/sha256-armv8.pl";
136-
const SHA512_ARMV8: &'static str = "crypto/sha/asm/sha512-armv8.pl";
135+
const SHA256_ARMV8: &'static str = "crypto/fipsmodule/sha/asm/sha256-armv8.pl";
136+
const SHA512_ARMV8: &'static str = "crypto/fipsmodule/sha/asm/sha512-armv8.pl";
137137

138138
const RING_TEST_SRCS: &'static [&'static str] = &[
139139
("crypto/constant_time_test.c"),

crypto/fipsmodule/aes/aes_test_BACKUP_4068.cc

-190
This file was deleted.

crypto/fipsmodule/aes/aes_test_BASE_4068.cc

Whitespace-only changes.

crypto/fipsmodule/aes/aes_test_LOCAL_4068.cc

Whitespace-only changes.

0 commit comments

Comments
 (0)