oweals/openssl.git
10 years agoMake disabling last cipher work.
Thijs Alkemade [Wed, 2 Jul 2014 02:32:19 +0000 (03:32 +0100)]
Make disabling last cipher work.

10 years agoASN1 sanity check.
Dr. Stephen Henson [Tue, 1 Jul 2014 23:57:57 +0000 (00:57 +0100)]
ASN1 sanity check.

Primitive encodings shouldn't use indefinite length constructed
form.

PR#2438 (partial).

10 years agoAdd support for SHA2 in CAPI ENGINE.
Libor Krystek [Tue, 1 Jul 2014 23:30:13 +0000 (00:30 +0100)]
Add support for SHA2 in CAPI ENGINE.

PR#2706 though patch is from PR#3366.

10 years agoFix possible buffer overrun.
Ben Laurie [Wed, 23 Apr 2014 17:13:20 +0000 (18:13 +0100)]
Fix possible buffer overrun.

(cherry picked from commit 2db3ea29298bdc347f15fbfab6d5746022f05101)

Conflicts:
ssl/t1_lib.c

10 years agoRT 1528; misleading debug print, "pre-master" should be "master key"
Rich Salz [Tue, 1 Jul 2014 17:22:38 +0000 (13:22 -0400)]
RT 1528; misleading debug print, "pre-master" should be "master key"

10 years agoperlasm/ppc-xlate.pl update.
Andy Polyakov [Tue, 1 Jul 2014 17:11:11 +0000 (19:11 +0200)]
perlasm/ppc-xlate.pl update.

10 years agoEngage SHA256/512 for PowerISA 2.07.
Andy Polyakov [Tue, 1 Jul 2014 17:07:49 +0000 (19:07 +0200)]
Engage SHA256/512 for PowerISA 2.07.

10 years agoAdd SHA256/512 for PowerISA 2.07.
Andy Polyakov [Tue, 1 Jul 2014 17:06:03 +0000 (19:06 +0200)]
Add SHA256/512 for PowerISA 2.07.

10 years agoRT 1530; fix incorrect comment
Rich Salz [Tue, 1 Jul 2014 17:06:18 +0000 (13:06 -0400)]
RT 1530; fix incorrect comment

10 years agoRT 1229; typo in comment "dont't"->"don't"
Rich Salz [Tue, 1 Jul 2014 17:02:57 +0000 (13:02 -0400)]
RT 1229; typo in comment "dont't"->"don't"

10 years agoRT 3245; it's "bitwise or" not "logical or"
Rich Salz [Tue, 1 Jul 2014 17:00:18 +0000 (13:00 -0400)]
RT 3245; it's "bitwise or" not "logical or"

10 years agoFix RT 3211; "and are" -->"are"
Rich Salz [Tue, 1 Jul 2014 16:55:32 +0000 (12:55 -0400)]
Fix RT 3211; "and are" -->"are"

10 years agoFix RT 2567; typo in pkeyutl page.
Rich Salz [Tue, 1 Jul 2014 16:49:20 +0000 (12:49 -0400)]
Fix RT 2567; typo in pkeyutl page.

10 years agoFix RT 2430; typo's in ca.pod
Rich Salz [Tue, 1 Jul 2014 16:47:52 +0000 (12:47 -0400)]
Fix RT 2430; typo's in ca.pod

10 years agoFix RT 3193
Rich Salz [Tue, 1 Jul 2014 16:44:32 +0000 (12:44 -0400)]
Fix RT 3193

10 years agosha512-x86_64.pl: fix linking problem under Windows.
Andy Polyakov [Tue, 1 Jul 2014 15:11:22 +0000 (17:11 +0200)]
sha512-x86_64.pl: fix linking problem under Windows.

10 years agoWindows build fixes.
Dr. Stephen Henson [Tue, 1 Jul 2014 13:11:28 +0000 (14:11 +0100)]
Windows build fixes.

10 years agoFix warning.
Dr. Stephen Henson [Sun, 1 Dec 2013 23:30:21 +0000 (23:30 +0000)]
Fix warning.
(cherry picked from commit c97ec5631bb08a2171a125008d2f0d2a75687aaa)

