Corrected some data types and more documentation.

diff --git a/libextra/gnutls-extra.h b/libextra/gnutls-extra.h
index 2e58b047dc47b99354e6009ecf7ba8b8547bcb41..22d27a07362a53228d78067d560ca01db54da499 100644 (file)
--- a/libextra/gnutls-extra.h
+++ b/libextra/gnutls-extra.h
@@ -77,7 +77,7 @@ int gnutls_certificate_set_openpgp_trustdb(GNUTLS_CERTIFICATE_CREDENTIALS res,
 
 int gnutls_certificate_set_openpgp_keyring_mem(
     GNUTLS_CERTIFICATE_CREDENTIALS c,
-    const opaque *data, size_t dlen );
+    const unsigned char *data, size_t dlen );
 
 int gnutls_certificate_set_openpgp_keyring_file( GNUTLS_CERTIFICATE_CREDENTIALS res, const char *name);
 

diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index 2b02484d47b6ba7f626cafa070b74927a060d67a..d8842d339136898e431b25007cce5003225e760c 100644 (file)
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -1070,6 +1070,12 @@ leave:
  *
  * Verify all signatures in the certificate list. When the key
  * is not available, the signature is skipped.
+ *
+ * When the trustdb parameter is used, the function checks the
+ * ownertrust of the key before the signatures are checked. It
+ * is possible that the key was disabled or the owner is not trusted
+ * at all. Then we don't check the signatures because it makes no sense.
+ *
  * The return value is one of the CertificateStatus entries.
  **/
 int
@@ -1259,7 +1265,7 @@ gnutls_openpgp_add_keyring_file(gnutls_datum *keyring, const char *name)
  -*/
 int
 gnutls_openpgp_add_keyring_mem(gnutls_datum *keyring,
-                               const char *data, size_t len)
+                               const opaque *data, size_t len)
 {
     uint8 *blob;
     size_t nbytes = 0;

diff --git a/libextra/gnutls_openpgp.h b/libextra/gnutls_openpgp.h
index 4a0e42aa9e51e650f51832dcbd2eb9164c52dea9..314f8622198bc5f5018265f357856b77937eebd7 100644 (file)
--- a/libextra/gnutls_openpgp.h
+++ b/libextra/gnutls_openpgp.h
@@ -54,7 +54,7 @@ int gnutls_openpgp_keyid(
 
 int gnutls_openpgp_add_keyring_mem(
     gnutls_datum *keyring,
-    const char *data,
+    const opaque *data,
     size_t len );
 
 int gnutls_openpgp_add_keyring_file(