Rework memory BIOs and implement BIO_seek (2nd try) #2433
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
### Issues: Resolves #CryptoAlg-3111 ### Description of changes: This PR creates a wrapper around `BUF_MEM` and adds a new field `off` to indicate the current offset of the read pointer. This enables us to implement `BIO_seek`, which is also in this PR. ### Testing: Unit tests are modified and added to cover more test cases. 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.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
|
||
| BIO *BIO_new_mem_buf(const void *buf, ossl_ssize_t len) { | ||
| BIO *ret; | ||
| BUF_MEM *b; | ||
| const size_t size = len < 0 ? strlen((char *)buf) : (size_t)len; | ||
| BIO_BUF_MEM *bbm; |
There was a problem hiding this comment.
warning: variable 'bbm' is not initialized [cppcoreguidelines-init-variables]
Suggested change
| BIO_BUF_MEM *bbm; | |
| BIO_BUF_MEM *bbm = NULL; |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #2433 +/- ##
==========================================
+ Coverage 78.88% 78.89% +0.01%
==========================================
Files 621 621
Lines 108547 108671 +124
Branches 15406 15420 +14
==========================================
+ Hits 85623 85738 +115
- Misses 22256 22261 +5
- Partials 668 672 +4 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
justsmth
previously approved these changes
May 22, 2025
skmcgrail
reviewed
May 22, 2025
skmcgrail
approved these changes
May 22, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issues:
Resolves #CryptoAlg-3111
Description of changes:
Same as #2380.
Fixed the state bug that was causing Ruby failures. The failures came from
BIO_reset, which tries to "rewind" the R/O buffer to its original state. The old implementation only works when the buffer pointer and read pointer are aligned. But in the new memory BIO, this is not always the case. The buffer pointer (b->data) does not need to align with the read pointer (since we can have a positivebbm->read_off). Our tests didn't cover this because the buffer pointer was synced with read pointer after every test case.Testing:
Added tests for
BIO_resetandBIO_seekfunctions that attempt to rewind the buffer internally. The tests cover both cases -- when buffer pointer and read pointer are synced and when they are not.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.