Skip to content
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.

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

Missing functionality + Adding Nmap to our CI #1915

Merged
merged 9 commits into from
Oct 25, 2024
Merged

Conversation

smittals2
Copy link
Contributor

Issues:

CryptoAlg-2552

Description of changes:

This PR adds Nmap tip of main to our CI. It includes:

  1. A patch to Nmap
  2. Adding an include for <errno.h> to <err.h>, OpenSSL does this but we previously did not
  3. Adding BIO_destroy_bio_pair (the functionality was already implemented, we are simply exposing that through a new func)
  4. Creating a new alias for "DES" in the EVP_CIPHER API. The "default" mode used in OpenSSL 1.1.1 and 3.1 with DES is CBC (link).

Testing:

Locally built and ran nmap tests with AWS-LC and verified they pass. Conducted a dry run with the extra included file to ensure it doesn't break any consumers in live (refer to CryptoAlg-2552 for the dryrun link).

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license and the ISC license.

@smittals2 smittals2 requested a review from a team as a code owner October 11, 2024 01:02
@codecov-commenter
Copy link

codecov-commenter commented Oct 11, 2024

Codecov Report

Attention: Patch coverage is 0% with 5 lines in your changes missing coverage. Please review.

Project coverage is 78.53%. Comparing base (c64ec41) to head (4fdbc2c).
Report is 10 commits behind head on main.

Files with missing lines Patch % Lines
crypto/bio/pair.c 0.00% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1915      +/-   ##
==========================================
+ Coverage   78.50%   78.53%   +0.03%     
==========================================
  Files         585      585              
  Lines       99682    99808     +126     
  Branches    14262    14287      +25     
==========================================
+ Hits        78260    78389     +129     
+ Misses      20786    20781       -5     
- Partials      636      638       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

crypto/bio/pair.c Outdated Show resolved Hide resolved
@@ -106,6 +106,7 @@ static const struct {
const char* name;
} kCipherAliases[] = {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What uses these aliases? Does adding DES here enable it to be used silently by default anywhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. Adding this mapping does not "leak" anything new. We already expose des-cbc through the kCiphers array. This change adds another alias pointing "DES" to this mapping (cbc is the default mode for DES in OpenSSL).
  2. These aliases are checked in addition to the kCiphers array. This is due to differences in the string names applications try to fetch algorithms with. In general these string:EVP_CIPHER mappings are used by the EVP_get_cipherbyname function. This function is part of our public API, although deprecated, which means users can directly retrieve the EVP_des_cbc cipher object and then conduct operations with it. Internally I don't see any usages in our codebase other than testing.

@smittals2 smittals2 merged commit 8431e44 into aws:main Oct 25, 2024
114 of 116 checks passed
skmcgrail added a commit that referenced this pull request Nov 7, 2024
## What's Changed
* 800-131Ar1: length of the key-derivation key shall be at least 112
bits. by @skmcgrail in #1924
* Marshalling/Unmarshalling DH public keys by @justsmth in
#1916
* Also prune SSM documents from ec2-test-framework by @samuel40791765 in
#1925
* Use illegal_parameter instead of decode_error for invalid key shares
by @justsmth in #1923
* Add null check in dh testing by @torben-hansen in
#1937
* DH paramgen callback by @justsmth in
#1928
* Upstream merge 2024 10 17 by @torben-hansen in
#1934
* Remove old Intel CPU types by @justsmth in
#1942
* Remove retries on PCT failure in EC and RSA key generation. by @nebeid
in #1938
* Add p4p, bump up time by @justsmth in
#1943
* PQ README by @jakemas in #1932
* bump mysql CI to 9.1.0 by @justsmth in
#1939
* HKDF, HKDF_expand, and PBKDF Truncated SHA2-512 by @skmcgrail in
#1946
* Missing functionality + Adding Nmap to our CI by @smittals2 in
#1915
* Fix FIPS.md typo by @justsmth in
#1950
* Support encode or decode ∞ like OpenSSL by @samuel40791765 in
#1930
* Expand support for EVP_PKEY_HMAC by @justsmth in
#1933
* Add PKCS7-internal BIO_f_cipher by @WillChilds-Klein in
#1836
* Add PKCS7-internal BIO_f_md by @WillChilds-Klein in
#1886
* Ruby Support - DSA custom md by @justsmth in
#1953
* Add support for POINT_CONVERSION_HYBRID by @samuel40791765 in
#1936
* Fixes for Coverity Alerts by @smittals2 in
#1960
* Also test w/ gcc 4.8 by @justsmth in
#1962
* Actually add support for SSL_get_server/peer_tmp_key by
@samuel40791765 in #1945
* Coverity Fix Null Check by @smittals2 in
#1965
* ML-KEM keygen Pairwise Consistency Test by @dkostic in
#1964
* EDDSA PCT by @torben-hansen in #1968
* Expose AES_cfb1_encrypt and AES_cfb8_encrypt by @skmcgrail in
#1967

**Full Changelog**:
v1.37.0...v1.38.0

By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and the ISC license.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants