*** empty log message ***

6 files changed, 9 insertions, 26 deletions

diff --git a/configure.in b/configure.in
index 97b36c0bf6..72b68a8824 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AC_DEFINE_UNQUOTED(T_OS, "$target_os")
 dnl Gnutls Version
 GNUTLS_MAJOR_VERSION=0
 GNUTLS_MINOR_VERSION=4
-GNUTLS_MICRO_VERSION=2
+GNUTLS_MICRO_VERSION=3
 GNUTLS_VERSION=$GNUTLS_MAJOR_VERSION.$GNUTLS_MINOR_VERSION.$GNUTLS_MICRO_VERSION
 
 AC_DEFINE_UNQUOTED(GNUTLS_VERSION, "$GNUTLS_VERSION")
diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 8162192d0a..49960fdcf7 100644
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -274,4 +274,3 @@ size_t gnutls_record_check_pending(GNUTLS_STATE state);
 void gnutls_openpgp_send_key(GNUTLS_STATE state, GNUTLS_OpenPGPKeyStatus status);
 
 int gnutls_x509_fingerprint(GNUTLS_DigestAlgorithm algo, const gnutls_datum* data, char* result, size_t* result_size);
-int gnutls_openpgp_fingerprint( const gnutls_datum* data, char* result, size_t* result_size);
diff --git a/libextra/gnutls-extra.h b/libextra/gnutls-extra.h
index e77c7bd6ff..297fe26877 100644
--- a/libextra/gnutls-extra.h
+++ b/libextra/gnutls-extra.h
@@ -47,6 +47,8 @@ typedef int gnutls_srp_server_select_func(GNUTLS_STATE, char **, char**, int);
 void gnutls_srp_server_set_select_func( GNUTLS_STATE, gnutls_srp_server_select_func *);
 
 /* Openpgp certificate stuff */
+int gnutls_openpgp_fingerprint( const gnutls_datum* data, char* result, size_t* result_size);
+
 int gnutls_openpgp_extract_key_name( const gnutls_datum *cert,
                                  int idx,
                                  gnutls_openpgp_name *dn );
diff --git a/libextra/gnutls_extra.h b/libextra/gnutls_extra.h
index fba5882413..4707f2d9e1 100644
--- a/libextra/gnutls_extra.h
+++ b/libextra/gnutls_extra.h
@@ -5,5 +5,5 @@ typedef int (*OPENPGP_VERIFY_KEY_FUNC)( const char *,
 typedef time_t (*OPENPGP_KEY_CREATION_TIME_FUNC)( const gnutls_datum*);
 typedef time_t (*OPENPGP_KEY_EXPIRATION_TIME_FUNC)( const gnutls_datum*);
 typedef int (*OPENPGP_KEY_REQUEST)(gnutls_datum*, const GNUTLS_CERTIFICATE_CREDENTIALS, opaque*,int);
-typedef int (*OPENPGP_FINGERPRINT)(const gnutls_datum*, opaque*, size_t*);
+typedef int (*OPENPGP_FINGERPRINT)(const gnutls_datum*, char*, size_t*);
 typedef int (*OPENPGP_CERT2GNUTLS_CERT)(gnutls_cert*, gnutls_datum);
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index eacd34f296..88f56238e1 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -1145,7 +1145,7 @@ leave:
  * the fingerprint can be 16 or 20 bytes.
  **/
 int
-gnutls_openpgp_fingerprint(const gnutls_datum *cert, opaque *fpr, size_t *fprlen)
+gnutls_openpgp_fingerprint(const gnutls_datum *cert, char *fpr, size_t *fprlen)
 {
     CDK_KBNODE kb_pk = NULL, pkt;
     PKT_public_key *pk = NULL;
@@ -1575,7 +1575,7 @@ gnutls_openpgp_verify_key(const char* ign, const gnutls_datum* keyring,
 }
 
 int
-gnutls_openpgp_fingerprint(const gnutls_datum *cert, opaque *fpr, size_t *fprlen)
+gnutls_openpgp_fingerprint(const gnutls_datum *cert, char *fpr, size_t *fprlen)
 {
     return GNUTLS_E_UNIMPLEMENTED_FEATURE;  
 }
diff --git a/libextra/gnutls_openpgp.h b/libextra/gnutls_openpgp.h
index a142cb555d..e794b2d8f7 100644
--- a/libextra/gnutls_openpgp.h
+++ b/libextra/gnutls_openpgp.h
@@ -45,7 +45,7 @@ int gnutls_openpgp_verify_key(
 
 int gnutls_openpgp_fingerprint(
     const gnutls_datum *cert,
-    opaque *fpr,
+    char *fpr,
     size_t *fprlen );
 
 int gnutls_openpgp_keyid(
@@ -61,26 +61,8 @@ int gnutls_openpgp_add_keyring_file(
     gnutls_datum *keyring,
     const char *name );
 
-int gnutls_openpgp_extract_key_pk_algorithm(const gnutls_datum *cert,
-                                            int *r_bits);
-
-int gnutls_openpgp_extract_key_version( const gnutls_datum *cert );
-
-time_t gnutls_openpgp_extract_key_creation_time( const gnutls_datum *cert );
-
-time_t gnutls_openpgp_extract_key_expiration_time( const gnutls_datum  *cert );
-
-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, char *fpr,
-                                size_t *fprlen );
-
-int gnutls_openpgp_keyid( const gnutls_datum *cert, uint32 *keyid );
-
-int gnutls_certificate_set_openpgp_keyring_file( GNUTLS_CERTIFICATE_CREDENTIALS c,
+int gnutls_certificate_set_openpgp_keyring_file( 
+    GNUTLS_CERTIFICATE_CREDENTIALS c,
     const char *file );
 
 int gnutls_certificate_set_openpgp_keyring_mem(