1 files changed, 161 insertions, 141 deletions

diff --git a/libextra/openpgp/pgpverify.c b/libextra/openpgp/pgpverify.c
index 68ee250e91..f3b272dbe5 100644
--- a/libextra/openpgp/pgpverify.c
+++ b/libextra/openpgp/pgpverify.c
@@ -33,48 +33,53 @@
 #include <x509/verify.h>	/* lib/x509/verify.h */
 
 static int
-openpgp_get_key_trust(gnutls_openpgp_trustdb_t trustdb,
-		      gnutls_openpgp_key_t key, unsigned int *r_trustval)
+openpgp_get_key_trust (gnutls_openpgp_trustdb_t trustdb,
+		       gnutls_openpgp_key_t key, unsigned int *r_trustval)
 {
-    cdk_packet_t pkt;
-    cdk_pkt_pubkey_t pk = NULL;
-    int flags = 0, ot = 0;
-    int rc = 0;
-
-    if (!trustdb || !key || !r_trustval) {
-	gnutls_assert();
-	return GNUTLS_E_INVALID_REQUEST;
+  cdk_packet_t pkt;
+  cdk_pkt_pubkey_t pk = NULL;
+  int flags = 0, ot = 0;
+  int rc = 0;
+
+  if (!trustdb || !key || !r_trustval)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_INVALID_REQUEST;
     }
 
-    *r_trustval = 0;
+  *r_trustval = 0;
 
-    pkt = cdk_kbnode_find_packet(key->knode, CDK_PKT_PUBLIC_KEY);
-    if (!pkt) {
-	rc = GNUTLS_E_NO_CERTIFICATE_FOUND;
-	goto leave;
+  pkt = cdk_kbnode_find_packet (key->knode, CDK_PKT_PUBLIC_KEY);
+  if (!pkt)
+    {
+      rc = GNUTLS_E_NO_CERTIFICATE_FOUND;
+      goto leave;
     }
-    pk = pkt->pkt.public_key;
+  pk = pkt->pkt.public_key;
 
-    rc = cdk_trustdb_get_ownertrust(trustdb->st, pk, &ot, &flags);
+  rc = cdk_trustdb_get_ownertrust (trustdb->st, pk, &ot, &flags);
 
-    if (rc) {			/* no ownertrust record was found */
-	rc = 0;
-	goto leave;
+  if (rc)
+    {				/* no ownertrust record was found */
+      rc = 0;
+      goto leave;
     }
 
-    if (flags & CDK_TFLAG_DISABLED) {
-	*r_trustval |= GNUTLS_CERT_INVALID;
-	goto leave;
+  if (flags & CDK_TFLAG_DISABLED)
+    {
+      *r_trustval |= GNUTLS_CERT_INVALID;
+      goto leave;
     }
 
-    if (flags & CDK_TFLAG_REVOKED) {
-	*r_trustval |= GNUTLS_CERT_REVOKED;
+  if (flags & CDK_TFLAG_REVOKED)
+    {
+      *r_trustval |= GNUTLS_CERT_REVOKED;
     }
 
-    rc = 0;
+  rc = 0;
 
-  leave:
-    return rc;
+leave:
+  return rc;
 }
 
 /**
@@ -99,68 +104,73 @@ openpgp_get_key_trust(gnutls_openpgp_trustdb_t trustdb,
  *
  * Returns 0 on success.
  **/
-int gnutls_openpgp_key_verify_ring(gnutls_openpgp_key_t key,
-				   gnutls_openpgp_keyring_t keyring,
-				   unsigned int flags,
-				   unsigned int *verify)
+int
+gnutls_openpgp_key_verify_ring (gnutls_openpgp_key_t key,
+				gnutls_openpgp_keyring_t keyring,
+				unsigned int flags, unsigned int *verify)
 {
-    int rc = 0;
-    int status = 0;
-    opaque id[8];
-
-    if (!key || !keyring) {
-	gnutls_assert();
-	return GNUTLS_E_NO_CERTIFICATE_FOUND;
+  int rc = 0;
+  int status = 0;
+  opaque id[8];
+
+  if (!key || !keyring)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_NO_CERTIFICATE_FOUND;
     }
 
-    *verify = 0;
+  *verify = 0;
 
-    rc = cdk_pk_check_sigs(key->knode, keyring->hd, &status);
-    if (rc == CDK_Error_No_Key) {
-	rc = GNUTLS_E_NO_CERTIFICATE_FOUND;
-	gnutls_assert();
-	return rc;
+  rc = cdk_pk_check_sigs (key->knode, keyring->hd, &status);
+  if (rc == CDK_Error_No_Key)
+    {
+      rc = GNUTLS_E_NO_CERTIFICATE_FOUND;
+      gnutls_assert ();
+      return rc;
     }
 
-    if (rc) {
-	rc = _gnutls_map_cdk_rc(rc);
-	gnutls_assert();
-	return rc;
+  if (rc)
+    {
+      rc = _gnutls_map_cdk_rc (rc);
+      gnutls_assert ();
+      return rc;
     }
 
-    if (status & CDK_KEY_INVALID)
-	*verify |= GNUTLS_CERT_INVALID;
-    if (status & CDK_KEY_REVOKED)
-	*verify |= GNUTLS_CERT_REVOKED;
-    if (status & CDK_KEY_NOSIGNER)
-	*verify |= GNUTLS_CERT_SIGNER_NOT_FOUND;
-
-    /* Check if the key is included in the ring.
-     */
-    if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_SAME)) {
-	rc = gnutls_openpgp_key_get_id(key, id);
-	if (rc < 0) {
-	    gnutls_assert();
-	    return rc;
+  if (status & CDK_KEY_INVALID)
+    *verify |= GNUTLS_CERT_INVALID;
+  if (status & CDK_KEY_REVOKED)
+    *verify |= GNUTLS_CERT_REVOKED;
+  if (status & CDK_KEY_NOSIGNER)
+    *verify |= GNUTLS_CERT_SIGNER_NOT_FOUND;
+
+  /* Check if the key is included in the ring.
+   */
+  if (!(flags & GNUTLS_VERIFY_DO_NOT_ALLOW_SAME))
+    {
+      rc = gnutls_openpgp_key_get_id (key, id);
+      if (rc < 0)
+	{
+	  gnutls_assert ();
+	  return rc;
 	}
 
-	rc = gnutls_openpgp_keyring_check_id(keyring, id, 0);
+      rc = gnutls_openpgp_keyring_check_id (keyring, id, 0);
 
-	/* if it exists in the keyring don't treat it
-	 * as unknown.
-	 */
-	if (rc == 0 && *verify & GNUTLS_CERT_SIGNER_NOT_FOUND)
-	    *verify ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
+      /* if it exists in the keyring don't treat it
+       * as unknown.
+       */
+      if (rc == 0 && *verify & GNUTLS_CERT_SIGNER_NOT_FOUND)
+	*verify ^= GNUTLS_CERT_SIGNER_NOT_FOUND;
     }
 
-    return 0;
+  return 0;
 }
 
 
-int _cdk_sig_check(cdk_pkt_pubkey_t pk, cdk_pkt_signature_t sig,
-		   cdk_md_hd_t digest, int *r_expired);
-cdk_md_hd_t cdk_md_open(int algo, unsigned int flags);
-void cdk_md_close(cdk_md_hd_t hd);
+int _cdk_sig_check (cdk_pkt_pubkey_t pk, cdk_pkt_signature_t sig,
+		    cdk_md_hd_t digest, int *r_expired);
+cdk_md_hd_t cdk_md_open (int algo, unsigned int flags);
+void cdk_md_close (cdk_md_hd_t hd);
 
 /**
  * gnutls_openpgp_key_verify_self - Verify the self signature on the key
@@ -176,76 +186,83 @@ void cdk_md_close(cdk_md_hd_t hd);
  *
  * Returns 0 on success.
  **/
-int gnutls_openpgp_key_verify_self(gnutls_openpgp_key_t key,
-				   unsigned int flags,
-				   unsigned int *verify)
+int
+gnutls_openpgp_key_verify_self (gnutls_openpgp_key_t key,
+				unsigned int flags, unsigned int *verify)
 {
-    opaque key_id[8];
-    cdk_kbnode_t k;
-    int rc, expired;
-    cdk_packet_t packet = NULL;
-    cdk_md_hd_t md = NULL;
-    cdk_packet_t pk = NULL;
-
-    *verify = 0;
-
-    pk = cdk_kbnode_get_packet(key->knode);
-    if (!pk) {
-	gnutls_assert();
-	return GNUTLS_E_INTERNAL_ERROR;
+  opaque key_id[8];
+  cdk_kbnode_t k;
+  int rc, expired;
+  cdk_packet_t packet = NULL;
+  cdk_md_hd_t md = NULL;
+  cdk_packet_t pk = NULL;
+
+  *verify = 0;
+
+  pk = cdk_kbnode_get_packet (key->knode);
+  if (!pk)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_INTERNAL_ERROR;
     }
 
-    rc = gnutls_openpgp_key_get_id(key, key_id);
-    if (rc < 0) {
-	gnutls_assert();
-	goto leave;
+  rc = gnutls_openpgp_key_get_id (key, key_id);
+  if (rc < 0)
+    {
+      gnutls_assert ();
+      goto leave;
     }
 
-    k = key->knode;
+  k = key->knode;
 
-    while ((k = cdk_kbnode_find_next(k, CDK_PKT_SIGNATURE)) != NULL) {
+  while ((k = cdk_kbnode_find_next (k, CDK_PKT_SIGNATURE)) != NULL)
+    {
 
-	packet = cdk_kbnode_get_packet(k);
-	if (!packet) {
-	    gnutls_assert();
-	    return GNUTLS_E_INTERNAL_ERROR;
+      packet = cdk_kbnode_get_packet (k);
+      if (!packet)
+	{
+	  gnutls_assert ();
+	  return GNUTLS_E_INTERNAL_ERROR;
 	}
 
-	if (memcmp(key_id, packet->pkt.signature->keyid, 8) == 0) {
-	    /* found the self signature.
-	     */
-	    md = cdk_md_open(packet->pkt.signature->digest_algo, 0);
-	    if (!md) {
-		gnutls_assert();
-		rc = GNUTLS_E_INTERNAL_ERROR;
-		goto leave;
+      if (memcmp (key_id, packet->pkt.signature->keyid, 8) == 0)
+	{
+	  /* found the self signature.
+	   */
+	  md = cdk_md_open (packet->pkt.signature->digest_algo, 0);
+	  if (!md)
+	    {
+	      gnutls_assert ();
+	      rc = GNUTLS_E_INTERNAL_ERROR;
+	      goto leave;
 	    }
 
-	    cdk_kbnode_hash(key->knode, md, 0, 0, 0);
+	  cdk_kbnode_hash (key->knode, md, 0, 0, 0);
 
-	    rc = _cdk_sig_check(pk->pkt.public_key, packet->pkt.signature,
-				md, &expired);
+	  rc = _cdk_sig_check (pk->pkt.public_key, packet->pkt.signature,
+			       md, &expired);
 
-	    if (rc != 0) {
-		*verify |= GNUTLS_CERT_INVALID;
+	  if (rc != 0)
+	    {
+	      *verify |= GNUTLS_CERT_INVALID;
 	    }
 
-	    break;
+	  break;
 	}
 
-	cdk_pkt_free(packet);
-	packet = NULL;
+      cdk_pkt_free (packet);
+      packet = NULL;
 
     }
 
-    rc = 0;
+  rc = 0;
 
-  leave:
+leave:
 
-    cdk_pkt_free(packet);
-    cdk_pkt_free(pk);
-    cdk_md_close(md);
-    return rc;
+  cdk_pkt_free (packet);
+  cdk_pkt_free (pk);
+  cdk_md_close (md);
+  return rc;
 }
 
 /**
@@ -269,32 +286,35 @@ int gnutls_openpgp_key_verify_self(gnutls_openpgp_key_t key,
  *
  * Returns 0 on success.
  **/
-int gnutls_openpgp_key_verify_trustdb(gnutls_openpgp_key_t key,
-				      gnutls_openpgp_trustdb_t trustdb,
-				      unsigned int flags,
-				      unsigned int *verify)
+int
+gnutls_openpgp_key_verify_trustdb (gnutls_openpgp_key_t key,
+				   gnutls_openpgp_trustdb_t trustdb,
+				   unsigned int flags, unsigned int *verify)
 {
-    int rc = 0;
+  int rc = 0;
 
-    if (!key) {
-	gnutls_assert();
-	return GNUTLS_E_NO_CERTIFICATE_FOUND;
+  if (!key)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_NO_CERTIFICATE_FOUND;
     }
 
-    if (!trustdb) {
-	gnutls_assert();
-	return GNUTLS_E_INVALID_REQUEST;
+  if (!trustdb)
+    {
+      gnutls_assert ();
+      return GNUTLS_E_INVALID_REQUEST;
     }
 
-    rc = openpgp_get_key_trust(trustdb, key, verify);
-    if (rc)
-	goto leave;
+  rc = openpgp_get_key_trust (trustdb, key, verify);
+  if (rc)
+    goto leave;
 
-    rc = 0;
+  rc = 0;
 
-  leave:
-    if (rc) {
-	gnutls_assert();
+leave:
+  if (rc)
+    {
+      gnutls_assert ();
     }
-    return rc;
+  return rc;
 }