#include <memory.h>
#endif /* HAVE_MEMORY_H */
#include <sys/types.h>
+#include <sys/stat.h>
#ifndef HAVE_NET_SOCKET_H
#include <sys/socket.h>
#else
#include "fetchmail.h"
#include "i18n.h"
-/* Defines to allow BeOS to play nice... */
+/* Defines to allow BeOS and Cygwin to play nice... */
#ifdef __BEOS__
static char peeked;
#define fm_close(a) closesocket(a)
#define fm_close(a) close(a)
#define fm_write(a,b,c) write(a,b,c)
#define fm_peek(a,b,c) recv(a,b,c, MSG_PEEK)
+#ifdef __CYGWIN__
+#define fm_read(a,b,c) cygwin_read(a,b,c)
+static ssize_t cygwin_read(int sock, void *buf, size_t count);
+#else /* ! __CYGWIN__ */
#define fm_read(a,b,c) read(a,b,c)
+#endif /* __CYGWIN__ */
#endif
/* We need to define h_errno only if it is not already */
#endif /* ndef h_errno */
-#if NET_SECURITY
+#ifdef NET_SECURITY
#include <net/security.h>
#endif /* NET_SECURITY */
#ifdef HAVE_SOCKETPAIR
-char *const *parse_plugin(const char *plugin, const char *host, const char *service)
+static char *const *parse_plugin(const char *plugin, const char *host, const char *service)
{ const char **argvec;
const char *c, *p;
char *cp, *plugin_copy;
plugin_copy = malloc(plugin_copy_len + 1);
if (!plugin_copy)
{
- report(stderr, _("fetchmail: malloc failed\n"));
+ report(stderr, GT_("fetchmail: malloc failed\n"));
return NULL;
}
argvec = malloc(s);
if (!argvec)
{
- report(stderr, _("fetchmail: malloc failed\n"));
+ report(stderr, GT_("fetchmail: malloc failed\n"));
return NULL;
}
memset(argvec, 0, s);
*/
if (socketpair(AF_UNIX,SOCK_STREAM,0,fds))
{
- report(stderr, _("fetchmail: socketpair failed\n"));
+ report(stderr, GT_("fetchmail: socketpair failed\n"));
return -1;
}
switch (fork()) {
case -1:
/* error */
- report(stderr, _("fetchmail: fork failed\n"));
+ report(stderr, GT_("fetchmail: fork failed\n"));
return -1;
- break;
case 0: /* child */
/* fds[1] is the parent's end; close it for proper EOF
** detection */
(void) close(fds[1]);
if ( (dup2(fds[0],0) == -1) || (dup2(fds[0],1) == -1) ) {
- report(stderr, _("dup2 failed\n"));
+ report(stderr, GT_("dup2 failed\n"));
exit(1);
}
/* fds[0] is now connected to 0 and 1; close it */
(void) close(fds[0]);
if (outlevel >= O_VERBOSE)
- report(stderr, _("running %s (host %s service %s)\n"), plugin, host, service);
+ report(stderr, GT_("running %s (host %s service %s)\n"), plugin, host, service);
argvec = parse_plugin(plugin,host,service);
execvp(*argvec, argvec);
- report(stderr, _("execvp(%s) failed\n"), *argvec);
+ report(stderr, GT_("execvp(%s) failed\n"), *argvec);
exit(0);
break;
default: /* parent */
#endif /* HAVE_SOCKETPAIR */
#ifdef __UNUSED__
-#include <sys/time.h>
int SockCheckOpen(int fd)
/* poll given socket; is it selectable? */
h_errno = 0;
return -1;
}
- if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0)
+
+ /* Socket opened saved. Usefull if connect timeout
+ * because it can be closed.
+ */
+ mailserver_socket_temp = sock;
+
+ if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0)
{
int olderr = errno;
fm_close(sock); /* don't use SockClose, no traffic yet */
h_errno = 0;
errno = olderr;
- return -1;
+ sock = -1;
}
+
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+
return sock;
}
-#if INET6_ENABLE
+#ifdef INET6_ENABLE
int SockOpen(const char *host, const char *service, const char *options,
const char *plugin)
{
struct addrinfo *ai, *ai0, req;
int i;
-#if NET_SECURITY
+#ifdef NET_SECURITY
void *request = NULL;
int requestlen;
#endif /* NET_SECURITY */
req.ai_socktype = SOCK_STREAM;
if (getaddrinfo(host, service, &req, &ai0)) {
- report(stderr, _("fetchmail: getaddrinfo(%s.%s)\n"), host,service);
+ report(stderr, GT_("fetchmail: getaddrinfo(%s.%s)\n"), host,service);
return -1;
}
if (i >= 0)
break;
#else
+
i = -1;
for (ai = ai0; ai; ai = ai->ai_next) {
i = socket(ai->ai_family, ai->ai_socktype, 0);
if (i < 0)
continue;
+
+ /* Socket opened saved. Usefull if connect timeout
+ * because it can be closed.
+ */
+ mailserver_socket_temp = i;
+
if (connect(i, (struct sockaddr *) ai->ai_addr, ai->ai_addrlen) < 0) {
fm_close(i);
i = -1;
continue;
}
+
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+
break;
}
+
#endif
#endif /* NET_SECURITY */
/* we'll accept a quad address */
#ifndef HAVE_INET_ATON
- inaddr = inet_addr(host);
+ inaddr = inet_addr((char*)host);
if (inaddr != INADDR_NONE)
{
memcpy(&ad.sin_addr, &inaddr, sizeof(inaddr));
h_errno = 0;
return -1;
}
+
+ /* Socket opened saved. Usefull if connect timeout because
+ * it can be closed
+ */
+ mailserver_socket_temp = sock;
+
if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) < 0)
{
int olderr = errno;
errno = olderr;
return -1;
}
+
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+
#ifndef HAVE_INET_ATON
}
#else
}
#endif /* HAVE_INET_ATON */
else {
- hp = gethostbyname(host);
+ hp = gethostbyname((char*)host);
if (hp == NULL)
{
{
h_errno = errno = 0;
report(stderr,
- _("fetchmail: illegal address length received for host %s\n"),host);
+ GT_("fetchmail: illegal address length received for host %s\n"),host);
return -1;
}
/*
h_errno = 0;
return -1;
}
+
+ /* Socket opened saved. Usefull if connect timeout because
+ * it can be closed
+ */
+ mailserver_socket_temp = sock;
+
ad.sin_port = htons(clientPort);
memcpy(&ad.sin_addr, *pptr, sizeof(struct in_addr));
- if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) == 0)
- break; /* success */
+ if (connect(sock, (struct sockaddr *) &ad, sizeof(ad)) == 0) {
+ /* No connect timeout, then no need to set mailserver_socket_temp */
+ mailserver_socket_temp = -1;
+ break; /* success */
+ }
fm_close(sock); /* don't use SockClose, no traffic yet */
memset(&ad, 0, sizeof(ad));
ad.sin_family = AF_INET;
}
#ifdef SSL_ENABLE
-#include "openssl/ssl.h"
-#include "openssl/err.h"
-#include "openssl/pem.h"
-#include "openssl/x509.h"
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/x509.h>
+#include <openssl/rand.h>
static SSL_CTX *_ctx = NULL;
static SSL *_ssl_context[FD_SETSIZE];
if( NULL != ( ssl = SSLGetContext( sock ) ) )
n = SSL_write(ssl, buf, len);
else
- n = fm_write(sock, buf, len);
-#else
- n = fm_write(sock, buf, len);
-#endif
+#endif /* SSL_ENABLE */
+ n = fm_write(sock, buf, len);
if (n <= 0)
return -1;
len -= n;
{
char *newline, *bp = buf;
int n;
+ int maxavailable = 0;
#ifdef SSL_ENABLE
SSL *ssl;
#endif
later change the behavior of SSL_peek
to "fix" this problem... :-( */
if ((n = SSL_peek(ssl, bp, len)) < 0) {
+ (void)SSL_get_error(ssl, n);
return(-1);
}
+ maxavailable = n;
if( 0 == n ) {
/* SSL_peek says no data... Does he mean no data
or did the connection blow up? If we got an error
then bail! */
- if( 0 != ( n = ERR_get_error() ) ) {
+ if( 0 != ( n = SSL_get_error(ssl, n) ) ) {
return -1;
}
/* We didn't get an error so read at least one
newline = NULL;
} else if ((newline = memchr(bp, '\n', n)) != NULL)
n = newline - bp + 1;
- if ((n = SSL_read(ssl, bp, n)) == -1) {
- return(-1);
+ /* Matthias Andree: SSL_read can return 0, in that case
+ * we must cal SSL_get_error to figure if there was
+ * an error or just a "no data" condition */
+ if ((n = SSL_read(ssl, bp, n)) <= 0) {
+ if ((n = SSL_get_error(ssl, n))) {
+ return(-1);
+ }
}
/* Check for case where our single character turned out to
* be a newline... (It wasn't going to get caught by
out of the loop now */
newline = bp;
}
- } else {
- if ((n = fm_peek(sock, bp, len)) <= 0)
- return(-1);
- if ((newline = memchr(bp, '\n', n)) != NULL)
- n = newline - bp + 1;
- if ((n = fm_read(sock, bp, n)) == -1)
- return(-1);
}
-#else
+ else
+#endif /* SSL_ENABLE */
+ {
#ifdef __BEOS__
- if ((n = fm_read(sock, bp, 1)) <= 0)
+ if ((n = fm_read(sock, bp, 1)) <= 0)
#else
- if ((n = fm_peek(sock, bp, len)) <= 0)
+ if ((n = fm_peek(sock, bp, len)) <= 0)
#endif
- return (-1);
- if ((newline = memchr(bp, '\n', n)) != NULL)
- n = newline - bp + 1;
+ return (-1);
+ maxavailable = n;
+ if ((newline = memchr(bp, '\n', n)) != NULL)
+ n = newline - bp + 1;
#ifndef __BEOS__
- if ((n = fm_read(sock, bp, n)) == -1)
- return(-1);
+ if ((n = fm_read(sock, bp, n)) == -1)
+ return(-1);
#endif /* __BEOS__ */
-#endif
+ }
bp += n;
len -= n;
} while
(!newline && len);
*bp = '\0';
+
+#ifdef FORCE_STUFFING /* too ugly to live -- besides, there's IMAP */
+ /* OK, very weird hack coming up here:
+ * When POP3 servers send us a message, they're supposed to
+ * terminate the message with a line containing only a dot. To protect
+ * against lines in the real message that might contain only a dot,
+ * they're supposed to preface any line that starts with a dot with
+ * an additional dot, which will be removed on the client side. That
+ * process, called byte-stuffing (and unstuffing) is really not the
+ * concern of this low-level routine, ordinarily, but there are some
+ * POP servers (and maybe IMAP servers too, who knows) that fail to
+ * do the byte-stuffing, and this routine is the best place to try to
+ * identify and fix that fault.
+ *
+ * Since the DOT line is supposed to come only at the end of a
+ * message, the implication is that right after we see it, the server
+ * is supposed to go back to waiting for the next command. There
+ * isn't supposed to be any more data to read after we see the dot.
+ * THEREFORE, if we see more data to be read after something that
+ * looks like the dot line, then probably the server is failing to
+ * do byte-stuffing. In that case, we'll byte-pack it for them so
+ * that the higher-level routines see things as hunky-dorey.
+ * This is not a perfect test or fix by any means (it has an
+ * obvious race condition, for one thing), but it should at least
+ * reduce the nastiness that ensues when people don't know how
+ * to write POP servers.
+ */
+ if ((maxavailable > (bp-buf)) &&
+ ((((bp-buf) == 3) &&
+ (buf[0] == '.') &&
+ (buf[1] == '\r') &&
+ (buf[2] == '\n')) ||
+ (((bp-buf) == 2) &&
+ (buf[0] == '.') &&
+ (buf[1] == '\n')))) {
+
+ memmove(buf+1, buf, (bp-buf)+1);
+ buf[0] = '.';
+ bp++;
+ }
+#endif /* FORCE_STUFFING */
return bp - buf;
}
#ifdef SSL_ENABLE
if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
n = SSL_peek(ssl, &ch, 1);
+ if (n < 0) {
+ (void)SSL_get_error(ssl, n);
+ return -1;
+ }
if( 0 == n ) {
/* This code really needs to implement a "hold back"
* to simulate a functioning SSL_peek()... sigh...
* Has to be coordinated with the read code above.
* Next on the list todo... */
- /* SSL_peek says no data... Does he mean no data
+ /* SSL_peek says 0... Does that mean no data
or did the connection blow up? If we got an error
then bail! */
- if( 0 != ( n = ERR_get_error() ) ) {
+ if( 0 != ( n = SSL_get_error(ssl, n) ) ) {
return -1;
}
return 0; /* Give him a '\0' character */
}
- } else {
- n = fm_peek(sock, &ch, 1);
}
-#else
-
- n = fm_peek(sock, &ch, 1);
-
+ else
#endif /* SSL_ENABLE */
+ n = fm_peek(sock, &ch, 1);
if (n == -1)
return -1;
}
-int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
+static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
{
char buf[257];
X509 *x509_cert;
int err, depth;
unsigned char digest[EVP_MAX_MD_SIZE];
char text[EVP_MAX_MD_SIZE * 3 + 1], *tp, *te;
- EVP_MD *digest_tp;
+ const EVP_MD *digest_tp;
unsigned int dsz, i, esz;
X509_NAME *subj, *issuer;
if (outlevel == O_VERBOSE) {
if ((i = X509_NAME_get_text_by_NID(issuer, NID_organizationName, buf, sizeof(buf))) != -1) {
- report(stdout, _("Issuer Organization: %s\n"), buf);
+ report(stdout, GT_("Issuer Organization: %s\n"), buf);
if (i >= sizeof(buf) - 1)
- report(stdout, _("Warning: Issuer Organization Name too long (possibly truncated).\n"));
+ report(stdout, GT_("Warning: Issuer Organization Name too long (possibly truncated).\n"));
} else
- report(stdout, _("Unknown Organization\n"));
+ report(stdout, GT_("Unknown Organization\n"));
if ((i = X509_NAME_get_text_by_NID(issuer, NID_commonName, buf, sizeof(buf))) != -1) {
- report(stdout, _("Issuer CommonName: %s\n"), buf);
+ report(stdout, GT_("Issuer CommonName: %s\n"), buf);
if (i >= sizeof(buf) - 1)
- report(stdout, _("Warning: Issuer CommonName too long (possibly truncated).\n"));
+ report(stdout, GT_("Warning: Issuer CommonName too long (possibly truncated).\n"));
} else
- report(stdout, _("Unknown Issuer CommonName\n"));
+ report(stdout, GT_("Unknown Issuer CommonName\n"));
}
if ((i = X509_NAME_get_text_by_NID(subj, NID_commonName, buf, sizeof(buf))) != -1) {
if (outlevel == O_VERBOSE)
- report(stdout, _("Server CommonName: %s\n"), buf);
+ report(stdout, GT_("Server CommonName: %s\n"), buf);
if (i >= sizeof(buf) - 1) {
/* Possible truncation. In this case, this is a DNS name, so this
* is really bad. We do not tolerate this even in the non-strict case. */
- report(stderr, _("Bad certificate: Subject CommonName too long!\n"));
+ report(stderr, GT_("Bad certificate: Subject CommonName too long!\n"));
return (0);
}
if (_ssl_server_cname != NULL) {
}
if (0 != strcasecmp(p1, p2)) {
report(stderr,
- _("Server CommonName mismatch: %s != %s\n"),
+ GT_("Server CommonName mismatch: %s != %s\n"),
buf, _ssl_server_cname );
if (ok_return && strict)
return (0);
}
} else if (ok_return && strict) {
- report(stderr, _("Server name not set, could not verify certificate!\n"));
+ report(stderr, GT_("Server name not set, could not verify certificate!\n"));
return (0);
}
} else {
if (outlevel == O_VERBOSE)
- report(stdout, _("Unknown Server CommonName\n"));
+ report(stdout, GT_("Unknown Server CommonName\n"));
if (ok_return && strict) {
- report(stderr, _("Server name not specified in certificate!\n"));
+ report(stderr, GT_("Server name not specified in certificate!\n"));
return (0);
}
}
_check_fp = 0;
digest_tp = EVP_md5();
if (digest_tp == NULL) {
- report(stderr, _("EVP_md5() failed!\n"));
+ report(stderr, GT_("EVP_md5() failed!\n"));
return (0);
}
if (!X509_digest(x509_cert, digest_tp, digest, &dsz)) {
- report(stderr, _("Out of memory!\n"));
+ report(stderr, GT_("Out of memory!\n"));
return (0);
}
tp = text;
esz = sprintf(tp, i > 0 ? ":%02X" : "%02X", digest[i]);
#endif
if (esz >= te - tp) {
- report(stderr, _("Digest text buffer too small!\n"));
+ report(stderr, GT_("Digest text buffer too small!\n"));
return (0);
}
tp += esz;
}
- report(stdout, _("%s key fingerprint: %s\n"), _server_label, text);
+ if (outlevel > O_NORMAL)
+ report(stdout, GT_("%s key fingerprint: %s\n"), _server_label, text);
if (_check_digest != NULL) {
- if (strcmp(text, _check_digest) == 0)
- report(stdout, _("%s fingerprints match.\n"), _server_label);
- else {
- report(stderr, _("%s fingerprints do not match!\n"), _server_label);
- return (0);
+ if (strcmp(text, _check_digest) == 0) {
+ if (outlevel > O_NORMAL)
+ report(stdout, GT_("%s fingerprints match.\n"), _server_label);
+ } else {
+ if (outlevel > O_SILENT)
+ report(stderr, GT_("%s fingerprints do not match!\n"), _server_label);
+ return (0);
}
}
}
}
if (err != X509_V_OK && (strict || outlevel == O_VERBOSE)) {
- report(strict ? stderr : stdout, _("Warning: server certificate verification: %s\n"), X509_verify_cert_error_string(err));
+ report(strict ? stderr : stdout, GT_("Warning: server certificate verification: %s\n"), X509_verify_cert_error_string(err));
/* We gave the error code, but maybe we can add some more details for debugging */
switch (err) {
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
X509_NAME_oneline(issuer, buf, sizeof(buf));
buf[sizeof(buf) - 1] = '\0';
- report(stdout, _("unknown issuer (first %d characters): %s\n"), sizeof(buf), buf);
+ report(stdout, GT_("unknown issuer (first %d characters): %s\n"), sizeof(buf), buf);
break;
}
}
return (ok_return);
}
-int SSL_nock_verify_callback( int ok_return, X509_STORE_CTX *ctx )
+static int SSL_nock_verify_callback( int ok_return, X509_STORE_CTX *ctx )
{
return SSL_verify_callback(ok_return, ctx, 0);
}
-int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx )
+static int SSL_ck_verify_callback( int ok_return, X509_STORE_CTX *ctx )
{
return SSL_verify_callback(ok_return, ctx, 1);
}
char *fingerprint, char *servercname, char *label)
{
SSL *ssl;
+ struct stat randstat;
+ int i;
SSL_load_error_strings();
SSLeay_add_ssl_algorithms();
+#ifdef SSL_ENABLE
+ if (stat("/dev/random", &randstat) &&
+ stat("/dev/urandom", &randstat)) {
+ /* Neither /dev/random nor /dev/urandom are present, so add
+ entropy to the SSL PRNG a hard way. */
+ for (i = 0; i < 10000 && ! RAND_status (); ++i) {
+ char buf[4];
+ struct timeval tv;
+ gettimeofday (&tv, 0);
+ buf[0] = tv.tv_usec & 0xF;
+ buf[2] = (tv.tv_usec & 0xF0) >> 4;
+ buf[3] = (tv.tv_usec & 0xF00) >> 8;
+ buf[1] = (tv.tv_usec & 0xF000) >> 12;
+ RAND_add (buf, sizeof buf, 0.1);
+ }
+ }
+#endif /* SSL_ENABLE */
+
+
if( sock < 0 || sock > FD_SETSIZE ) {
- report(stderr, _("File descriptor out of range for SSL") );
+ report(stderr, GT_("File descriptor out of range for SSL") );
return( -1 );
}
_ctx = SSL_CTX_new(SSLv3_client_method());
} else if(!strcmp("tls1",myproto)) {
_ctx = SSL_CTX_new(TLSv1_client_method());
+ } else if (!strcmp("ssl23",myproto)) {
+ myproto = NULL;
} else {
- fprintf(stderr,_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto);
+ fprintf(stderr,GT_("Invalid SSL protocol '%s' specified, using default (SSLv23).\n"), myproto);
myproto = NULL;
}
}
SSL_set_fd(_ssl_context[sock], sock);
- if(SSL_connect(_ssl_context[sock]) == -1) {
+ if(SSL_connect(_ssl_context[sock]) < 1) {
ERR_print_errors_fp(stderr);
return(-1);
}
/* Paranoia: was the callback not called as we expected? */
if ((fingerprint != NULL || certck) && !_depth0ck) {
- report(stderr, _("Certificate/fingerprint verification was somehow skipped!\n"));
+ report(stderr, GT_("Certificate/fingerprint verification was somehow skipped!\n"));
if( NULL != ( ssl = SSLGetContext( sock ) ) ) {
/* Clean up the SSL stack */
return(fm_close(sock)); /* this is guarded */
}
+#ifdef __CYGWIN__
+/*
+ * Workaround Microsoft Winsock recv/WSARecv(..., MSG_PEEK) bug.
+ * See http://sources.redhat.com/ml/cygwin/2001-08/msg00628.html
+ * for more details.
+ */
+static ssize_t cygwin_read(int sock, void *buf, size_t count)
+{
+ char *bp = buf;
+ int n = 0;
+
+ if ((n = read(sock, bp, count)) == -1)
+ return(-1);
+
+ if (n != count) {
+ int n2 = 0;
+ if (outlevel >= O_VERBOSE)
+ report(stdout, GT_("Cygwin socket read retry\n"));
+ n2 = read(sock, bp + n, count - n);
+ if (n2 == -1 || n + n2 != count) {
+ report(stderr, GT_("Cygwin socket read retry failed!\n"));
+ return(-1);
+ }
+ }
+
+ return count;
+}
+#endif /* __CYGWIN__ */
+
#ifdef MAIN
/*
* Use the chargen service to test input buffering directly.
projects / ~andy / fetchmail / blobdiff