diff options
author | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-05-07 10:06:42 +0100 |
commit | ecebda56da46a03dafff923d91c382f31faa9eec (patch) | |
tree | 449614b6c06a2622c74a609b31fcc46c60037c56 /umac.c | |
parent | c6a2c0334e45419875687d250aed9bea78480f2e (diff) | |
parent | ffc06452028ba78cd693d4ed43df8b60a10d6163 (diff) |
merge 6.2p1; reorder additions to monitor.h for easier merging in future
Diffstat (limited to 'umac.c')
-rw-r--r-- | umac.c | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -52,7 +52,15 @@ | |||
52 | /* --- User Switches ---------------------------------------------------- */ | 52 | /* --- User Switches ---------------------------------------------------- */ |
53 | /* ---------------------------------------------------------------------- */ | 53 | /* ---------------------------------------------------------------------- */ |
54 | 54 | ||
55 | #ifndef UMAC_OUTPUT_LEN | ||
55 | #define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */ | 56 | #define UMAC_OUTPUT_LEN 8 /* Alowable: 4, 8, 12, 16 */ |
57 | #endif | ||
58 | |||
59 | #if UMAC_OUTPUT_LEN != 4 && UMAC_OUTPUT_LEN != 8 && \ | ||
60 | UMAC_OUTPUT_LEN != 12 && UMAC_OUTPUT_LEN != 16 | ||
61 | # error UMAC_OUTPUT_LEN must be defined to 4, 8, 12 or 16 | ||
62 | #endif | ||
63 | |||
56 | /* #define FORCE_C_ONLY 1 ANSI C and 64-bit integers req'd */ | 64 | /* #define FORCE_C_ONLY 1 ANSI C and 64-bit integers req'd */ |
57 | /* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */ | 65 | /* #define AES_IMPLEMENTAION 1 1 = OpenSSL, 2 = Barreto, 3 = Gladman */ |
58 | /* #define SSE2 0 Is SSE2 is available? */ | 66 | /* #define SSE2 0 Is SSE2 is available? */ |