kris/pqc
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed need for aligned types (which are not portable)

Browse Source 
Resolves #22
This commit is contained in:
Peter Schwabe 2019-02-11 09:41:32 +01:00
parent 06b4279e0a
commit 69e593427a
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/crypto_kem/functest.c
View File

@ -5,18 +5,23 @@
#define NTESTS 10 #define NTESTS 10
const unsigned char canary[8] = {0x01, 0x23, 0x45, 0x67,
0x89, 0xAB, 0xCD, 0xEF};
/* allocate a bit more for all keys and messages and /* allocate a bit more for all keys and messages and
* make sure it is not touched by the implementations. * make sure it is not touched by the implementations.
*/ */
static void write_canary(unsigned char *d) { static void write_canary(unsigned char *d) {
*((uint64_t *)d) = 0x0123456789ABCDEF; for (int i = 0; i < 8; i++) {
d[i] = canary[i];
}
} }
static int check_canary(const unsigned char *d) { static int check_canary(const unsigned char *d) {
if (*(uint64_t *)d != 0x0123456789ABCDEF) { for (int i = 0; i < 8; i++) {
return -1; if (d[i] != canary[i])
return -1;
} }
return 0; return 0;
} }

13
test/crypto_sign/functest.c
View File

@ -6,20 +6,23 @@
#define NTESTS 15 #define NTESTS 15
#define MLEN 32 #define MLEN 32
typedef uint64_t unaligned_uint64_t __attribute__((aligned(1))); const unsigned char canary[8] = {0x01, 0x23, 0x45, 0x67,
0x89, 0xAB, 0xCD, 0xEF};
/* allocate a bit more for all keys and messages and /* allocate a bit more for all keys and messages and
* make sure it is not touched by the implementations. * make sure it is not touched by the implementations.
*/ */
static void write_canary(unsigned char *d) { static void write_canary(unsigned char *d) {
*((unaligned_uint64_t *)d) = 0x0123456789ABCDEF; for (int i = 0; i < 8; i++) {
d[i] = canary[i];
}
} }
static int check_canary(const unsigned char *d) { static int check_canary(const unsigned char *d) {
if (*(unaligned_uint64_t *)d != 0x0123456789ABCDEF) { for (int i = 0; i < 8; i++) {
return -1; if (d[i] != canary[i])
return -1;
} }
return 0; return 0;
} }