Skip to contentSkip to conversation

Minor code cleanup: cleaned up error handling in verify_cert.

PATCH In review Adriaan de Jong 2 participants 2 messages Feb 4, 2012

lore
Share & tools
lore

Adriaan de Jong

author
#0 lore raw

PATCH 1/1 Minor code cleanup: cleaned up error handling in verify_cert.

Removed done label and cleaned up return values.

Signed-off-by Adriaan de Jong <[email protected]...>
---
 ssl_verify.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
ssl_verify.c +3 -3
index 326b005..feee124 100644
@@ -684,14 +684,14 @@ verify_cert(struct tls_session *session, x509_cert_t *cert, int cert_depth)
   msg (D_HANDSHAKE, "VERIFY OK: depth=%d, %s", cert_depth, subject);
   session->verified = true;
 
- done:
   x509_free_subject (subject);
-  return (session->verified == true) ? SUCCESS : FAILURE;
+  return SUCCESS;
 
  err:
   tls_clear_error();
   session->verified = false;
-  goto done;
+  x509_free_subject (subject);
+  return FAILURE;
 }
 
 /* ***************************************************************************
Signature · 1 line
1.7.5.4
#1 lore raw

Hi,

Quoted 1 line · Adriaan de Jong

Removed done label and cleaned up return values.

Boah, that code was ugly...

ACK!

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...