summaryrefslogtreecommitdiff
path: root/src/keyDerivation.h
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-15 17:08:37 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-15 17:08:37 +0000
commit8bdc2bd3d46dfa40af1eb241905f8b0e33c0e5d8 (patch)
tree4fc333a1baa997613f2e530d26334f71239c7f0d /src/keyDerivation.h
parentsmall cleanup (diff)
fixed NOPACKED (Windows build)
Diffstat (limited to 'src/keyDerivation.h')
-rw-r--r--src/keyDerivation.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/keyDerivation.h b/src/keyDerivation.h
index 2798d3b..f977922 100644
--- a/src/keyDerivation.h
+++ b/src/keyDerivation.h
@@ -169,21 +169,21 @@ private:
key_store_t key_store_[2][KD_LABEL_COUNT];
- union __attribute__((__packed__)) key_derivation_aesctr_ctr_union {
+ union ATTR_PACKED key_derivation_aesctr_ctr_union {
u_int8_t buf_[CTR_LENGTH];
- struct __attribute__ ((__packed__)) {
+ struct ATTR_PACKED {
u_int8_t buf_[SALT_LENGTH];
u_int16_t zero_;
} salt_;
#ifndef ANYTUN_02_COMPAT
- struct __attribute__((__packed__)) {
+ struct ATTR_PACKED {
u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - sizeof(seq_nr_t)];
u_int8_t label_;
seq_nr_t r_;
u_int16_t zero_;
} params_;
#else
- struct __attribute__((__packed__)) {
+ struct ATTR_PACKED {
u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - 2 - sizeof(seq_nr_t)];
u_int8_t label_;
u_int8_t r_fill_[2];