Merge commit 'jrollins/master'

[monkeysphere.git] / src / keytrans / gnutls-helpers.h

diff --git a/src/keytrans/gnutls-helpers.h b/src/keytrans/gnutls-helpers.h
index 9ea22a3491c90e8266fcd5a9b4c3c7c3f9a9732d..f196456c58cf58f3453975c56d5bba75d6216fe1 100644 (file)
--- a/src/keytrans/gnutls-helpers.h
+++ b/src/keytrans/gnutls-helpers.h
@@ -23,7 +23,7 @@ int init_gnutls();
 
 /* logging and output functions: */
 
-void err(const char* fmt, ...);
+void err(int level, const char* fmt, ...);
 void logfunc(int level, const char* string);
 
 /* basic datum manipulations: */
@@ -44,6 +44,12 @@ typedef unsigned char printable_keyid[16];
 
 void init_keyid(gnutls_openpgp_keyid_t keyid);
 void make_keyid_printable(printable_keyid out, gnutls_openpgp_keyid_t keyid);
+void collapse_printable_keyid(gnutls_openpgp_keyid_t out, printable_keyid in);
+int convert_string_to_keyid(gnutls_openpgp_keyid_t out, const char* str);
+int convert_string_to_printable_keyid(printable_keyid out, const char* str);
+
+/* you must have twice as many bytes in the out buffer as in the in buffer */
+void hex_print_data(char* out, const char* in, size_t incount);
 
 /* functions to get data into datum objects: */