summaryrefslogtreecommitdiff
path: root/src/key_derivation.c
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2009-01-10 00:45:05 +0000
committerChristian Pointner <equinox@anytun.org>2009-01-10 00:45:05 +0000
commit85f0a4508a84fc5f52b43910b7b4680639172735 (patch)
tree29b194e678787f2968ea84ddc73e4257e2d16be8 /src/key_derivation.c
parentadded usage output and --help to configure script (diff)
added posibility to disable passphrase calculation
Diffstat (limited to 'src/key_derivation.c')
-rw-r--r--src/key_derivation.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/key_derivation.c b/src/key_derivation.c
index d78a493..60d1921 100644
--- a/src/key_derivation.c
+++ b/src/key_derivation.c
@@ -122,6 +122,7 @@ int key_derivation_init(key_derivation_t* kd, const char* type, int8_t ld_kdr, c
return ret;
}
+#ifndef NO_PASSPHRASE
int key_derivation_generate_master_key(key_derivation_t* kd, const char* passphrase, u_int16_t key_length)
{
if(!kd || !passphrase)
@@ -232,6 +233,7 @@ int key_derivation_generate_master_salt(key_derivation_t* kd, const char* passph
return 0;
}
+#endif
void key_derivation_close(key_derivation_t* kd)
{
@@ -301,6 +303,7 @@ int key_derivation_aesctr_init(key_derivation_t* kd, const char* passphrase)
params->handle_ = 0;
#endif
+#ifndef NO_PASSPHRASE
if(passphrase) {
int ret = key_derivation_generate_master_key(kd, passphrase, kd->key_length_);
if(ret)
@@ -309,6 +312,7 @@ int key_derivation_aesctr_init(key_derivation_t* kd, const char* passphrase)
if(ret)
return ret;
}
+#endif
#ifndef USE_SSL_CRYPTO
int algo;