diff --git a/crypto/fipsmodule/service_indicator/service_indicator_test.cc b/crypto/fipsmodule/service_indicator/service_indicator_test.cc index 113f9b3953..f600b8fc0d 100644 --- a/crypto/fipsmodule/service_indicator/service_indicator_test.cc +++ b/crypto/fipsmodule/service_indicator/service_indicator_test.cc @@ -4321,7 +4321,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 1.32.0"); + ASSERT_STREQ(awslc_version_string(), "AWS-LC FIPS 1.33.0"); } #else @@ -4364,6 +4364,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 1.32.0"); + ASSERT_STREQ(awslc_version_string(), "AWS-LC 1.33.0"); } #endif // AWSLC_FIPS diff --git a/include/openssl/base.h b/include/openssl/base.h index ae8e510a42..ee74072159 100644 --- a/include/openssl/base.h +++ b/include/openssl/base.h @@ -122,7 +122,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 "1.32.0" +#define AWSLC_VERSION_NUMBER_STRING "1.33.0" #if defined(BORINGSSL_SHARED_LIBRARY) diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index 41cbb537cc..892c20fb3c 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -95,9 +95,10 @@ OPENSSL_EXPORT int SSKDF_hmac(uint8_t *out_key, size_t out_len, // 2022. The parameters relevant to the specification are as follows: // * |out_len|, |secret_len|, and |info_len| are specified in bytes // * |out_len| is analogous to |L| in the specification. -// * |r| the length of the binary representation of the counter |i| +// * |r| is the length of the binary representation of the counter |i| // referred to by the specification. |r| is 32 bits in this implementation. // * The 32-bit counter is big-endian in this implementation. +// * The 32-bit counter location is placed before |info|. // * |K_IN| is analogous to |secret| and |secret_len|. // * |PRF| refers to HMAC in this implementation. //