Matt Caswell
89f6c5b492
Further comment amendments to preserve formatting prior to source reformat
...
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)
Conflicts:
crypto/x509v3/pcy_tree.c
Conflicts:
apps/apps.c
ssl/ssltest.c
Conflicts:
apps/apps.c
crypto/ec/ec2_oct.c
crypto/ec/ecp_nistp224.c
crypto/ec/ecp_nistp256.c
crypto/ec/ecp_nistp521.c
ssl/s3_cbc.c
ssl/ssl_sess.c
ssl/t1_lib.c
Reviewed-by: Tim Hudson <tjh@openssl.org>
2015-01-22 09:41:33 +00:00
Matt Caswell
23df532ec4
Avoid deprecation problems in Visual Studio 13
...
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 86d21d0b95
)
2015-01-13 09:48:38 +00:00
Dr. Stephen Henson
910b3a81fd
Avoid Windows 8 Getversion deprecated errors.
...
Windows 8 SDKs complain that GetVersion() is deprecated.
We only use GetVersion like this:
(GetVersion() < 0x80000000)
which checks if the Windows version is NT based. Use a macro check_winnt()
which uses GetVersion() on older SDK versions and true otherwise.
(cherry picked from commit a4cc3c8041
)
2014-02-25 13:43:04 +00:00
Andy Polyakov
162de2f2b5
rand_win.c: fix logical bug in readscreen [from HEAD].
2010-03-22 22:44:35 +00:00
Dr. Stephen Henson
9051fc538f
PR: 2100
...
Submitted by: James Baker <jbaker@tableausoftware.com> et al.
Workaround for slow Heap32Next on some versions of Windows.
2010-02-17 14:32:25 +00:00
Andy Polyakov
a238d7d1eb
rand_win.c: handel GetTickCount wrap-around [from HEAD].
2010-01-19 21:44:07 +00:00
Dr. Stephen Henson
5e56584285
Don't use __try+__except unless on VC++
2009-09-20 12:39:16 +00:00
Dr. Stephen Henson
2475a52061
Update from 0.9.8-stable.
2009-07-24 13:47:52 +00:00
Andy Polyakov
b92c0df834
Broaden compatibility amount Win32 headers even further [some don't have
...
SIZE_T].
2005-10-13 19:06:43 +00:00
Andy Polyakov
59947880f4
Broaden compatibility among Windows SDK versions. Elder versions don't have
...
ULONG_PTR, so we replace it with equally wide SIZE_T.
2005-09-22 20:28:30 +00:00
Andy Polyakov
0491e05833
Final(?) WinCE update.
2005-08-07 22:21:49 +00:00
Andy Polyakov
19bd66fe74
WCE update, mostly typos.
2005-08-03 19:56:36 +00:00
Andy Polyakov
573969cd53
Abstain from GUI calls in rand_win.c in NT service context.
2005-08-02 22:09:14 +00:00
Andy Polyakov
8a35fb3bea
Eliminate bogus #if WCEPLATFORM!=MS_HPC_PRO [which by the way unconditionally
...
invalidated the whole clause] and replace it with #if _WIN32_WCE>=210.
2005-08-02 11:58:39 +00:00
Andy Polyakov
e476f94212
Move _WIN32_WINNT definition from command line to e_os.h. The change is
...
inspired by VC6 failure report. In addition abstain from taking screen
snapshots when running in NT service context.
2005-05-21 13:19:27 +00:00
Dr. Stephen Henson
f68854b4c3
Various Win32 and other fixes for warnings and compilation errors.
...
Fix Win32 build system to use 'Makefile' instead of 'Makefile.ssl'.
2005-04-19 00:12:36 +00:00
Ulf Möller
7a8c728860
undo Cygwin change
2005-03-24 00:14:59 +00:00
Ulf Möller
130db968b8
Use Windows randomness code on Cygwin
2005-03-19 11:39:17 +00:00
Andy Polyakov
89c53672c2
Make rand_win.c UNICODE savvy.
2004-07-21 17:17:30 +00:00
Lutz Jänicke
c0017a5a65
Update URI
...
Submitted by: Gertjan van Oosten <gertjan@West.NL>
PR: #804
2004-01-04 18:05:50 +00:00
Richard Levitte
88401ed449
Correct two problems, found by Martin Kochanski <cardbox@easynet.co.uk>:
...
1. CreateToolhelp32Snapshot returns INVALID_HANDLE_VALUE, not NULL, on error.
2. On Windows CE, a snapshot handle is closed with CloseToolhelp32Snapshot,
not CloseHandle.
2003-08-07 11:57:42 +00:00
Richard Levitte
7a1f92fdc3
Windows CE updates, contributed by Steven Reddie <smr@essemer.com.au>
2002-12-03 14:20:44 +00:00
Richard Levitte
0bf23d9b20
WinCE patches
2002-11-15 22:37:18 +00:00
Richard Levitte
35a6db8640
Close the implicitely opened registry key.
...
PR: 264
2002-11-14 23:33:28 +00:00
Bodo Möller
3e563bcea7
disable '#ifdef DEBUG' sections
2002-02-21 13:07:44 +00:00
Dr. Stephen Henson
40e15f9d78
Typo.
2001-03-10 01:57:38 +00:00
Ulf Möller
429cf462d0
old MSVC versions don't have rdtsc
...
use _emit instead
Pointed out by Jeremy Cooper <jeremy@baymoo.org>
2001-03-08 16:46:23 +00:00
Richard Levitte
bc36ee6227
Use new-style system-id macros everywhere possible. I hope I haven't
...
missed any.
This compiles and runs on Linux, and external applications have no
problems with it. The definite test will be to build this on VMS.
2001-02-20 08:13:47 +00:00
Bodo Möller
cc85ec447b
Disable RegQueryValueEx() call.
...
Problem reported by "Wolfgang Marczy" <WMarczy@topcall.co.at>
in a message to openssl-dev (19 Dec 2000 13:40:51 +0100).
2001-01-12 15:16:21 +00:00
Richard Levitte
0c61e299b3
Change RAND_poll for Unix to try a number of devices and only read
...
them for a short period of time (actually, poll them with select(),
then read() whatever is there), which is about 10ms (hard-coded value)
each.
Separate Windows and Unixly code, and start on a VMS variant that
currently just returns 0.
2001-01-08 10:59:26 +00:00
Bodo Möller
b2e7419a1d
Simplify preprocessor statements.
2000-12-17 00:30:03 +00:00
Richard Levitte
3a3ca1d474
Do not poll DEVRANDOM if weäre building without an file pointer API.
...
Spotted by "David Schwartz" <davids@webmaster.com>.
2000-12-16 11:19:19 +00:00
Ulf Möller
c1db5bfc08
fix for Borland C
2000-11-29 16:43:50 +00:00
Ulf Möller
361c7f2b52
Set the CryptoAPI randomness estimate back to 0.
...
The randomness may not actually be very good (we don't know).
2000-11-04 03:33:26 +00:00
Ulf Möller
9f6fe8dbe7
increase the value a bit
2000-11-03 23:07:01 +00:00
Richard Levitte
10bb0dbfec
Changes by Jeffrey Altman <jaltman@columbia.edu> to make RAND_poll()
...
work better in Win32. Verified by zhu qun-ying <qyzhu@krdl.org.sg>.
2000-09-21 07:02:27 +00:00
Richard Levitte
24842e0586
Going through performance statistics sometimes generates an exception,
...
so disable that part.
Reported by Jeffrey Altman <jaltman@columbia.edu>
2000-09-18 11:51:07 +00:00
Richard Levitte
159cf04e86
cyclecount is only used when __GNUC__ isn't defined.
2000-09-18 11:44:40 +00:00
Richard Levitte
676432d4e1
Disable the net statistics gathering code, since different compilers
...
disagree on the proper syntax and type names.
2000-09-18 11:24:32 +00:00
Richard Levitte
362f2b69ff
Jeffrey Altman reminds us to initialize some variables and ercommends the use of LOadLibrary instead of GetModuleHandle
2000-09-18 01:48:38 +00:00
Richard Levitte
1d95fb659d
Jeffrey Altman <jaltman@columbia.edu> sent me a patch that fixes the
...
problems with GetCursorInfo, but also adds network statistics and
performance statistics where available.
2000-09-17 18:42:13 +00:00
Richard Levitte
848f3d40c8
Later, Jeffrey changed his mind. Apparently, GetCursorInfo exists but
...
doesn't quite work on WinNT 4 earlier than SP6. It works fine on
Windows 98 and Windows 2000.
I'm disabling it for now. What's really needed is some kind of check
to see if GetCursorInfo is safe to call, or alternatively, GetCursor
or GetCursorPos could be used, according to Jeffrey.
2000-09-15 11:33:14 +00:00
Ulf Möller
1949e78336
Jeffrey Altman points out that GetQueueStatus() crashes on NT.
2000-09-15 04:20:40 +00:00
Richard Levitte
7abee0cedf
Jeffrey Altman convinced me this patch was really needed, or there is
...
no way to make sure GetCursorInfo will give us a valid answer.
2000-09-14 09:19:19 +00:00
Ulf Möller
24b8bf2163
Point to Peter Gutmann's revised paper.
...
The copy at www.usenix.org is the old version.
2000-09-13 14:24:07 +00:00
Richard Levitte
c0366d89f6
3 changes:
...
- Make sure PCURSORINFO is defined even on systems that do not provide it.
- Change the reference to Peter Gutmann's paper.
- Make sure we don't walk the whole heap lists for performance reasons.
Jeffrey Altman suggests following Peter Gutmann's advice to keep it
to 50 heap entries per heap list.
2000-09-13 07:17:35 +00:00
Richard Levitte
25a73f2690
A cast is needed or Borland C will complain.
2000-09-11 11:43:35 +00:00
Ulf Möller
2ad3c4c89e
oops.
2000-07-21 02:14:15 +00:00
Ulf Möller
3866db2d5a
don't print debug output
2000-07-21 01:13:26 +00:00
Ulf Möller
c0722725f9
Randomness polling function for Win9x.
2000-07-19 21:35:35 +00:00