Added new methods to fix issue 375 - get slots with initialized token… #35
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
hug-dev
reviewed
Jul 20, 2021
Comment on lines
1
to
2
| // Copyright 2021 Contributors to the Parsec project. | ||
| // SPDX-License-Identifier: Apache-2.0 |
Comment on lines
50
to
75
| let mut slot_count = 0; | ||
|
|
||
| unsafe { | ||
| Rv::from(get_pkcs11!(self, C_GetSlotList)( | ||
| cryptoki_sys::CK_TRUE, | ||
| std::ptr::null_mut(), | ||
| &mut slot_count, | ||
| )) | ||
| .into_result()?; | ||
| } | ||
|
|
||
| let mut slots = vec![0; slot_count.try_into()?]; | ||
|
|
||
| unsafe { | ||
| Rv::from(get_pkcs11!(self, C_GetSlotList)( | ||
| cryptoki_sys::CK_TRUE, | ||
| slots.as_mut_ptr(), | ||
| &mut slot_count, | ||
| )) | ||
| .into_result()?; | ||
| } | ||
|
|
||
| let mut slots: Vec<Slot> = slots.into_iter().map(Slot::new).collect(); | ||
|
|
||
| // This should always truncate slots. | ||
| slots.resize(slot_count.try_into()?, Slot::new(0)); |
There was a problem hiding this comment.
I think you can replace all those lines with:
let slots = self.get_slots_with_token()?;It should do the same using the method above!
|
You might need to do a |
hug-dev
changed the title
wiktor-k
reviewed
Jul 21, 2021
| } | ||
| Err(e) => Some(Err(e)), | ||
| }) | ||
| .collect::<Result<Vec<Slot>>>()?; |
There was a problem hiding this comment.
This is minor but you can either omit type declaration in let slots: Vec<Slot> or shorten the explicit type in collect to collect::<Result<_>>()?;
There was a problem hiding this comment.
Since this function returns a `Result<Vec>, I am wondering if you could also remove everything:
- the
let slots: Vec<Slot> =at the beginning - just have
.collect()at the end (without?and;)
There was a problem hiding this comment.
Indeed. That'd make it more readable too IMHO.
…, for PKCS 11 Provider Signed-off-by: Adriano Pallavicino <[email protected]>
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.
…, for PKCS 11 Provider
Signed-off-by: Adriano Pallavicino [email protected]