10 years agoMake NO_SYS_UN_H compile.
Dr. Stephen Henson [Tue, 1 Jul 2014 11:44:00 +0000 (12:44 +0100)]
Make NO_SYS_UN_H compile.

10 years agoAccessor functions for app_data in ECDSA_METHOD
Dr. Stephen Henson [Tue, 1 Jul 2014 11:01:00 +0000 (12:01 +0100)]
Accessor functions for app_data in ECDSA_METHOD

10 years agoTest copying of contexts in evp_test.
Dr. Stephen Henson [Mon, 30 Jun 2014 12:26:28 +0000 (13:26 +0100)]
Test copying of contexts in evp_test.

Test EVP_CIPHER_CTX_copy in evp_test. This will catch any
problems with copying in underlying ciphers.

10 years agoMake depend.
Ben Laurie [Mon, 30 Jun 2014 15:03:29 +0000 (16:03 +0100)]
Make depend.

10 years agoFix copy for CCM, GCM and XTS.
Dr. Stephen Henson [Mon, 30 Jun 2014 11:57:29 +0000 (12:57 +0100)]
Fix copy for CCM, GCM and XTS.

Internal pointers in CCM, GCM and XTS contexts should either be
NULL or set to point to the appropriate key schedule. This needs
to be adjusted when copying contexts.

10 years agoDon't core dump when using CMAC with dgst.
Dr. Stephen Henson [Sun, 29 Jun 2014 22:25:59 +0000 (23:25 +0100)]
Don't core dump when using CMAC with dgst.

We can't unfortunately print the CMAC cipher used without extending the API.

PR#2579

10 years agoClarified that the signature's buffer size, `s`, is not used as an
Jeffrey Walton [Sun, 29 Jun 2014 22:34:21 +0000 (23:34 +0100)]
Clarified that the signature's buffer size, `s`, is not used as an
IN parameter.

Under the old docs, the only thing stated was "at most
EVP_PKEY_size(pkey) bytes will be written". It was kind of misleading
since it appears EVP_PKEY_size(pkey) WILL be written regardless of the
signature's buffer size.

10 years agoMore constification.
Ben Laurie [Sun, 29 Jun 2014 21:13:31 +0000 (22:13 +0100)]
More constification.

10 years agoMake EVP_CIPHER_CTX_copy work in GCM mode.
ZNV [Sun, 29 Jun 2014 21:01:28 +0000 (22:01 +0100)]
Make EVP_CIPHER_CTX_copy work in GCM mode.

PR#3272

10 years agoAdd 3072, 7680 and 15360 bit RSA tests to openssl speed
Oscar Jacobsson [Sun, 29 Jun 2014 20:38:09 +0000 (21:38 +0100)]
Add 3072, 7680 and 15360 bit RSA tests to openssl speed

PR#3412

10 years agoConstification - mostly originally from Chromium.
Ben Laurie [Sun, 29 Jun 2014 20:05:23 +0000 (21:05 +0100)]
Constification - mostly originally from Chromium.

10 years agoMerge branch 'master' of git.openssl.org:openssl
Rich Salz [Sun, 29 Jun 2014 15:40:39 +0000 (11:40 -0400)]
Merge branch 'master' of git.openssl.org:openssl

10 years agoFix typo in message (RT 3107)
Rich Salz [Sun, 29 Jun 2014 15:40:05 +0000 (11:40 -0400)]
Fix typo in message (RT 3107)

10 years agoFix memory leak.
Dr. Stephen Henson [Sun, 29 Jun 2014 12:51:30 +0000 (13:51 +0100)]
Fix memory leak.

PR#2531

10 years agoTypo.
Ken Ballou [Sun, 29 Jun 2014 12:38:55 +0000 (13:38 +0100)]
Typo.

PR#3173

10 years agoShow errors on CSR verification failure.
Dr. Stephen Henson [Sun, 29 Jun 2014 12:31:57 +0000 (13:31 +0100)]
Show errors on CSR verification failure.

If CSR verify fails in ca utility print out error messages.
Otherwise some errors give misleading output: for example
if the key size exceeds the library limit.

PR#2875

10 years agoMake no-ssl3 no-ssl2 do more sensible things.
Dr. Stephen Henson [Sun, 29 Jun 2014 02:02:51 +0000 (03:02 +0100)]
Make no-ssl3 no-ssl2 do more sensible things.

