comparison: dav/config.c
dav/config.c
- changeset 228
- c0175372c35d
- parent 224
- 4b55f05f4e00
- child 247
- 3020d1b5e7bd
equal
deleted
inserted
replaced
| 227:bf485439222a | 228:c0175372c35d |
|---|---|
| 359 } else if(xstreq(node->name, "type")) { | 359 } else if(xstreq(node->name, "type")) { |
| 360 if(!strcmp(value, "aes128")) { | 360 if(!strcmp(value, "aes128")) { |
| 361 key->type = KEY_AES128; | 361 key->type = KEY_AES128; |
| 362 } else if(!strcmp(value, "aes256")) { | 362 } else if(!strcmp(value, "aes256")) { |
| 363 key->type = KEY_AES256; | 363 key->type = KEY_AES256; |
| 364 } else if(!strcmp(value, "password")) { | 364 } else { |
| 365 key->type = KEY_PASSWORD; | 365 fprintf(stderr, "Error: unknown key type %s\n", value); |
| 366 error = 1; | |
| 366 } | 367 } |
| 367 } | 368 } |
| 368 | 369 |
| 369 } | 370 } |
| 370 node = node->next; | 371 node = node->next; |
| 391 key->name, | 392 key->name, |
| 392 key->length); | 393 key->length); |
| 393 error = 1; | 394 error = 1; |
| 394 } | 395 } |
| 395 key->length = 32; | 396 key->length = 32; |
| 396 } | |
| 397 if(key->type == KEY_PASSWORD) { | |
| 398 key->length = 0; | |
| 399 if(key->data) { | |
| 400 // make sure the pw-key is not loaded from a file | |
| 401 free(key->data); | |
| 402 key->data = NULL; | |
| 403 } | |
| 404 } | 397 } |
| 405 | 398 |
| 406 // add key to context | 399 // add key to context |
| 407 if(!error) { | 400 if(!error) { |
| 408 ucx_map_cstr_put(keys, key->name, key); | 401 ucx_map_cstr_put(keys, key->name, key); |
