Sun, 27 Oct 2024 19:19:51 +0100
fix crash when closing the settings window
55
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
1 | /* |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
3 | * |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
4 | * Copyright 2024 Olaf Wintermann. All rights reserved. |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
5 | * |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
8 | * |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
11 | * |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
15 | * |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
27 | */ |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
28 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
29 | #include "pwdstore.h" |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
30 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
31 | #include "utils.h" |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
32 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
33 | #include <stdio.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
34 | #include <stdlib.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
35 | #include <string.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
36 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
37 | #include <cx/utils.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
38 | #include <cx/hash_map.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
39 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
40 | #ifdef _WIN32 |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
41 | #include <winsock.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
42 | #pragma comment(lib, "Ws2_32.lib") |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
43 | #else |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
44 | #include <netinet/in.h> |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
45 | #endif |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
46 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
47 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
48 | static pwdstore_pwinput_func pw_input = (pwdstore_pwinput_func)pwdstore_default_pwinput; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
49 | static void *pw_input_data = "Master password: "; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
50 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
51 | char * pwdstore_default_pwinput(char *prompt) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
52 | return util_password_input(prompt); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
53 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
54 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
55 | void pwdstore_set_pwinput_func(pwdstore_pwinput_func func, void *userdata) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
56 | pw_input = func; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
57 | pw_input_data = userdata; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
58 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
59 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
60 | PwdStore* pwdstore_open(const char *file) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
61 | FILE *in = fopen(file, "r"); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
62 | if(!in) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
63 | return NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
64 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
65 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
66 | CxBuffer *buf = cxBufferCreate(NULL, 2048, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
67 | cx_stream_copy(in, buf, (cx_read_func)fread, (cx_write_func)cxBufferWrite); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
68 | fclose(in); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
69 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
70 | if(buf->size < PWDS_HEADER_SIZE || buf->space[0] != PWDS_MAGIC_CHAR) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
71 | cxBufferFree(buf); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
72 | return NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
73 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
74 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
75 | PwdStore *p = malloc(sizeof(PwdStore)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
76 | p->ids = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
77 | p->locations = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
78 | p->noloc = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
79 | p->index = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
80 | p->content = buf; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
81 | p->key = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
82 | p->unlock_cmd = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
83 | p->lock_cmd = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
84 | p->encoffset = PWDS_HEADER_SIZE; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
85 | p->isdecrypted = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
86 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
87 | if(pwdstore_getindex(p)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
88 | pwdstore_free(p); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
89 | return NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
90 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
91 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
92 | return p; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
93 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
94 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
95 | PwdStore* pwdstore_new(void) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
96 | PwdStore *p = calloc(1, sizeof(PwdStore)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
97 | p->ids = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
98 | p->locations = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
99 | p->noloc = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
100 | p->index = cxHashMapCreate(cxDefaultAllocator, CX_STORE_POINTERS, 16); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
101 | p->content = cxBufferCreate(NULL, PWDS_HEADER_SIZE, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
102 | PWDS_MAGIC(p) = PWDS_MAGIC_CHAR; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
103 | PWDS_VERSION(p) = 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
104 | PWDS_ENC(p) = DAV_KEY_AES256; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
105 | PWDS_PWFUNC(p) = DAV_PWFUNC_PBKDF2_SHA256; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
106 | dav_rand_bytes((unsigned char*)p->content->space+4, 16); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
107 | p->isdecrypted = 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
108 | p->encoffset = PWDS_HEADER_SIZE; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
109 | return p; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
110 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
111 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
112 | static int readval(CxBuffer *in, char **val, int allowzero) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
113 | // value = length string |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
114 | // length = uint32 |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
115 | // string = bytes |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
116 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
117 | *val = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
118 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
119 | // get length |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
120 | uint32_t length = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
121 | if(cxBufferRead(&length, 1, sizeof(uint32_t), in) != sizeof(uint32_t)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
122 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
123 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
124 | length = ntohl(length); // convert from BE to host byte order |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
125 | if(length == 0) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
126 | if(allowzero) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
127 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
128 | } else { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
129 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
130 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
131 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
132 | if(length > PWDSTORE_MAX_LEN) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
133 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
134 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
135 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
136 | // get value |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
137 | char *value = malloc(length + 1); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
138 | value[length] = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
139 | if(cxBufferRead(value, 1, length, in) != length) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
140 | free(value); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
141 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
142 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
143 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
144 | *val = value; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
145 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
146 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
147 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
148 | static int read_indexentry(PwdStore *p, CxBuffer *in) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
149 | // read type of index element |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
150 | int type = cxBufferGet(in); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
151 | if(type == EOF || type != 0) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
152 | // only type 0 supported yet |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
153 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
154 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
155 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
156 | char *id = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
157 | CxList *locations = cxLinkedListCreateSimple(CX_STORE_POINTERS); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
158 | cxDefineDestructor(locations, free); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
159 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
160 | // get id (required) |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
161 | int ret = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
162 | if(readval(in, &id, FALSE)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
163 | // get locations |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
164 | char *location = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
165 | while((ret = readval(in, &location, TRUE)) == 1) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
166 | if(!location) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
167 | break; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
168 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
169 | cxListAdd(locations, location); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
170 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
171 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
172 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
173 | if(ret) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
174 | pwdstore_put_index(p, id, locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
175 | } else { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
176 | if(id) free(id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
177 | cxListDestroy(locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
178 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
179 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
180 | return ret; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
181 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
182 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
183 | static int read_pwdentry(PwdStore *p, CxBuffer *in) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
184 | int type = cxBufferGet(in); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
185 | if(type == EOF || type != 0) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
186 | // only type 0 supported yet |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
187 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
188 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
189 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
190 | char *id = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
191 | char *user = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
192 | char *password = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
193 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
194 | int ret = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
195 | if(readval(in, &id, FALSE)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
196 | if(readval(in, &user, FALSE)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
197 | if(readval(in, &password, FALSE)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
198 | pwdstore_put(p, id, user, password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
199 | ret = 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
200 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
201 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
202 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
203 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
204 | if(id) free(id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
205 | if(user) free(user); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
206 | if(password) free(password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
207 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
208 | return ret; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
209 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
210 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
211 | static void remove_list_entries(PwdStore *s, const char *id) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
212 | CxIterator i = cxListMutIterator(s->locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
213 | cx_foreach(PwdIndexEntry*, ie, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
214 | if(!strcmp(ie->id, id)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
215 | cxIteratorFlagRemoval(i); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
216 | cxIteratorNext(i); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
217 | break; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
218 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
219 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
220 | i = cxListMutIterator(s->noloc); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
221 | cx_foreach(PwdIndexEntry*, ie, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
222 | if(!strcmp(ie->id, id)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
223 | cxIteratorFlagRemoval(i); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
224 | cxIteratorNext(i); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
225 | break; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
226 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
227 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
228 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
229 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
230 | void pwdstore_remove_entry(PwdStore *s, const char *id) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
231 | remove_list_entries(s, id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
232 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
233 | CxHashKey key = cx_hash_key_str(id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
234 | PwdIndexEntry *i = cxMapRemoveAndGet(s->index, key); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
235 | PwdEntry *e = cxMapRemoveAndGet(s->ids, key); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
236 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
237 | if(i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
238 | cxListDestroy(i->locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
239 | free(i->id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
240 | free(i); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
241 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
242 | if(e) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
243 | free(e->id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
244 | free(e->user); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
245 | free(e->password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
246 | free(e); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
247 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
248 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
249 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
250 | int pwdstore_getindex(PwdStore *s) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
251 | uint32_t netindexlen; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
252 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
253 | // set the position to the last 4 bytes of the header |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
254 | // for reading index length |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
255 | s->content->pos = PWDS_HEADER_SIZE - sizeof(uint32_t); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
256 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
257 | // read indexlen and convert to host byte order |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
258 | if(cxBufferRead(&netindexlen, 1, sizeof(uint32_t), s->content) != sizeof(uint32_t)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
259 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
260 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
261 | uint32_t indexlen = ntohl(netindexlen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
262 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
263 | // integer overflow check |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
264 | if(UINT32_MAX - PWDS_HEADER_SIZE < indexlen) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
265 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
266 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
267 | if(s->content->size < PWDS_HEADER_SIZE + indexlen) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
268 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
269 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
270 | // encrypted content starts after the index content |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
271 | s->encoffset = PWDS_HEADER_SIZE + indexlen; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
272 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
273 | // the index starts after the header |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
274 | CxBuffer *index = cxBufferCreate(s->content->space+PWDS_HEADER_SIZE, indexlen, cxDefaultAllocator, 0); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
275 | index->size = indexlen; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
276 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
277 | // read index |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
278 | while(read_indexentry(s, index)) {} |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
279 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
280 | // free index buffer structure (not the content) |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
281 | cxBufferFree(index); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
282 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
283 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
284 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
285 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
286 | int pwdstore_decrypt(PwdStore *p) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
287 | if(!p->key) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
288 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
289 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
290 | if(p->isdecrypted) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
291 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
292 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
293 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
294 | // decrypt contet |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
295 | size_t encsz = p->content->size - p->encoffset; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
296 | CxBuffer *enc = cxBufferCreate(p->content->space + p->encoffset, encsz, cxDefaultAllocator, 0); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
297 | enc->size = encsz; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
298 | enc->size = p->content->size - p->encoffset; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
299 | CxBuffer *content = aes_decrypt_buffer(enc, p->key); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
300 | cxBufferFree(enc); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
301 | if(!content) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
302 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
303 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
304 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
305 | while(read_pwdentry(p, content)) {} |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
306 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
307 | cxBufferFree(content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
308 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
309 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
310 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
311 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
312 | int pwdstore_setpassword(PwdStore *p, const char *password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
313 | DavKey *key = dav_pw2key( |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
314 | password, |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
315 | (unsigned char*)(p->content->space + 4), |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
316 | 16, |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
317 | PWDS_PWFUNC(p), |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
318 | PWDS_ENC(p)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
319 | if(!key) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
320 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
321 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
322 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
323 | p->key = key; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
324 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
325 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
326 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
327 | void pwdstore_encsettings(PwdStore *p, uint8_t enc, uint8_t pwfunc) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
328 | PWDS_ENC(p) = enc; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
329 | PWDS_PWFUNC(p) = pwfunc; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
330 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
331 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
332 | void pwdstore_free_entry(PwdEntry *e) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
333 | if(e->id) free(e->id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
334 | if(e->user) free(e->user); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
335 | if(e->password) free(e->password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
336 | free(e); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
337 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
338 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
339 | void pwdstore_free(PwdStore* p) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
340 | cxDefineDestructor(p->ids, pwdstore_free_entry); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
341 | cxMapDestroy(p->ids); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
342 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
343 | cxListDestroy(p->locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
344 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
345 | if(p->content) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
346 | cxBufferFree(p->content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
347 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
348 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
349 | free(p); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
350 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
351 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
352 | int pwdstore_has_id(PwdStore *s, const char *id) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
353 | return cxMapGet(s->index, cx_hash_key_str(id)) ? 1 : 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
354 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
355 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
356 | PwdEntry* pwdstore_get(PwdStore *p, const char *id) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
357 | PwdEntry *e = cxMapGet(p->ids, cx_hash_key_str(id)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
358 | if(e && e->user && e->password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
359 | return e; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
360 | } else { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
361 | return NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
362 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
363 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
364 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
365 | void pwdstore_put(PwdStore *p, const char *id, const char *username, const char *password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
366 | PwdEntry *entry = malloc(sizeof(PwdEntry)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
367 | entry->id = strdup(id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
368 | entry->user = strdup(username); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
369 | entry->password = strdup(password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
370 | cxMapPut(p->ids, cx_hash_key_str(id), entry); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
371 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
372 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
373 | void pwdstore_put_index(PwdStore *p, char *id, CxList *locations) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
374 | PwdIndexEntry *e = cxMapGet(p->index, cx_hash_key_str(id)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
375 | if(e) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
376 | return; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
377 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
378 | PwdIndexEntry *newentry = malloc(sizeof(PwdIndexEntry)); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
379 | newentry->id = id; |
60
ee4e4742391e
add settings window and implement repository editing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
380 | if(cxListSize(locations) > 0) { |
55
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
381 | newentry->locations = locations; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
382 | cxListAdd(p->locations, newentry); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
383 | } else { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
384 | newentry->locations = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
385 | cxListAdd(p->noloc, newentry); |
60
ee4e4742391e
add settings window and implement repository editing
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
55
diff
changeset
|
386 | cxListDestroy(locations); |
55
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
387 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
388 | cxMapPut(p->index, cx_hash_key_str(id), newentry); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
389 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
390 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
391 | void write_index_entry(CxBuffer *out, PwdIndexEntry *e) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
392 | uint32_t idlen = strlen(e->id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
393 | uint32_t netidlen = htonl(idlen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
394 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
395 | cxBufferPut(out, 0); // type |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
396 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
397 | cxBufferWrite(&netidlen, 1, sizeof(uint32_t), out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
398 | cxBufferWrite(e->id, 1, idlen, out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
399 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
400 | CxIterator i = cxListIterator(e->locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
401 | cx_foreach(char *, location, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
402 | uint32_t locationlen = strlen(location); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
403 | uint32_t netlocationlen = htonl(locationlen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
404 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
405 | cxBufferWrite(&netlocationlen, 1, sizeof(uint32_t), out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
406 | cxBufferWrite(location, 1, locationlen, out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
407 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
408 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
409 | uint32_t terminate = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
410 | cxBufferWrite(&terminate, 1, sizeof(uint32_t), out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
411 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
412 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
413 | int pwdstore_store(PwdStore *p, const char *file) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
414 | if(!p->key) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
415 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
416 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
417 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
418 | CxBuffer *index = cxBufferCreate(NULL, 2048, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
419 | CxBuffer *content = cxBufferCreate(NULL, 2048, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
420 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
421 | // create index |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
422 | CxIterator i = cxListIterator(p->noloc); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
423 | cx_foreach(PwdIndexEntry*, e, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
424 | write_index_entry(index, e); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
425 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
426 | i = cxListIterator(p->locations); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
427 | cx_foreach(PwdIndexEntry*, e, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
428 | write_index_entry(index, e); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
429 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
430 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
431 | i = cxMapIteratorValues(p->ids); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
432 | cx_foreach(PwdEntry*, value, i) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
433 | if(!value->id || !value->user || !value->password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
434 | continue; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
435 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
436 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
437 | uint32_t idlen = strlen(value->id); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
438 | uint32_t ulen = strlen(value->user); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
439 | uint32_t plen = strlen(value->password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
440 | uint32_t netidlen = htonl(idlen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
441 | uint32_t netulen = htonl(ulen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
442 | uint32_t netplen = htonl(plen); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
443 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
444 | // content buffer |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
445 | cxBufferPut(content, 0); // type |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
446 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
447 | cxBufferWrite(&netidlen, 1, sizeof(uint32_t), content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
448 | cxBufferWrite(value->id, 1, idlen, content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
449 | cxBufferWrite(&netulen, 1, sizeof(uint32_t), content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
450 | cxBufferWrite(value->user, 1, ulen, content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
451 | cxBufferWrite(&netplen, 1, sizeof(uint32_t), content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
452 | cxBufferWrite(value->password, 1, plen, content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
453 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
454 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
455 | content->pos = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
456 | CxBuffer *enc = aes_encrypt_buffer(content, p->key); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
457 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
458 | p->content->pos = PWDS_HEADER_SIZE - sizeof(uint32_t); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
459 | p->content->size = PWDS_HEADER_SIZE; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
460 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
461 | // add index after header |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
462 | uint32_t netindexlen = htonl((uint32_t)index->size); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
463 | cxBufferWrite(&netindexlen, 1, sizeof(uint32_t), p->content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
464 | cxBufferWrite(index->space, 1, index->size, p->content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
465 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
466 | // add encrypted buffer |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
467 | cxBufferWrite(enc->space, 1, enc->size, p->content); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
468 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
469 | cxBufferFree(enc); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
470 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
471 | FILE *out = fopen(file, "w"); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
472 | if(!out) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
473 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
474 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
475 | fwrite(p->content->space, 1, p->content->size, out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
476 | fclose(out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
477 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
478 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
479 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
480 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
481 | int pwdstore_decrypt_secrets(PwdStore *secrets) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
482 | if(!pw_input) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
483 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
484 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
485 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
486 | char *ps_password = NULL; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
487 | if(secrets->unlock_cmd && strlen(secrets->unlock_cmd) > 0) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
488 | CxBuffer *cmd_out = cxBufferCreate(NULL, 128, cxDefaultAllocator, CX_BUFFER_FREE_CONTENTS|CX_BUFFER_AUTO_EXTEND); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
489 | if(!util_exec_command(secrets->unlock_cmd, cmd_out)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
490 | // command successful, get first line from output without newline |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
491 | // and use that as password for the secretstore |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
492 | size_t len = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
493 | for(size_t i=0;i<=cmd_out->size;i++) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
494 | if(i == cmd_out->size || cmd_out->space[i] == '\n') { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
495 | len = i; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
496 | break; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
497 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
498 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
499 | if(len > 0) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
500 | ps_password = malloc(len + 1); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
501 | memcpy(ps_password, cmd_out->space, len); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
502 | ps_password[len] = 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
503 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
504 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
505 | cxBufferFree(cmd_out); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
506 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
507 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
508 | if(!ps_password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
509 | ps_password = pw_input(pw_input_data); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
510 | if(!ps_password) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
511 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
512 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
513 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
514 | |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
515 | int err = pwdstore_setpassword(secrets, ps_password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
516 | free(ps_password); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
517 | if(err) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
518 | fprintf(stderr, "Error: cannot create key from password\n"); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
519 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
520 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
521 | if(pwdstore_decrypt(secrets)) { |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
522 | fprintf(stderr, "Error: cannot decrypt secrets store\n"); |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
523 | return 1; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
524 | } |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
525 | return 0; |
1ce14068ef31
update libidav, unify config.c with cmdutils
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
diff
changeset
|
526 | } |