10 years agoClarify protocols supported.
Dr. Stephen Henson [Sat, 28 Jun 2014 20:54:13 +0000 (21:54 +0100)]
Clarify protocols supported.

Update protocols supported and note that SSLv2 is effectively disabled
by default.

PR#3184

10 years agoHandle BER length encoding.
Dr. Stephen Henson [Sat, 28 Jun 2014 13:04:36 +0000 (14:04 +0100)]
Handle BER length encoding.

Tolerate BER length encoding which may include leading zeroes.

PR#2746

10 years agox86_64 assembly pack: refine clang detection.
Andy Polyakov [Sat, 28 Jun 2014 15:23:21 +0000 (17:23 +0200)]
x86_64 assembly pack: refine clang detection.

10 years agoTypo.
Dr. Stephen Henson [Sat, 28 Jun 2014 11:42:04 +0000 (12:42 +0100)]
Typo.

PR#3107

10 years agoDon't disable state strings with no-ssl2
Dr. Stephen Henson [Fri, 27 Jun 2014 23:54:32 +0000 (00:54 +0100)]
Don't disable state strings with no-ssl2

Some state strings were erronously not compiled when no-ssl2
was set.

PR#3295

10 years agoFix compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUG
yogesh nagarkar [Fri, 27 Jun 2014 23:40:26 +0000 (00:40 +0100)]
Fix compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUG

PR#3141

10 years agoFix typo in ideatest.c
Andreas Westfeld [Fri, 27 Jun 2014 23:04:56 +0000 (00:04 +0100)]
Fix typo in ideatest.c

10 years agoRemove redundant check.
Ken Ballou [Fri, 27 Jun 2014 22:17:47 +0000 (23:17 +0100)]
Remove redundant check.

PR#3174

10 years agoFix for EVP_PBE_alg_add().
Dr. Stephen Henson [Fri, 27 Jun 2014 21:56:37 +0000 (22:56 +0100)]
Fix for EVP_PBE_alg_add().

In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size.

PR#3206

10 years agobn/asm/rsaz-avx2.pl: fix occasional failures.
Andy Polyakov [Fri, 27 Jun 2014 20:41:58 +0000 (22:41 +0200)]
bn/asm/rsaz-avx2.pl: fix occasional failures.

10 years agoRT 487. Mention that generated primes are "at least" B<bits> long.
Rich Salz [Fri, 27 Jun 2014 19:59:08 +0000 (15:59 -0400)]
RT 487.  Mention that generated primes are "at least" B<bits> long.

10 years agoTolerate critical AKID in CRLs.
Dr. Stephen Henson [Fri, 27 Jun 2014 17:49:32 +0000 (18:49 +0100)]
Tolerate critical AKID in CRLs.

PR#3014

10 years agoAdd SHA256 Camellia ciphersuites from RFC5932
PK [Fri, 27 Jun 2014 17:22:51 +0000 (18:22 +0100)]
Add SHA256 Camellia ciphersuites from RFC5932

PR#2800

10 years agoHandle IPv6 addresses in OCSP_parse_url.
Tom Greenslade [Fri, 27 Jun 2014 16:30:59 +0000 (17:30 +0100)]
Handle IPv6 addresses in OCSP_parse_url.

PR#2783

10 years agoDon't advertise ECC ciphersuits in SSLv2 compatible client hello.
Tomas Mraz [Fri, 27 Jun 2014 15:49:22 +0000 (16:49 +0100)]
Don't advertise ECC ciphersuits in SSLv2 compatible client hello.

PR#3374

10 years agoClarify docs.
Jeffrey Walton [Fri, 27 Jun 2014 15:33:06 +0000 (16:33 +0100)]
Clarify docs.

Document that the certificate passed to SSL_CTX_add_extra_chain_cert()
should not be freed by the application.

PR#3409

10 years agoRebuild OID table.
Dr. Stephen Henson [Fri, 27 Jun 2014 13:34:14 +0000 (14:34 +0100)]
Rebuild OID table.

10 years agoFix OID encoding for one component.
Dr. Stephen Henson [Fri, 27 Jun 2014 02:17:15 +0000 (03:17 +0100)]
Fix OID encoding for one component.

OIDs with one component don't have an encoding.

