Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve redundantAssignment in pkcs1_decode #827

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Resolve redundantAssignment in pkcs1_decode #827

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba9ab03
Resolve `redundantAssignment` in `pkcs1_decode`
vil02 Aug 18, 2024
2eba7cc
Merge branch 'Legrandin:master' into resolve_redundantAssignment
vil02 Sep 15, 2024
360d046
Merge branch 'Legrandin:master' into resolve_redundantAssignment
vil02 Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions src/pkcs1_decode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,27 +215,25 @@ EXPORT_SYM int pkcs1_decode(const uint8_t *em, size_t len_em_output,
size_t pos;
uint8_t match, selector;
uint8_t *padded_sentinel;
int result;

result = -1;
int result = -1;

if (NULL == em || NULL == output || NULL == sentinel) {
return -1;
return result;
}
if (len_em_output < (PKCS1_PREFIX_LEN + 2)) {
return -1;
return result;
}
if (len_sentinel > len_em_output) {
return -1;
return result;
}
if (expected_pt_len > 0 && expected_pt_len > (len_em_output - PKCS1_PREFIX_LEN - 1)) {
return -1;
return result;
}

/** Pad sentinel (on the left) so that it matches em in length **/
padded_sentinel = (uint8_t*) calloc(1, len_em_output);
if (NULL == padded_sentinel) {
return -1;
return result;
}
memcpy(padded_sentinel + (len_em_output - len_sentinel), sentinel, len_sentinel);

Expand All @@ -254,7 +252,6 @@ EXPORT_SYM int pkcs1_decode(const uint8_t *em, size_t len_em_output,
*/
pos = safe_search(em + 10, 0, len_em_output - 10) + 10;
if (pos == SIZE_T_MAX) {
result = -1;
goto end;
}

Expand Down
Loading