From 2e07c29960c20d74814a94b567fda782b3f7c5d5 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 2 Jan 2009 20:01:35 +0000 Subject: changed to anytun compatible version --- src/key_derivation.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/key_derivation.c') diff --git a/src/key_derivation.c b/src/key_derivation.c index 3977993..e53d7f6 100644 --- a/src/key_derivation.c +++ b/src/key_derivation.c @@ -229,7 +229,8 @@ int key_derivation_aesctr_calc_ctr(key_derivation_t* kd, key_store_t* result, sa mpz_import(ctr, kd->master_salt_.length_, 1, 1, 0, 0, kd->master_salt_.buf_); mpz_set_ui(key_id, label); - mpz_mul_2exp(key_id, key_id, (sizeof(r) * 8)); +/* mpz_mul_2exp(key_id, key_id, (sizeof(r) * 8)); */ + mpz_mul_2exp(key_id, key_id, 48); mpz_add_ui(key_id, key_id, r); mpz_xor(ctr, ctr, key_id); @@ -239,10 +240,10 @@ int key_derivation_aesctr_calc_ctr(key_derivation_t* kd, key_store_t* result, sa free(result->key_.buf_); result->key_.buf_ = mpz_export(NULL, (size_t*)&(result->key_.length_), 1, 1, 0, 0, ctr); - if(faked_msb) { - kd->master_salt_.buf_[0] = 0; - result->key_.buf_[0] = 0; - } +/* if(faked_msb) { */ +/* kd->master_salt_.buf_[0] = 0; */ +/* result->key_.buf_[0] = 0; */ +/* } */ mpz_clear(ctr); mpz_clear(key_id); -- cgit v1.2.3