PR#2556 (Bug#1)

10 years agoMemory leak and NULL dereference fixes.
Dr. Stephen Henson [Fri, 27 Jun 2014 02:21:10 +0000 (03:21 +0100)]
Memory leak and NULL dereference fixes.

PR#3403

10 years agoMake sure BN_sqr can never return a negative value.
Huzaifa Sidhpurwala [Thu, 26 Jun 2014 22:45:58 +0000 (23:45 +0100)]
Make sure BN_sqr can never return a negative value.

PR#3410

10 years agoRemove ancient obsolete files under pkcs7.
Dr. Stephen Henson [Thu, 26 Jun 2014 11:36:44 +0000 (12:36 +0100)]
Remove ancient obsolete files under pkcs7.

10 years agobn_exp.c: move check for AD*X to rsaz-avx2.pl.
Andy Polyakov [Thu, 26 Jun 2014 22:07:15 +0000 (00:07 +0200)]
bn_exp.c: move check for AD*X to rsaz-avx2.pl.

This ensures high performance is situations when assembler supports
AVX2, but not AD*X.

10 years agoaesp8-ppc.pl: rigid input verification in key setup.
Andy Polyakov [Wed, 25 Jun 2014 20:12:32 +0000 (22:12 +0200)]
aesp8-ppc.pl: rigid input verification in key setup.

10 years agoaesv8-armx.pl: rigid input verification in key setup.
Andy Polyakov [Wed, 25 Jun 2014 20:10:45 +0000 (22:10 +0200)]
aesv8-armx.pl: rigid input verification in key setup.

10 years agox86_64 assembly pack: addendum to last clang commit.
Andy Polyakov [Tue, 24 Jun 2014 06:37:05 +0000 (08:37 +0200)]
x86_64 assembly pack: addendum to last clang commit.

10 years agox86_64 assembly pack: allow clang to compile AVX code.
Andy Polyakov [Tue, 24 Jun 2014 06:24:25 +0000 (08:24 +0200)]
x86_64 assembly pack: allow clang to compile AVX code.

10 years agoaesv8-armx.pl: inclrease interleave factor.
Andy Polyakov [Tue, 24 Jun 2014 06:08:58 +0000 (08:08 +0200)]
aesv8-armx.pl: inclrease interleave factor.

This is to compensate for higher aes* instruction latency on Cortex-A57.

10 years agoARMv8 assembly pack: add Cortex performance numbers.
Andy Polyakov [Tue, 24 Jun 2014 06:06:05 +0000 (08:06 +0200)]
ARMv8 assembly pack: add Cortex performance numbers.

10 years agoOne more typo when changing !result to result <= 0
Viktor Dukhovni [Mon, 23 Jun 2014 17:06:24 +0000 (13:06 -0400)]
One more typo when changing !result to result <= 0

10 years agoFix typo in last commit
Viktor Dukhovni [Mon, 23 Jun 2014 00:39:52 +0000 (20:39 -0400)]
Fix typo in last commit

10 years agoMultiple verifier reference identities.
Viktor Dukhovni [Sun, 22 Jun 2014 05:38:57 +0000 (01:38 -0400)]
Multiple verifier reference identities.

Implemented as STACK_OF(OPENSSL_STRING).

10 years agoImplement sk_deep_copy.
Viktor Dukhovni [Sun, 22 Jun 2014 08:24:40 +0000 (04:24 -0400)]
Implement sk_deep_copy.

10 years agoMore complete input validation of X509_check_mumble
Viktor Dukhovni [Mon, 23 Jun 2014 00:18:53 +0000 (20:18 -0400)]
More complete input validation of X509_check_mumble

10 years agoX509_check_mumble() failure is <= 0, not just 0
Viktor Dukhovni [Mon, 23 Jun 2014 00:14:53 +0000 (20:14 -0400)]
X509_check_mumble() failure is <= 0, not just 0

10 years agoDrop hostlen from X509_VERIFY_PARAM_ID.
Viktor Dukhovni [Sun, 22 Jun 2014 05:35:44 +0000 (01:35 -0400)]
Drop hostlen from X509_VERIFY_PARAM_ID.

Just store NUL-terminated strings.  This works better when we add
support for multiple hostnames.

