*** empty log message ***

2 files changed, 26 insertions, 21 deletions

diff --git a/NEWS b/NEWS
index a427ace3f9..9dd15b219c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,15 +1,17 @@
-Version 1.0.14
+Version 1.0.14 (12/06/2004)
 - Automatically disable certificate types that do not have corresponding
   certificates.
 - Updates in the documentation.
 - certtool can now add ip address SAN extension.
 - certtool has now support for more X.520 DN attribute types.
 - Opencdk library is being included if not found.
+- Added gnutls_openpgp_keyring_check_id().
 - Corrected a serious bug in the included libtasn1 library.
 - Corrected session resuming in SRP ciphersuites.
 - Updated to conform to the latest srp draft (draft-ietf-tls-srp-07)
 - Added the functions gnutls_x509_crt_get_pk_rsa_raw() and
   gnutls_x509_crt_get_pk_dsa_raw() to retrieve parameters from certificates.
+- Some fixes in the session resuming code.
 
 Version 1.0.13 (29/04/2004)
 - Some complilation fixes.
diff --git a/includes/gnutls/openpgp.h b/includes/gnutls/openpgp.h
index 6960e1d957..7d9dc237cd 100644
--- a/includes/gnutls/openpgp.h
+++ b/includes/gnutls/openpgp.h
@@ -43,20 +43,20 @@ int gnutls_openpgp_key_init( gnutls_openpgp_key* key); /* initializes the memory
 void gnutls_openpgp_key_deinit(gnutls_openpgp_key key); /* frees all memory */
 
 int gnutls_openpgp_key_import(gnutls_openpgp_key key,
-	const gnutls_datum* data, gnutls_openpgp_key_fmt format);
+    const gnutls_datum* data, gnutls_openpgp_key_fmt format);
 int gnutls_openpgp_key_export(gnutls_openpgp_key key, 
-	gnutls_openpgp_key_fmt format, void* output_data,
-	size_t* output_data_size);
+    gnutls_openpgp_key_fmt format, void* output_data,
+    size_t* output_data_size);
 
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
 int gnutls_openpgp_key_get_key_usage( gnutls_openpgp_key cert, unsigned int* key_usage);
 int gnutls_openpgp_key_get_fingerprint( gnutls_openpgp_key key,
-	void* result, size_t* result_size);
-	
+    void* result, size_t* result_size);
+    
 int gnutls_openpgp_key_get_name( gnutls_openpgp_key key,
-	int idx, char *buf, size_t *sizeof_buf);
+    int idx, char *buf, size_t *sizeof_buf);
 
 int gnutls_openpgp_key_get_pk_algorithm(gnutls_openpgp_key key,
                                             unsigned int *r_bits);
@@ -71,7 +71,7 @@ int gnutls_openpgp_key_get_id( gnutls_openpgp_key key, unsigned char keyid[8]);
 int gnutls_openpgp_key_check_hostname( gnutls_openpgp_key key, const char *hostname);
 
 int gnutls_openpgp_key_to_xml( gnutls_openpgp_key key, gnutls_datum *xmlkey,
-	int ext);
+    int ext);
 
 /* privkey stuff.
  */
@@ -79,8 +79,8 @@ 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);
+    const gnutls_datum * data, gnutls_openpgp_key_fmt format,
+    const char* pass, unsigned int flags);
 
 /* Keyring stuff.
  */
@@ -91,7 +91,10 @@ int gnutls_openpgp_keyring_init( gnutls_openpgp_keyring* ring);
 void gnutls_openpgp_keyring_deinit(gnutls_openpgp_keyring ring);
 
 int gnutls_openpgp_keyring_import(gnutls_openpgp_keyring ring,
-	const gnutls_datum* data, gnutls_openpgp_key_fmt format);
+    const gnutls_datum* data, gnutls_openpgp_key_fmt format);
+
+int gnutls_openpgp_keyring_check_id( gnutls_openpgp_keyring ring,
+    const unsigned char keyid[8], unsigned int flags);
 
 /* Trustdb functions.
  */
@@ -102,29 +105,29 @@ int gnutls_openpgp_trustdb_init( gnutls_openpgp_trustdb* db);
 void gnutls_openpgp_trustdb_deinit(gnutls_openpgp_trustdb db);
 
 int gnutls_openpgp_trustdb_import(gnutls_openpgp_trustdb db,
-	const char* file);
+    const char* file);
 
 
 int gnutls_openpgp_key_verify_ring( 
-	gnutls_openpgp_key key, 
-	gnutls_openpgp_keyring ring,
-	unsigned int flags,
-	unsigned int * verify /* the output of the verification */);
+    gnutls_openpgp_key key, 
+    gnutls_openpgp_keyring ring,
+    unsigned int flags,
+    unsigned int * verify /* the output of the verification */);
 
 int gnutls_openpgp_key_verify_self( gnutls_openpgp_key key,
         unsigned int flags, unsigned int *verify);
 
 int gnutls_openpgp_key_verify_trustdb( 
-	gnutls_openpgp_key key, 
-	gnutls_openpgp_trustdb db,
-	unsigned int flags,
-	unsigned int * verify /* the output of the verification */);
+    gnutls_openpgp_key key, 
+    gnutls_openpgp_trustdb db,
+    unsigned int flags,
+    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);
+    gnutls_openpgp_key key, gnutls_openpgp_privkey pkey);
 
 #ifdef __cplusplus
 }