Skip to content

Use built-in Camellia in krb5 integration patch; fix CTS doc label#3349

Open
WillChilds-Klein wants to merge 3 commits into
aws:mainfrom
WillChilds-Klein:update-krb5-patch
Open

Use built-in Camellia in krb5 integration patch; fix CTS doc label#3349
WillChilds-Klein wants to merge 3 commits into
aws:mainfrom
WillChilds-Klein:update-krb5-patch

Conversation

@WillChilds-Klein

@WillChilds-Klein WillChilds-Klein commented Jul 15, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Description of changes

The krb5 maintainers reviewed the upstream version of this patchset and suggested a cleaner approach for Camellia (krb5/krb5#1533 comment): rather than disabling the Camellia enctypes when building against AWS-LC (which lacks Camellia), select krb5's own built-in Camellia implementation.

0002 is now a 5-line change in crypto_int.h:

#ifdef OPENSSL_IS_AWSLC
#define K5_BUILTIN_CAMELLIA
#else
#define K5_OPENSSL_CAMELLIA
#endif

The other two patches are unchanged.

Testing

The krb5 integration test (run_krb5_integration.sh) exercises these patches end-to-end; Camellia enctypes are now covered by make check rather than skipped.

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.

@WillChilds-Klein
Use built-in Camellia in krb5 patch; fix CTS doc label
dff8dec 
Rework the krb5 integration patchset per maintainer guidance in
krb5/krb5#1533 (comment):
select krb5's built-in Camellia (K5_BUILTIN_CAMELLIA) when building
against AWS-LC instead of disabling the Camellia enctypes. The built-in
sources are always compiled on Unix, so all Camellia enctypes and CMAC
checksums stay functional and the crypto test suite needs no edits. This
also drops the camellia-expect-vt.txt golden-file workaround from the
integration script.

Also fix the CBC-CS doc comment in modes.h: label the CTS helpers as
CS3 / NIST SP 800-38A Addendum (matching crypto/cipher_extra/cts.c)
rather than the incorrect CS1 / RFC 2040.
@github-actions

github-actions Bot commented Jul 15, 2026

Copy link
Copy Markdown
Contributor

🔒 Security Review — View Report

Please review before merging.

@codecov-commenter

codecov-commenter commented Jul 15, 2026 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 78.19%. Comparing base (3ab37a8) to head (69a0c4c).

Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #3349      +/-   ##
==========================================
- Coverage   78.19%   78.19%   -0.01%     
==========================================
  Files         695      695              
  Lines      124086   124086              
  Branches    17222    17232      +10     
==========================================
- Hits        97035    97023      -12     
- Misses      26129    26142      +13     
+ Partials      922      921       -1

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@WillChilds-Klein
WillChilds-Klein marked this pull request as ready for review July 16, 2026 16:50
@WillChilds-Klein
WillChilds-Klein requested a review from a team as a code owner July 16, 2026 16:50
@WillChilds-Klein
WillChilds-Klein enabled auto-merge (squash) July 16, 2026 16:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@samuel40791765 samuel40791765 samuel40791765 approved these changes
@justsmth justsmth justsmth approved these changes
@sgmenda sgmenda Awaiting requested review from sgmenda

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@WillChilds-Klein @codecov-commenter @samuel40791765 @justsmth