[libEtPan-commits] CVS: libetpan/src/data-types mailstream_ssl.c, 1.48, 1.49

[Colin L. <col...@us...>]

Update of /cvsroot/libetpan/libetpan/src/data-types
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24917/src/data-types

Modified Files:
	mailstream_ssl.c 
Log Message:
Better type fix 


Index: mailstream_ssl.c
===================================================================
RCS file: /cvsroot/libetpan/libetpan/src/data-types/mailstream_ssl.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- mailstream_ssl.c	6 Jan 2007 17:13:18 -0000	1.48
+++ mailstream_ssl.c	6 Jan 2007 17:49:02 -0000	1.49
@@ -705,11 +705,11 @@
 #endif
 }
 
-int mailstream_ssl_get_certificate(mailstream *stream, unsigned char **cert_DER)
+ssize_t mailstream_ssl_get_certificate(mailstream *stream, unsigned char **cert_DER)
 {
 #ifdef USE_SSL
   struct mailstream_ssl_data *data = NULL;
-  int len = 0;
+  ssize_t len = (ssize_t)0;
 #ifndef USE_GNUTLS
   SSL *ssl_conn = NULL;
   X509 *cert = NULL;
@@ -723,22 +723,22 @@
 #endif
 
   if (cert_DER == NULL || stream == NULL || stream->low == NULL)
-    return -1;
+    return (ssize_t)-1;
 
   data = stream->low->data;
   
   if (data == NULL)
-    return -1;
+    return (ssize_t)-1;
 
 #ifndef USE_GNUTLS
   ssl_conn = data->ssl_conn;
   if (ssl_conn == NULL)
-    return -1;
+    return (ssize_t)-1;
   cert = SSL_get_peer_certificate(ssl_conn);
   if (cert == NULL)
-    return -1;
+    return (ssize_t)-1;
   *cert_DER = NULL;
-  len = i2d_X509(cert, cert_DER);
+  len = (ssize_t) i2d_X509(cert, cert_DER);
   return len;
 #else
   session = data->session;
@@ -750,21 +750,18 @@
   &&  gnutls_x509_crt_import(cert, &raw_cert_list[0], GNUTLS_X509_FMT_DER) >= 0) {
     cert_size = sizeof(output);
     if (gnutls_x509_crt_export(cert, GNUTLS_X509_FMT_DER, output, &cert_size) < 0)
-      return -1;
-    if (cert_size >= 0) {
-      *cert_DER = malloc (cert_size + 1);
-      if (*cert_DER == NULL)
-	return -1;
-      memcpy (*cert_DER, output, cert_size);
-      len = (int)cert_size;
-    } else 
-      len = -1;
+      return (ssize_t)-1;
+    *cert_DER = malloc (cert_size + 1);
+    if (*cert_DER == NULL)
+      return (ssize_t)-1;
+    memcpy (*cert_DER, output, cert_size);
+    len = (ssize_t)cert_size;
     gnutls_x509_crt_deinit(cert);
     return len;
   }
 #endif
 #endif
-  return -1;
+  return (ssize_t)-1;
 }
 
 static void mailstream_low_ssl_cancel(mailstream_low * s)