Sure.
Thanks Mario.
Erick
$ diff -u openssl/e_os.h openssl/e_os.h.p
--- openssl/e_os.h 2012-08-09 11:03:21 -0600
+++ openssl/e_os.h.p 2012-08-09 11:08:02 -0600
@@ -253,6 +253,18 @@
# define NO_DIRENT
# ifdef WINDOWS
+#ifndef OPENSSL_USE_IPV6
+ /* Need at least WINNT 501 for IPV6 */
+# if !defined(_WIN32_WINNT)
+# define _WIN32_WINNT 0x0501
+ /* if not XP or better then give a warning. Non MS Socket users can
ignore. */
+# elif _WIN32_WINNT < 0x0501
+# pragma message( "WARNING: MS IPV6 is not 'production quality' until
XP (0x0501) ")
+# endif
+ /* default to using IPV6 for windows (no change).
+ To disable ipv6 define as 0 as in opensslconf.h or in makefile. */
+# define OPENSSL_USE_IPV6 1
+#endif
# if !defined(_WIN32_WCE) && !defined(_WIN32_WINNT)
/*
* Defining _WIN32_WINNT here in e_os.h implies certain "discipline."
$ diff -u openssl/crypto/bio/bss_dgram.c openssl/crypto/bio/bss_dgram.c.p
--- openssl/crypto/bio/bss_dgram.c 2012-08-09 10:51:43 -0600
+++ openssl/crypto/bio/bss_dgram.c.p 2012-08-09 10:25:26 -0600
@@ -57,10 +57,10 @@
*
*/
-
+#define USE_SOCKETS
+#include "e_os.h"
#include <stdio.h>
#include <errno.h>
-#define USE_SOCKETS
#include "cryptlib.h"
#include <openssl/bio.h>
-----Original Message-----
From: [email protected] [mailto:[email protected]] On
Behalf Of Mario Brandt
Sent: Thursday, August 09, 2012 2:15 AM
To: [email protected]
Subject: Re: patches for windows
Could you send unified diff please?
Mario
On Wed, Aug 8, 2012 at 10:29 PM, Wodarz, Erick <[email protected]> wrote:
> This patch fixes a problem with compiling on Windows for options
> OPENSSL_USE_IPV6 and a windows requirement of having _WIN32_WINNT being at
> least 0x0501. Anybody willing to commit it? Or come up w/ a better
> solution?
>
> Thanks!
>
> diff -r1.103 e_os.h
> 255a256,262
>> #ifndef OPENSSL_USE_IPV6
>> # define OPENSSL_USE_IPV6 0
>> /* Need at least WINNT 501 for IPV6 */ #else
>> # define _WIN32_WINNT 0x0501
>> # define OPENSSL_USE_IPV6 1
>> #endif
> 270a278
>> #ifndef _WIN32_WINNT
> 271a280
>> #endif
>
>
>
> RCS file: /v/openssl/cvs/openssl/crypto/bio/bss_dgram.c,v
> retrieving revision 1.38
> diff -r1.38 bss_dgram.c
> 61,62d60
> < #include <stdio.h>
> < #include <errno.h>
> 63a62
>> #include "e_os.h"
> 64a64,65
>> #include <stdio.h>
>> #include <errno.h>
>
> Erick Wodarz
>
> Habit is habit, and not to be flung out of the window by any man, but coaxed
> down the stairs a step at a time.
>
> Mark Twain
>
> ______________________________________________________________________
> OpenSSL Project http://www.openssl.org
> Development Mailing List [email protected]
> Automated List Manager [email protected]
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [email protected]
Automated List Manager [email protected]
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [email protected]
Automated List Manager [email protected]
