diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-18 21:48:55 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-18 21:53:11 +0800 |
| commit | f1975e66ba22bfcfeeb2b1583143693a454aad89 (patch) | |
| tree | 9c20d46aac44c4e058661aab9d27c3a7bebe60a3 /libempathy/empathy-tls-verifier.c | |
| parent | 3b10103f06517cd7bfbb1576daadaf4855b800a2 (diff) | |
| download | gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar.gz gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar.bz2 gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar.lz gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar.xz gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.tar.zst gsoc2013-empathy-f1975e66ba22bfcfeeb2b1583143693a454aad89.zip | |
Style changes from review for ReferenceIdentities code
Diffstat (limited to 'libempathy/empathy-tls-verifier.c')
| -rw-r--r-- | libempathy/empathy-tls-verifier.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/libempathy/empathy-tls-verifier.c b/libempathy/empathy-tls-verifier.c index e0fa130bf..47a54333c 100644 --- a/libempathy/empathy-tls-verifier.c +++ b/libempathy/empathy-tls-verifier.c @@ -257,7 +257,7 @@ perform_verification (EmpathyTLSVerifier *self, guint n_list, n_anchors; guint verify_output; gint res; - gchar **i; + gint i; gboolean matched; EmpathyTLSVerifierPriv *priv = GET_PRIV (self); @@ -300,13 +300,16 @@ perform_verification (EmpathyTLSVerifier *self, } /* now check if the certificate matches one of the reference identities. */ - for (i = priv->reference_identities, matched = FALSE; i && *i; ++i) + if (priv->reference_identities != NULL) { - const gchar *identity = *i; - if (gnutls_x509_crt_check_hostname (list[0], identity) == 1) + for (i = 0, matched = FALSE; priv->reference_identities[i] != NULL; ++i) { - matched = TRUE; - break; + if (gnutls_x509_crt_check_hostname (list[0], + priv->reference_identities[i]) == 1) + { + matched = TRUE; + break; + } } } |