Mercurial > hg > dav / file diff

--- a/dav/config.c	Sun Mar 20 16:13:41 2016 +0100
+++ b/dav/config.c	Mon Mar 21 13:56:16 2016 +0100
@@ -361,8 +361,9 @@
                     key->type = KEY_AES128;
                 } else if(!strcmp(value, "aes256")) {
                     key->type = KEY_AES256;
-                } else if(!strcmp(value, "password")) {
-                    key->type = KEY_PASSWORD;
+                } else {
+                    fprintf(stderr, "Error: unknown key type %s\n", value);
+                    error = 1;
                 }
             }
                 
@@ -394,14 +395,6 @@
             }
             key->length = 32;
         }
-        if(key->type == KEY_PASSWORD) {
-            key->length = 0;
-            if(key->data) {
-                // make sure the pw-key is not loaded from a file
-                free(key->data);
-                key->data = NULL;
-            }
-        }
         
         // add key to context
         if(!error) {