Allow carriage returns in PEM #7507
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
There was a problem hiding this comment.
Pull request overview
This PR enables recognition of PEM certificates that use Windows-style line endings (carriage return + line feed, \r\n) in addition to Unix-style line endings (line feed only, \n).
Key Changes:
- Modified PEM prefix validation to accept both
\nand\r\nline endings by removing the hardcoded newline from the prefix constant - Added comprehensive test coverage for PEM certificates with carriage return line endings
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
include/ccf/crypto/openssl/openssl_wrappers.h |
Removed trailing \n from pem_prefix constant to allow recognition of PEM certificates with both Unix (\n) and Windows (\r\n) line endings |
src/crypto/test/crypto.cpp |
Added new test case "Carriage returns in PEM certificates" that validates both standard and carriage-return PEM formats can be parsed successfully |
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
eddyashton
approved these changes
Dec 4, 2025
achamayou
added
auto-backport
cjen1-msft
added a commit
to cjen1-msft/CCF
that referenced
this pull request
Dec 4, 2025
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
cjen1-msft
added a commit
that referenced
this pull request
Dec 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently we don't recognise a PEM with carriage returns as a PEM certificate.
This PR fixes that and adds a test for this.