From 2b3a248b51d041ad5814409edfac1e2ae20b2a5a Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 16 Dec 2007 09:04:11 +0000
Subject: more changes for openpgp support. Seems to be at a workable state.

---
(limited to 'src/gnutls_config.c')

diff --git a/src/gnutls_config.c b/src/gnutls_config.c
index 4dccd08..f08512e 100644
--- a/src/gnutls_config.c
+++ b/src/gnutls_config.c
@@ -1,5 +1,6 @@
 /**
  *  Copyright 2004-2005 Paul Querna
+ *  Copyright 2007 Nikos Mavrogiannopoulos
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -229,7 +230,6 @@ const char *mgs_set_pgpcert_file(cmd_parms * parms, void *dummy,
 			    gnutls_strerror(ret));
     }
       
-
     ret =
 	gnutls_openpgp_crt_import(sc->cert_pgp, &data, GNUTLS_OPENPGP_FMT_BASE64);
     if (ret < 0) {
@@ -450,6 +450,12 @@ const char *mgs_set_keyring_file(cmd_parms * parms, void *dummy,
 			    "Keyring File '%s'", file);
     }
 
+    rv = gnutls_openpgp_keyring_init(&sc->pgp_list);
+    if (rv < 0) {
+	return apr_psprintf(parms->pool, "GnuTLS: Failed to initialize"
+			    "keyring: (%d) %s", rv, gnutls_strerror(rv));
+    }
+
     rv = gnutls_openpgp_keyring_import(sc->pgp_list, &data, GNUTLS_OPENPGP_FMT_BASE64);
     if (rv < 0) {
 	return apr_psprintf(parms->pool, "GnuTLS: Failed to load "
--
cgit v0.9.2