*** empty log message ***

5 files changed, 26 insertions, 26 deletions

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 13eb2180ec..cf53a40ba7 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -390,8 +390,8 @@ void gnutls_certificate_server_set_retrieve_function(gnutls_certificate_credenti
 /* These are set by the gnutls_extra library's initialization function.
  */
 
-OPENPGP_KEY_CREATION_TIME_FUNC _E_gnutls_openpgp_extract_key_creation_time = NULL;
-OPENPGP_KEY_EXPIRATION_TIME_FUNC _E_gnutls_openpgp_extract_key_expiration_time = NULL;
+OPENPGP_KEY_CREATION_TIME_FUNC _E_gnutls_openpgp_get_raw_key_creation_time = NULL;
+OPENPGP_KEY_EXPIRATION_TIME_FUNC _E_gnutls_openpgp_get_raw_key_expiration_time = NULL;
 OPENPGP_VERIFY_KEY_FUNC _E_gnutls_openpgp_verify_key = NULL;
 
 /*-
@@ -517,12 +517,12 @@ time_t gnutls_certificate_expiration_time_peers(gnutls_session session)
 
 	switch( gnutls_certificate_type_get( session)) {
 		case GNUTLS_CRT_X509:
-			return gnutls_x509_extract_certificate_expiration_time(
+			return _gnutls_x509_get_raw_crt_expiration_time(
 				&info->raw_certificate_list[0]);
 		case GNUTLS_CRT_OPENPGP:
-			if (_E_gnutls_openpgp_extract_key_expiration_time==NULL)
+			if (_E_gnutls_openpgp_get_raw_key_expiration_time==NULL)
 				return (time_t)-1;
-			return _E_gnutls_openpgp_extract_key_expiration_time(
+			return _E_gnutls_openpgp_get_raw_key_expiration_time(
 				&info->raw_certificate_list[0]);
 		default:
 			return (time_t)-1;
@@ -557,12 +557,12 @@ time_t gnutls_certificate_activation_time_peers(gnutls_session session)
 
 	switch( gnutls_certificate_type_get( session)) {
 		case GNUTLS_CRT_X509:
-			return gnutls_x509_extract_certificate_activation_time(
+			return _gnutls_x509_get_raw_crt_activation_time(
 				&info->raw_certificate_list[0]);
 		case GNUTLS_CRT_OPENPGP:
-			if (_E_gnutls_openpgp_extract_key_creation_time==NULL)
+			if (_E_gnutls_openpgp_get_raw_key_creation_time==NULL)
 				return (time_t)-1;
-			return _E_gnutls_openpgp_extract_key_creation_time(
+			return _E_gnutls_openpgp_get_raw_key_creation_time(
 				&info->raw_certificate_list[0]);
 		default:
 			return (time_t)-1;
diff --git a/lib/x509/compat.h b/lib/x509/compat.h
index 834c41caa9..2e27dd2fb9 100644
--- a/lib/x509/compat.h
+++ b/lib/x509/compat.h
@@ -1,4 +1,4 @@
 #include <gnutls/compat8.h>
 
-time_t gnutls_x509_extract_certificate_activation_time( const gnutls_datum*);
-time_t gnutls_x509_extract_certificate_expiration_time( const gnutls_datum*);
+time_t _gnutls_x509_get_raw_crt_activation_time( const gnutls_datum*);
+time_t _gnutls_x509_get_raw_crt_expiration_time( const gnutls_datum*);
diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index 00c99b2c7e..6d3bfd5a45 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -150,8 +150,8 @@ int i;
 }
 
 
-extern OPENPGP_KEY_CREATION_TIME_FUNC _E_gnutls_openpgp_extract_key_creation_time;
-extern OPENPGP_KEY_EXPIRATION_TIME_FUNC _E_gnutls_openpgp_extract_key_expiration_time;
+extern OPENPGP_KEY_CREATION_TIME_FUNC _E_gnutls_openpgp_get_raw_key_creation_time;
+extern OPENPGP_KEY_EXPIRATION_TIME_FUNC _E_gnutls_openpgp_get_raw_key_expiration_time;
 extern OPENPGP_VERIFY_KEY_FUNC _E_gnutls_openpgp_verify_key;
 extern OPENPGP_FINGERPRINT _E_gnutls_openpgp_fingerprint;
 extern OPENPGP_KEY_REQUEST _E_gnutls_openpgp_request_key;
@@ -166,10 +166,10 @@ extern OPENPGP_PRIVKEY_DEINIT _E_gnutls_openpgp_privkey_deinit;
 
 static void _gnutls_add_openpgp_functions(void) {
 #ifdef HAVE_LIBOPENCDK
-	_E_gnutls_openpgp_verify_key = gnutls_openpgp_verify_key;
-	_E_gnutls_openpgp_extract_key_expiration_time = gnutls_openpgp_extract_key_expiration_time;
-	_E_gnutls_openpgp_extract_key_creation_time = gnutls_openpgp_extract_key_creation_time;
-	_E_gnutls_openpgp_fingerprint = gnutls_openpgp_fingerprint;
+	_E_gnutls_openpgp_verify_key = _gnutls_openpgp_verify_key;
+	_E_gnutls_openpgp_get_raw_key_expiration_time = _gnutls_openpgp_get_raw_key_expiration_time;
+	_E_gnutls_openpgp_get_raw_key_creation_time = _gnutls_openpgp_get_raw_key_creation_time;
+	_E_gnutls_openpgp_fingerprint = _gnutls_openpgp_fingerprint;
 	_E_gnutls_openpgp_request_key = _gnutls_openpgp_request_key;
 
 	_E_gnutls_openpgp_raw_key_to_gcert = _gnutls_openpgp_raw_key_to_gcert;
diff --git a/libextra/openpgp/compat.c b/libextra/openpgp/compat.c
index 963efad620..96386d9e0f 100644
--- a/libextra/openpgp/compat.c
+++ b/libextra/openpgp/compat.c
@@ -49,7 +49,7 @@
  * NOTE: this function does not verify using any "web of trust". You
  * may use GnuPG for that purpose, or any other external PGP application.
  -*/
-int gnutls_openpgp_verify_key(const char *trustdb,
+int _gnutls_openpgp_verify_key(const char *trustdb,
 			  const gnutls_datum * keyring,
 			  const gnutls_datum * cert_list,
 			  int cert_list_length)
@@ -149,7 +149,7 @@ leave:
  * Returns the fingerprint of the OpenPGP key. Depence on the algorithm,
  * the fingerprint can be 16 or 20 bytes.
  -*/
-int gnutls_openpgp_fingerprint(const gnutls_datum * cert,
+int _gnutls_openpgp_fingerprint(const gnutls_datum * cert,
 			   unsigned char *fpr, size_t * fprlen)
 {
 	gnutls_openpgp_key key;
@@ -179,12 +179,12 @@ int gnutls_openpgp_fingerprint(const gnutls_datum * cert,
 }
 
 /*-
- * gnutls_openpgp_extract_key_creation_time - Extract the timestamp
+ * gnutls_openpgp_get_raw_key_creation_time - Extract the timestamp
  * @cert: the raw data that contains the OpenPGP public key.
  *
  * Returns the timestamp when the OpenPGP key was created.
  -*/
-time_t gnutls_openpgp_extract_key_creation_time(const gnutls_datum * cert)
+time_t _gnutls_openpgp_get_raw_key_creation_time(const gnutls_datum * cert)
 {
 	gnutls_openpgp_key key;
 	int ret;
@@ -211,13 +211,13 @@ time_t gnutls_openpgp_extract_key_creation_time(const gnutls_datum * cert)
 
 
 /*-
- * gnutls_openpgp_extract_key_expiration_time - Extract the expire date
+ * gnutls_openpgp_get_raw_key_expiration_time - Extract the expire date
  * @cert: the raw data that contains the OpenPGP public key.
  *
  * Returns the time when the OpenPGP key expires. A value of '0' means
  * that the key doesn't expire at all.
  -*/
-time_t gnutls_openpgp_extract_key_expiration_time(const gnutls_datum * cert)
+time_t _gnutls_openpgp_get_raw_key_expiration_time(const gnutls_datum * cert)
 {
 	gnutls_openpgp_key key;
 	int ret;
diff --git a/libextra/openpgp/gnutls_openpgp.h b/libextra/openpgp/gnutls_openpgp.h
index f62c721c70..7b526144b1 100644
--- a/libextra/openpgp/gnutls_openpgp.h
+++ b/libextra/openpgp/gnutls_openpgp.h
@@ -88,14 +88,14 @@ keybox_blob* kbx_read_blob( const gnutls_datum* keyring, size_t pos );
 cdk_keydb_hd_t kbx_to_keydb( keybox_blob *blob );
 void kbx_blob_release( keybox_blob *ctx );
 
-int gnutls_openpgp_verify_key(const char *trustdb,
+int _gnutls_openpgp_verify_key(const char *trustdb,
 			  const gnutls_datum * keyring,
 			  const gnutls_datum * cert_list,
 			  int cert_list_length);
-int gnutls_openpgp_fingerprint(const gnutls_datum * cert,
+int _gnutls_openpgp_fingerprint(const gnutls_datum * cert,
 			   unsigned char *fpr, size_t * fprlen);
-time_t gnutls_openpgp_extract_key_creation_time(const gnutls_datum * cert);
-time_t gnutls_openpgp_extract_key_expiration_time(const gnutls_datum * cert);
+time_t _gnutls_openpgp_get_raw_key_creation_time(const gnutls_datum * cert);
+time_t _gnutls_openpgp_get_raw_key_expiration_time(const gnutls_datum * cert);
 
 #endif /*GNUTLS_OPENPGP_H*/