Skip to content

Backport Perl Compat Fix and Division Fix to fips-2022-11-02, Bump Version to 2.0.3 #1366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
skmcgrail merged 3 commits into from
Dec 18, 2023
Merged

Backport Perl Compat Fix and Division Fix to fips-2022-11-02, Bump Version to 2.0.3 #1366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
54bdc5e
Bump version to 2.0.3
skmcgrail Dec 18, 2023
9af7657
Make the AES-GCM avx512 Perl script compatible with old Perl (#960)
TingDaoK Apr 18, 2023
b0ac09b
Update function to avoid division (#1360)
WillChilds-Klein Dec 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crypto/fipsmodule/modes/asm/aesni-gcm-avx512.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4722,8 +4722,8 @@ sub INITIAL_BLOCKS_16 {
sub evex_byte1 {
my ($mm, $src1, $dst) = @_;
# set default to zero
$src1 //= 0;
$dst //= 0;
$src1 = 0 if (!defined($src1));
$dst = 0 if (!defined($dst));

my $byte = 0xf0 | $mm;

Expand Down
4 changes: 2 additions & 2 deletions crypto/fipsmodule/service_indicator/service_indicator_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4051,7 +4051,7 @@ TEST(ServiceIndicatorTest, DRBG) {
// Since this is running in FIPS mode it should end in FIPS
// Update this when the AWS-LC version number is modified
TEST(ServiceIndicatorTest, AWSLCVersionString) {
ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 2.0.2");
ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 2.0.3");
}

#else
Expand Down Expand Up @@ -4094,6 +4094,6 @@ TEST(ServiceIndicatorTest, BasicTest) {
// Since this is not running in FIPS mode it shouldn't end in FIPS
// Update this when the AWS-LC version number is modified
TEST(ServiceIndicatorTest, AWSLCVersionString) {
ASSERT_STREQ(awslc_version_string(), "AWS-LC 2.0.2");
ASSERT_STREQ(awslc_version_string(), "AWS-LC 2.0.3");
}
#endif // AWSLC_FIPS
1 change: 1 addition & 0 deletions crypto/kyber/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ The following changes were made to the source code in `pqcrystals_kyber_ref_comm
* `kem.c`: calls to `randombytes` function is replaced with calls to `pq_custom_randombytes` and the appropriate header file is included (`crypto/rand_extra/pq_custom_randombytes.h`).
* `symmetric-shake.c`: unnecessary include of `fips202.h` is removed.
* `api.h`, `fips202.h`, `params.h`: modified [in this PR](https://github.com/aws/aws-lc/pull/655) to support our [prefixed symbols build](https://github.com/aws/aws-lc/blob/main/BUILDING.md#building-with-prefixed-symbols).
* `poly.c` was modified to remove 2 lines of comment from [this commit](https://github.com/pq-crystals/kyber/commit/dda29cc63af721981ee2c831cf00822e69be3220)

**Usage.** The KEM API is defined and documented in `include/openssl/evp.h`. To see examples of how to use any KEM, including Kyber, see `crypto/kem/README.md`.
9 changes: 6 additions & 3 deletions crypto/kyber/pqcrystals_kyber_ref_common/poly.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,17 @@ void poly_frommsg(poly *r, const uint8_t msg[KYBER_INDCPA_MSGBYTES])
void poly_tomsg(uint8_t msg[KYBER_INDCPA_MSGBYTES], const poly *a)
{
unsigned int i,j;
uint16_t t;
uint32_t t;

for(i=0;i<KYBER_N/8;i++) {
msg[i] = 0;
for(j=0;j<8;j++) {
t = a->coeffs[8*i+j];
t += ((int16_t)t >> 15) & KYBER_Q;
t = (((t << 1) + KYBER_Q/2)/KYBER_Q) & 1;
t <<= 1;
t += 1665;
t *= 80635;
t >>= 28;
t &= 1;
msg[i] |= t << j;
}
}
Expand Down
2 changes: 1 addition & 1 deletion include/openssl/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ extern "C" {
// ServiceIndicatorTest.AWSLCVersionString
// Note: there are two versions of this test. Only one test is compiled
// depending on FIPS mode.
#define AWSLC_VERSION_NUMBER_STRING "2.0.2"
#define AWSLC_VERSION_NUMBER_STRING "2.0.3"

#if defined(BORINGSSL_SHARED_LIBRARY)

Expand Down