diff options
| -rw-r--r-- | src/block/serpent_simd/serp_simd_sbox.h | 4 | ||||
| -rw-r--r-- | src/constructs/aont/package.h | 5 | ||||
| -rw-r--r-- | src/entropy/hres_timer/info.txt | 27 | ||||
| -rw-r--r-- | src/libstate/botan.h | 5 |
4 files changed, 12 insertions, 29 deletions
diff --git a/src/block/serpent_simd/serp_simd_sbox.h b/src/block/serpent_simd/serp_simd_sbox.h index fe70f0063..71eca19e5 100644 --- a/src/block/serpent_simd/serp_simd_sbox.h +++ b/src/block/serpent_simd/serp_simd_sbox.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef SERPENT_SIMD_SBOXES_H__ -#define SERPENT_SIMD_SBOXES_H__ +#ifndef BOTAN_SERPENT_SIMD_SBOXES_H__ +#define BOTAN_SERPENT_SIMD_SBOXES_H__ #define SBoxE1(B0, B1, B2, B3) \ do { \ diff --git a/src/constructs/aont/package.h b/src/constructs/aont/package.h index 35d2a23fc..5024c0421 100644 --- a/src/constructs/aont/package.h +++ b/src/constructs/aont/package.h @@ -6,6 +6,9 @@ * Distributed under the terms of the Botan license */ +#ifndef BOTAN_AONT_PACKAGE_TRANSFORM_H__ +#define BOTAN_AONT_PACKAGE_TRANSFORM_H__ + #include <botan/block_cipher.h> #include <botan/rng.h> @@ -43,3 +46,5 @@ void unpackage(BlockCipher* cipher, } } + +#endif diff --git a/src/entropy/hres_timer/info.txt b/src/entropy/hres_timer/info.txt index 566ce4ef6..6c6454f5d 100644 --- a/src/entropy/hres_timer/info.txt +++ b/src/entropy/hres_timer/info.txt @@ -1,28 +1 @@ define ENTROPY_SRC_HIGH_RESOLUTION_TIMER - -load_on asm_ok - -<cc> -gcc -icc -</cc> - -<arch> - -# RDTSC: Pentium and up -i586 -i686 -athlon -pentium3 -pentium4 -pentium-m -amd64 - -ppc # PPC timebase register -ppc64 # PPC timebase register -alpha # rpcc -sparc64 # %tick register -ia64 # ar.itc -s390x -hppa -</arch> diff --git a/src/libstate/botan.h b/src/libstate/botan.h index 3fa131216..a88edb59b 100644 --- a/src/libstate/botan.h +++ b/src/libstate/botan.h @@ -5,6 +5,9 @@ * Distributed under the terms of the Botan license */ +#ifndef BOTAN_BOTAN_H__ +#define BOTAN_BOTAN_H__ + #include <botan/init.h> #include <botan/lookup.h> #include <botan/libstate.h> @@ -16,3 +19,5 @@ #if defined(BOTAN_HAS_AUTO_SEEDING_RNG) #include <botan/auto_rng.h> #endif + +#endif |