Improved gnutls_certificate_client_retrieve_function() and gnutls_certificate_server_retrieve_function() so that the parsing time spent within them is minimized. Also added gnutls_openpgp_privkey struct. No testing yet.

1 files changed, 17 insertions, 0 deletions

diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 208050da54..8778213bdd 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -35,6 +35,9 @@ extern "C" {
 struct gnutls_openpgp_key_int; /* object to hold (parsed) openpgp keys */
 typedef struct gnutls_openpgp_key_int* gnutls_openpgp_key;
 
+struct gnutls_openpgp_privkey_int; /* object to hold (parsed) openpgp private keys */
+typedef struct gnutls_openpgp_privkey_int* gnutls_openpgp_privkey;
+
 typedef enum gnutls_openpgp_key_fmt { GNUTLS_OPENPGP_FMT_RAW,
         GNUTLS_OPENPGP_FMT_BASE64 } gnutls_openpgp_key_fmt;
 
@@ -68,6 +71,15 @@ int gnutls_openpgp_key_check_hostname( gnutls_openpgp_key key, const char *hostn
 int gnutls_openpgp_key_to_xml( gnutls_openpgp_key key, gnutls_datum *xmlkey,
 	int ext);
 
+/* privkey stuff.
+ */
+int gnutls_openpgp_privkey_init(gnutls_openpgp_privkey * key);
+void gnutls_openpgp_privkey_deinit(gnutls_openpgp_privkey key);
+int gnutls_openpgp_privkey_get_pk_algorithm( gnutls_openpgp_privkey key, unsigned int *bits);
+int gnutls_openpgp_privkey_import(gnutls_openpgp_privkey key, 
+	const gnutls_datum * data, gnutls_openpgp_key_fmt format,
+	const char* pass, unsigned int flags);
+
 /* Keyring stuff.
  */
 struct gnutls_openpgp_keyring_int; /* object to hold (parsed) openpgp keyrings */
@@ -107,6 +119,11 @@ int gnutls_openpgp_key_verify_trustdb(
 	unsigned int * verify /* the output of the verification */);
 
 
+/* certificate authentication stuff.
+ */
+int gnutls_certificate_set_openpgp_key(gnutls_certificate_credentials res,
+	gnutls_openpgp_key key, gnutls_openpgp_privkey pkey)
+
 #ifdef __cplusplus
 }
 #endif