summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-02-26 12:59:02 +0000
committerChristian Pointner <equinox@anytun.org>2009-02-26 12:59:02 +0000
commit65cfa09319d4261bf8f64315600da8221c80b6bc (patch)
tree378747a40ed4ba7f49b65cd648605597a603fd9d /src
parentadded -4 and -6 to command line parser (no affect until now) (diff)
updated README
some cleanup
Diffstat (limited to 'src')
-rw-r--r--src/cipher.h2
-rw-r--r--src/keyDerivation.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/cipher.h b/src/cipher.h
index 7ea8166..c358969 100644
--- a/src/cipher.h
+++ b/src/cipher.h
@@ -120,7 +120,7 @@ private:
u_int16_t zero_;
} salt_;
struct ATTR_PACKED {
- u_int8_t fill_[SALT_LENGTH - sizeof(mux_t) - sizeof(sender_id_t) - 2 - sizeof(seq_nr_t)];
+ u_int8_t fill_[SALT_LENGTH - sizeof(mux_t) - sizeof(sender_id_t) - 2*sizeof(u_int8_t) - sizeof(seq_nr_t)];
mux_t mux_;
sender_id_t sender_id_;
u_int8_t empty_[2];
diff --git a/src/keyDerivation.h b/src/keyDerivation.h
index ef7998f..7242996 100644
--- a/src/keyDerivation.h
+++ b/src/keyDerivation.h
@@ -196,7 +196,7 @@ private:
u_int16_t zero_;
} params_;
struct ATTR_PACKED {
- u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - 2 - sizeof(seq_nr_t)];
+ u_int8_t fill_[SALT_LENGTH - sizeof(u_int8_t) - 2*sizeof(u_int8_t) - sizeof(seq_nr_t)];
u_int8_t label_;
u_int8_t r_fill_[2];
seq_nr_t r_;