diff -r e48048334602 -r 458a8dc68048 libidav/utils.h --- a/libidav/utils.h Sat Oct 03 16:44:50 2015 +0200 +++ b/libidav/utils.h Sat Oct 03 18:11:07 2015 +0200 @@ -77,13 +77,19 @@ char* util_base64encode(char *in, size_t len); char* util_encrypt_str(DavSession *sn, char *str, char *key); +char* util_encrypt_str_k(DavSession *sn, char *str, DavKey *key); char* util_decrypt_str(DavSession *sn, char *str, char *key); +char* util_decrypt_str_k(DavSession *sn, char *str, DavKey *key); char* util_random_str(); sstr_t util_getsubstr_until_token(sstr_t str, sstr_t token, sstr_t *sub); sstr_t util_readline(FILE *stream); +char* util_password_input(char *prompt); + +void util_generate_key(DavKey *key, char *password); +char* util_key_input(DavContext *ctx, DavKey *key); #ifdef __cplusplus }