10 years agoMore complete X509_check_host documentation.
Viktor Dukhovni [Sun, 22 Jun 2014 05:31:00 +0000 (01:31 -0400)]
More complete X509_check_host documentation.

10 years agoFix off-by-one errors in ssl_cipher_get_evp()
Miod Vallat [Wed, 4 Jun 2014 07:59:58 +0000 (03:59 -0400)]
Fix off-by-one errors in ssl_cipher_get_evp()

In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.

Bug discovered and fixed by Miod Vallat from the OpenBSD team.

PR#3375

10 years agoRevert "Fix off-by-one errors in ssl_cipher_get_evp()"
Matt Caswell [Sun, 22 Jun 2014 21:35:56 +0000 (22:35 +0100)]
Revert "Fix off-by-one errors in ssl_cipher_get_evp()"

This reverts commit abfb989fe0b749ad61f1aa4cdb0ea4f952fc13e0.

Incorrect attribution

10 years agoFixed Windows compilation failure
Matt Caswell [Mon, 26 May 2014 23:26:55 +0000 (00:26 +0100)]
Fixed Windows compilation failure

10 years agoFix minor typos
Matt Caswell [Thu, 19 Jun 2014 22:45:21 +0000 (23:45 +0100)]
Fix minor typos

10 years agoadd references to verify(1) man page for args_verify() options
Hubert Kario [Thu, 19 Jun 2014 13:34:49 +0000 (15:34 +0200)]
add references to verify(1) man page for args_verify() options

cms, ocsp, s_client, s_server and smime tools also use args_verify()
for parsing options, that makes them most of the same options
verify tool does. Add those options to man pages and reference
their explanation in the verify man page.

10 years agosort the options in verify man page alphabetically
Hubert Kario [Thu, 19 Jun 2014 12:32:53 +0000 (14:32 +0200)]
sort the options in verify man page alphabetically

just making sure the options are listed in the alphabetical order
both in SYNOPSIS and DESCRIPTION, no text changes

10 years agoadd description of missing options to verify man page
Hubert Kario [Thu, 19 Jun 2014 12:17:26 +0000 (14:17 +0200)]
add description of missing options to verify man page

The options related to policy used for verification, verification
of subject names in certificate and certificate chain handling
were missing in the verify(1) man page. This fixes this issue.

10 years agosmime man page: add missing options in SYNOPSIS
Hubert Kario [Wed, 18 Jun 2014 17:58:01 +0000 (19:58 +0200)]
smime man page: add missing options in SYNOPSIS

-CAfile and -CApath is documented in OPTIONS but is missing
in SYNOPSIS, add them there

10 years agoDocument -trusted_first option in man pages and help.
Hubert Kario [Wed, 18 Jun 2014 17:55:03 +0000 (19:55 +0200)]
Document -trusted_first option in man pages and help.

Add -trusted_first description to help messages and man pages
of tools that deal with certificate verification.

10 years agoTidied up, added include to stdlib, removed "goto bad" usage
Matt Caswell [Tue, 17 Jun 2014 22:35:53 +0000 (23:35 +0100)]
Tidied up, added include to stdlib, removed "goto bad" usage

10 years agoConform to whitespace conventions
rfkrocktk [Tue, 3 Jun 2014 22:26:50 +0000 (15:26 -0700)]
Conform to whitespace conventions

10 years agoAdded documentation for -iter for PKCS#8
rfkrocktk [Tue, 3 Jun 2014 22:24:49 +0000 (15:24 -0700)]
Added documentation for -iter for PKCS#8

10 years agoAdded custom PBKDF2 iteration count to PKCS8 tool.
Naftuli Tzvi Kay [Tue, 3 Jun 2014 19:48:06 +0000 (12:48 -0700)]
Added custom PBKDF2 iteration count to PKCS8 tool.

10 years agoFix signed/unsigned comparisons.
Felix Laurie von Massenbach [Sun, 15 Jun 2014 10:58:33 +0000 (11:58 +0100)]
Fix signed/unsigned comparisons.

10 years agoFix shadow declaration.
Felix Laurie von Massenbach [Sun, 15 Jun 2014 10:52:06 +0000 (11:52 +0100)]
Fix shadow declaration.

