summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-16 21:14:02 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-16 21:14:02 +0000
commit48ab0e925f577816bc5d3b1336f10a35b1728c7c (patch)
tree4959a5e252a7bc23617bd57b771eeccc34e0df8a
parentfixed packet length errors (diff)
fixed anytun 0.2 compat mode
fixed invalid free at options parser
-rw-r--r--src/key_derivation.c5
-rw-r--r--src/options.c1
2 files changed, 0 insertions, 6 deletions
diff --git a/src/key_derivation.c b/src/key_derivation.c
index 0283a7c..957cba0 100644
--- a/src/key_derivation.c
+++ b/src/key_derivation.c
@@ -385,11 +385,6 @@ int key_derivation_aesctr_calc_ctr(key_derivation_t* kd, key_store_dir_t dir, se
return 0;
}
-#ifdef ANYTUN_02_COMPAT
- if(!kd->master_salt_.buf_[0])
- kd->master_salt_.buf_[0] = 1;
-#endif
-
if(kd->master_salt_.length_ != KD_AESCTR_SALT_LENGTH) {
log_printf(ERR, "master salt has the wrong length");
return -1;
diff --git a/src/options.c b/src/options.c
index 32f0ce7..4f97bfe 100644
--- a/src/options.c
+++ b/src/options.c
@@ -112,7 +112,6 @@
{ \
if(argc < 1 || argv[i+1][0] == '-') \
return i; \
- if(VALUE.buf_) free(VALUE.buf_); \
int ret; \
ret = options_parse_hex_string(argv[i+1], &VALUE); \
if(ret > 0) \