Index: gnutls-2.2.2/libextra/openpgp/pgp.c
===================================================================
--- gnutls-2.2.2.orig/libextra/openpgp/pgp.c
+++ gnutls-2.2.2/libextra/openpgp/pgp.c
@@ -489,7 +489,7 @@ gnutls_openpgp_crt_check_hostname (gnutl
 {
   char dnsname[MAX_CN];
   size_t dnsnamesize;
-  int ret;
+  int ret = 0;
   int i;
 
   /* Check through all included names. */
Index: gnutls-2.2.2/libextra/gnutls_openpgp.c
===================================================================
--- gnutls-2.2.2.orig/libextra/gnutls_openpgp.c
+++ gnutls-2.2.2/libextra/gnutls_openpgp.c
@@ -726,8 +726,6 @@ gnutls_certificate_set_openpgp_keyring_m
     gnutls_openpgp_keyring_deinit( c->keyring);
     return rc;
   }
-  
-  return 0;
 #else
 
   c->keyring_format = format;
@@ -743,6 +741,7 @@ gnutls_certificate_set_openpgp_keyring_m
   c->keyring.size = dlen;
 
 #endif
+  return 0;
 }
 
 /*-