Skip to content

Use unsigned values for the final DES left shifts #9197

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

Open
dand-oss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use unsigned values for the final DES left shifts #9197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/common/enc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,8 +737,9 @@ static int des_cipher(const C_block* in, C_block* out, SLONG salt, int num_iter)
}

// store the encrypted (or decrypted) result
L0 = ((L0 >> 3) & 0x0f0f0f0fL) | ((L1 << 1) & 0xf0f0f0f0L);
L1 = ((R0 >> 3) & 0x0f0f0f0fL) | ((R1 << 1) & 0xf0f0f0f0L);
// Cast to ULONG before left shift to avoid UB on negative signed values
L0 = ((L0 >> 3) & 0x0f0f0f0fL) | ((static_cast<ULONG>(L1) << 1) & 0xf0f0f0f0L);
L1 = ((R0 >> 3) & 0x0f0f0f0fL) | ((static_cast<ULONG>(R1) << 1) & 0xf0f0f0f0L);
STORE(L, L0, L1, B);
PERM6464(L, L0, L1, B.b, (const C_block *) CF6464);
#if defined(MUST_ALIGN)
Expand Down
Loading