Fix lifetime errors in asn1.rs with gil-refs disabled
#10778
Merged
Conversation
This file contains 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
alex
reviewed
Apr 10, 2024
Comment on lines
23
to
24
| // SAFETY: `PyBackedBytes`'s data is on the heap, so as long as it's not mutated, the | ||
| // slice returned by `deref` remains valid. |
There was a problem hiding this comment.
bytes are immutable in python, so the comment here should say that, not that it's fine as long as it's not mutated.
src/rust/src/x509/extensions.rs
Outdated
| @@ -52,9 +52,13 @@ pub(crate) fn encode_authority_key_identifier<'a>( | |||
| } else { | |||
| None | |||
| }; | |||
| let ka = cryptography_keepalive::KeepAlive::new(); | |||
There was a problem hiding this comment.
I don't think this is needed, you just need to change the scope of the serial_bytes local to be function, rather than block.
|
Should be good to rebase |
alex
reviewed
Apr 12, 2024
src/rust/src/x509/extensions.rs
Outdated
| @@ -52,10 +53,11 @@ pub(crate) fn encode_authority_key_identifier<'a>( | |||
| } else { | |||
| None | |||
| }; | |||
| let serial_bytes: PyBackedBytes; | |||
There was a problem hiding this comment.
Suggested change
| let serial_bytes: PyBackedBytes; | |
| let serial_bytes; |
alex
reviewed
Apr 12, 2024
src/rust/src/x509/ocsp_req.rs
Outdated
| @@ -188,7 +189,8 @@ fn create_ocsp_request( | |||
| (issuer_name_hash, issuer_key_hash, py_serial, py_hash) = builder | |||
| .getattr(pyo3::intern!(py, "_request_hash"))? | |||
| .extract()?; | |||
| let serial_number = asn1::BigInt::new(py_uint_to_big_endian_bytes(py, py_serial)?).unwrap(); | |||
| let serial_number_bytes = ka.add(py_uint_to_big_endian_bytes(py, py_serial)?); | |||
There was a problem hiding this comment.
I don't think a ka is needed here. Can just do the scoping trick.
There was a problem hiding this comment.
good catch, fixed
facutuesca
force-pushed
the
asn1-lifetime-pyo3
branch
from
723c628 to
a9519bc
Compare
alex
reviewed
Apr 13, 2024
Co-authored-by: Alex Gaynor <[email protected]>
alex
approved these changes
Apr 13, 2024
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.
Part of #10676
This should be merged after the keepalive PR is merged
Fixes all of the lifetime errors in
asn1.rs, changing a return type ofpy_uint_to_big_endian_bytesfrom&'p [u8]toPyBackedBytes.It uses the new
keepalivein the places where thePyBackedBytesobject is borrowed for longer than its lifetime.cc @alex @reaperhulk