callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

continue reading the cert file until we've read it all or get a non-EINTR

Browse Source 
2003-03-21  Jeffrey Stedfast  <fejj@ximian.com>

	* camel-tcp-stream-ssl.c (camel_certdb_nss_cert_get): continue
	reading the cert file until we've read it all or get a non-EINTR
	errno.

svn path=/trunk/; revision=20457
This commit is contained in:
Jeffrey Stedfast
2003-03-21 18:54:52 +00:00
committed by Jeffrey Stedfast
parent d66fdafdb7
commit 911fdb7885
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camel/ChangeLog
View File

@ -1,3 +1,9 @@
2003-03-21 Jeffrey Stedfast <fejj@ximian.com>
* camel-tcp-stream-ssl.c (camel_certdb_nss_cert_get): continue
reading the cert file until we've read it all or get a non-EINTR
errno.
2003-03-21 Jeffrey Stedfast <fejj@ximian.com>
* camel-sasl-gssapi.c: #include <com_err.h> instead of

26
camel/camel-tcp-stream-ssl.c
View File

@ -630,9 +630,10 @@ camel_certdb_nss_cert_get(CamelCertDB *certdb, CERTCertificate *cert)
{
char *fingerprint, *path;
CamelCert *ccert;
int fd;
ssize_t len;
struct stat st;
size_t nread;
ssize_t n;
int fd;
fingerprint = cert_fingerprint (cert);
ccert = camel_certdb_get_cert (certdb, fingerprint);
@ -656,11 +657,22 @@ camel_certdb_nss_cert_get(CamelCertDB *certdb, CERTCertificate *cert)
g_free(path);
ccert->rawcert = g_byte_array_new ();
g_byte_array_set_size(ccert->rawcert, st.st_size);
len = read(fd, ccert->rawcert->data, st.st_size);
close(fd);
if (len != st.st_size) {
g_warning ("cert size read truncated %s: %d != %ld", path, len, st.st_size);
g_byte_array_set_size (ccert->rawcert, st.st_size);
nread = 0;
do {
do {
n = read (fd, ccert->rawcert->data + nread, st.st_size - nread);
} while (n == -1 && errno == EINTR);
if (n > 0)
nread += n;
} while (nread < st.st_size && n != -1);
close (fd);
if (nread != st.st_size) {
g_warning ("cert size read truncated %s: %d != %ld", path, nread, st.st_size);
g_byte_array_free(ccert->rawcert, TRUE);
ccert->rawcert = NULL;
g_free(fingerprint);