Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-03 12:12:06 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix undefined behaviour bugs in serpent crypto algorithm ##crypto

Browse Source
This commit is contained in:
Sergi Àlvarez i Capilla 2022-03-25 19:56:20 +01:00 committed by pancake
parent bbff894e22
commit 5abd6faf47
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/crypto/p/crypto_serpent.c
View File

@ -1,3 +1,5 @@
/* radare - LGPL - Copyright 2017-2022 - pancake */
#include <r_lib.h>
#include <r_crypto.h>
#include "crypto_serpent_algo.h"

10
libr/crypto/p/crypto_serpent_algo.c
View File

@ -1,3 +1,5 @@
/* radare - LGPL - Copyright 2017-2022 - pancake */
#include "crypto_serpent_algo.h"
#include "r_util/r_assert.h"
@ -75,7 +77,7 @@ static void apply_IP(ut32 in[DW_BY_BLOCK], ut32 out[DW_BY_BLOCK]) {
for (i = 0; i < DW_BY_BLOCK * 32; i++) {
index = IPTable[i];
out[i / 32] ^= (ut32)(-(ut32)get_bit (index % 32, in[index / 32]) ^ out[i / 32])
& (1 << (i & 0x1f));
& ((ut32)1 << (i & 0x1f));
}
}
@ -85,7 +87,7 @@ static void apply_FP(ut32 in[DW_BY_BLOCK], ut32 out[DW_BY_BLOCK]) {
for (i = 0; i < DW_BY_BLOCK * 32; i++) {
index = FPTable[i];
out[i / 32] ^= (ut32)(-(ut32)get_bit (index % 32, in[index / 32]) ^ out[i / 32])
& (1 << (i & 0x1f));
& ((ut32)1 << (i & 0x1f));
}
}
@ -129,7 +131,7 @@ static bool serpent_keyschedule(struct serpent_state st, ut32 subkeys[NB_SUBKEYS
| get_bit (j, tmpkeys[3 + DW_BY_BLOCK * i + DW_BY_USERKEY]) << 3;
out = apply_sbox (si, in);
for (l = 0; l < DW_BY_BLOCK; l++) {
subkeys[l + DW_BY_BLOCK * i] |= get_bit (l, (ut32)out) << j;
subkeys[l + DW_BY_BLOCK * i] |= (ut32)get_bit (l, (ut32)out) << j;
}
}
}
@ -217,7 +219,7 @@ static void apply_round_inv(int round, ut32 block[DW_BY_BLOCK],
for (i = 0; i < DW_BY_BLOCK; i++) {
res = 0;
for (j = 0; j < 8; j++) {
res |= apply_sbox_inv (round%8, (block[i] >> 4 * j) & 0xf) << 4 * j;
res |= (ut32)apply_sbox_inv (round % 8, (block[i] >> 4 * j) & 0xf) << (4 * j);
}
block[i] = res;
}