Mercurial > pidgin
changeset 21679:a312781708e8
merge of '37d10660345bc1f2092492296caa8deaf84744b4'
and '727439d778b7d7f40aa0230cb9be26765e8d50a9'
| author | Ethan Blanton <elb@pidgin.im> |
|---|---|
| date | Wed, 28 Nov 2007 02:54:31 +0000 |
| parents | a890a1574703 (diff) bd36fdd36e92 (current diff) |
| children | 65f2a29617a2 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/ssl/ssl-gnutls.c Wed Nov 28 02:14:29 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-gnutls.c Wed Nov 28 02:54:31 2007 +0000 @@ -512,9 +512,8 @@ dt.data = (unsigned char *) buf; dt.size = buf_sz; - /* Perform the conversion */ - crt = x509_import_from_datum(dt, - GNUTLS_X509_FMT_PEM); // files should be in PEM format + /* Perform the conversion; files should be in PEM format */ + crt = x509_import_from_datum(dt, GNUTLS_X509_FMT_PEM); /* Cleanup */ g_free(buf);