From: Erik Faye-Lund <kusmabite@googlemail.com>
To: git@vger.kernel.org
Cc: msysgit@googlegroups.com, Erik Faye-Lund <kusmabite@gmail.com>
Subject: [PATCH v5 6/8] mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
Date: Wed, 21 Oct 2009 19:04:49 +0200 [thread overview]
Message-ID: <1256144691-2908-7-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1256144691-2908-6-git-send-email-kusmabite@gmail.com>
SSL_set_fd (and friends) expects a OS file handle on Windows, not
a file descriptor as on UNIX(-ish).
This patch makes the Windows version of SSL_set_fd behave like the
UNIX versions, by calling _get_osfhandle on it's input.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
compat/mingw.h | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/compat/mingw.h b/compat/mingw.h
index 5b5258b..6907345 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -124,6 +124,27 @@ static inline int waitpid(pid_t pid, int *status, unsigned options)
return -1;
}
+#ifndef NO_OPENSSL
+#include <openssl/ssl.h>
+static inline int mingw_SSL_set_fd(SSL *ssl, int fd)
+{
+ return SSL_set_fd(ssl, _get_osfhandle(fd));
+}
+#define SSL_set_fd mingw_SSL_set_fd
+
+static inline int mingw_SSL_set_rfd(SSL *ssl, int fd)
+{
+ return SSL_set_rfd(ssl, _get_osfhandle(fd));
+}
+#define SSL_set_rfd mingw_SSL_set_rfd
+
+static inline int mingw_SSL_set_wfd(SSL *ssl, int fd)
+{
+ return SSL_set_wfd(ssl, _get_osfhandle(fd));
+}
+#define SSL_set_wfd mingw_SSL_set_wfd
+#endif
+
/*
* implementations of missing functions
*/
--
1.6.4.msysgit.0
next prev parent reply other threads:[~2009-10-21 17:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-21 17:04 [PATCH v5 0/8] imap-send: Windows support Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 1/8] imap-send: remove useless uid code Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 2/8] imap-send: use separate read and write fds Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 3/8] imap-send: use run-command API for tunneling Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 4/8] imap-send: fix compilation-error on Windows Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 5/8] imap-send: build imap-send " Erik Faye-Lund
2009-10-21 17:04 ` Erik Faye-Lund [this message]
2009-10-21 17:04 ` [PATCH v5 7/8] mingw: enable OpenSSL Erik Faye-Lund
2009-10-21 17:04 ` [PATCH v5 8/8] MSVC: Enable OpenSSL, and translate -lcrypto Erik Faye-Lund
2009-10-22 18:38 ` [msysGit] [PATCH v5 7/8] mingw: enable OpenSSL Johannes Sixt
2009-10-22 17:42 ` [msysGit] [PATCH v5 0/8] imap-send: Windows support Johannes Schindelin
2009-10-22 18:11 ` [msysGit] " Johannes Sixt
2009-10-22 18:26 ` [PATCH ef/msys-imap] mingw: use BLK_SHA1 again Johannes Sixt
2009-10-26 22:26 ` Johannes Schindelin
2009-10-27 6:56 ` Johannes Sixt
2009-10-22 19:20 ` [msysGit] Re: [PATCH v5 0/8] imap-send: Windows support Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1256144691-2908-7-git-send-email-kusmabite@gmail.com \
--to=kusmabite@googlemail.com \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.