Merge branch 'master' of ssh://nmav@git.sv.gnu.org/srv/git/gnutls

diff --cc NEWS
Simple merge

diff --cc includes/gnutls/openpgp.h
Simple merge

diff --cc lib/openpgp/openpgp.h
index 8a8cd58581d4a2157f664f04d248087a5dd054c6,662883410520576fdd2d1b7fae4bcb767b8afcf9..bf4f5b5ebcf55652eba716203797f305d88c94bd
--- 1/lib/openpgp/openpgp.h
--- 2/lib/openpgp/openpgp.h
+++ b/lib/openpgp/openpgp.h
@@@ -63,29 -38,11 +46,11 @@@ int _gnutls_openpgp_export (cdk_kbnode_
                               gnutls_openpgp_crt_fmt_t format,
                               void *output_data, size_t * output_data_size);
  
- void gnutls_openpgp_keyring_deinit (gnutls_openpgp_keyring_t keyring);
- int gnutls_openpgp_keyring_init (gnutls_openpgp_keyring_t * keyring);
- int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
-                                  const gnutls_datum_t * data,
-                                  gnutls_openpgp_crt_fmt_t format);
- int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
-                                    gnutls_openpgp_keyid_t keyid,
-                                    unsigned int flags);
- 
- int gnutls_openpgp_crt_verify_ring (gnutls_openpgp_crt_t key,
-                                   gnutls_openpgp_keyring_t keyring,
-                                   unsigned int flags, unsigned int *verify);
- 
- int gnutls_openpgp_crt_verify_self (gnutls_openpgp_crt_t key,
-                                   unsigned int flags, unsigned int *verify);
- 
  int _gnutls_openpgp_crt_to_gcert (gnutls_cert * gcert,
 -                                gnutls_openpgp_crt_t cert, gnutls_openpgp_keyid_t keyid);
 +                                gnutls_openpgp_crt_t cert);
  int _gnutls_openpgp_privkey_to_gkey (gnutls_privkey * dest,
 -                                   gnutls_openpgp_privkey_t src, gnutls_openpgp_keyid_t);
 +                                   gnutls_openpgp_privkey_t src);
  
- void gnutls_openpgp_privkey_deinit (gnutls_openpgp_privkey_t key);
- 
  cdk_packet_t _gnutls_get_valid_subkey(cdk_kbnode_t knode, int key_type);
  
  unsigned int _gnutls_get_pgp_key_usage(unsigned int pgp_usage);

diff --cc lib/openpgp/pgp.c
Simple merge