10 years agoaesni-sha[1|256]-x86_64.pl: fix logical error and MacOS X build.
Andy Polyakov [Mon, 16 Jun 2014 08:11:45 +0000 (10:11 +0200)]
aesni-sha[1|256]-x86_64.pl: fix logical error and MacOS X build.

10 years agoaesp8-ppc.pl: add CTR mode.
Andy Polyakov [Mon, 16 Jun 2014 06:05:19 +0000 (08:05 +0200)]
aesp8-ppc.pl: add CTR mode.

10 years agoEnforce _X509_CHECK_FLAG_DOT_SUBDOMAINS internal-only
Viktor Dukhovni [Sat, 14 Jun 2014 03:45:56 +0000 (23:45 -0400)]
Enforce _X509_CHECK_FLAG_DOT_SUBDOMAINS internal-only

10 years agoAccept CCS after sending finished.
Dr. Stephen Henson [Sat, 14 Jun 2014 21:24:08 +0000 (22:24 +0100)]
Accept CCS after sending finished.

Allow CCS after finished has been sent by client: at this point
keys have been correctly set up so it is OK to accept CCS from
server. Without this renegotiation can sometimes fail.

PR#3400

10 years agoevp/e_aes_cbc_sha[1|256].c: fix -DPEDANTIC build.
Andy Polyakov [Sat, 14 Jun 2014 21:15:39 +0000 (23:15 +0200)]
evp/e_aes_cbc_sha[1|256].c: fix -DPEDANTIC build.

10 years agoaesni-sha256-x86_64.pl: add missing rex in shaext.
Andy Polyakov [Sat, 14 Jun 2014 14:03:06 +0000 (16:03 +0200)]
aesni-sha256-x86_64.pl: add missing rex in shaext.

PR: 3405

10 years agosha1-x86_64.pl: add missing rex prefix in shaext.
Andy Polyakov [Sat, 14 Jun 2014 13:26:14 +0000 (15:26 +0200)]
sha1-x86_64.pl: add missing rex prefix in shaext.

PR: 3405

10 years agoFixed incorrect return code handling in ssl3_final_finish_mac.
Matt Caswell [Tue, 10 Jun 2014 22:24:28 +0000 (23:24 +0100)]
Fixed incorrect return code handling in ssl3_final_finish_mac.
Based on an original patch by Joel Sing (OpenBSD) who also originally identified the issue.

10 years agoRevert "Fixed incorrect return code handling in ssl3_final_finish_mac"
Matt Caswell [Fri, 13 Jun 2014 14:35:20 +0000 (15:35 +0100)]
Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"

This reverts commit 2f1dffa88e1b120add4f0b3a794fbca65aa7768d.

Missing attribution.

10 years agoClient-side namecheck wildcards.
Viktor Dukhovni [Thu, 12 Jun 2014 05:56:31 +0000 (01:56 -0400)]
Client-side namecheck wildcards.

A client reference identity of ".example.com" matches a server
certificate presented identity that is any sub-domain of "example.com"
(e.g. "www.sub.example.com).

With the X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS flag, it matches
only direct child sub-domains (e.g. "www.sub.example.com").

10 years agoFix off-by-one errors in ssl_cipher_get_evp()
Kurt Cancemi [Wed, 4 Jun 2014 07:59:58 +0000 (03:59 -0400)]
Fix off-by-one errors in ssl_cipher_get_evp()

In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.

PR#3375

10 years agoFacilitate back-porting of AESNI and SHA modules.
Andy Polyakov [Thu, 12 Jun 2014 19:45:41 +0000 (21:45 +0200)]
Facilitate back-porting of AESNI and SHA modules.
Fix SEH and stack handling in Win64 build.

10 years agoAdded OPENSSL_assert check as per PR#3377 reported by Rainer Jung <rainer.jung@kippda...
Matt Caswell [Thu, 12 Jun 2014 19:38:45 +0000 (20:38 +0100)]
Added OPENSSL_assert check as per PR#3377 reported by Rainer Jung <rainer.jung@kippdata.de>

10 years agoFix Windows build.
Dr. Stephen Henson [Thu, 12 Jun 2014 09:48:24 +0000 (10:48 +0100)]
Fix Windows build.
(cherry picked from commit 5f4c5a902b0508eab235adecb34b236cdc0048a5)