openssl.git
6 years agoUpdate demo.
Dr. Stephen Henson [Wed, 18 Dec 2013 13:28:44 +0000 (13:28 +0000)]
Update demo.
(cherry picked from commit 88c21c47a3d187d4f8c4e87e3c6088198cb08a99)

6 years agoUpdate demos/bio/README
Dr. Stephen Henson [Sun, 20 Oct 2013 21:34:14 +0000 (22:34 +0100)]
Update demos/bio/README
(cherry picked from commit ea131a0644bcebeaa5e911217aadbc9dac241fec)

6 years agoModify sample accept.cnf
Dr. Stephen Henson [Sun, 20 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Modify sample accept.cnf
(cherry picked from commit d80b0eeee59fa48f2506fe103de1b52ef6de3f4f)

6 years agoAdd demo for SSL server using SSL_CONF.
Dr. Stephen Henson [Fri, 18 Oct 2013 15:28:38 +0000 (16:28 +0100)]
Add demo for SSL server using SSL_CONF.
(cherry picked from commit ebd14bfce9ef6b4bf41129a329823130d1002f42)

6 years agoAdd extension free function.
Ben Laurie [Sun, 2 Feb 2014 15:22:10 +0000 (15:22 +0000)]
Add extension free function.

6 years agoengines/e_capi.c: TCHAR support (cumilative update from master).
Andy Polyakov [Sat, 1 Feb 2014 23:17:38 +0000 (00:17 +0100)]
engines/e_capi.c: TCHAR support (cumilative update from master).

6 years agomodes/asm/ghash-s390x.pl: +15% performance improvement on z10.
Andy Polyakov [Sat, 1 Feb 2014 23:09:17 +0000 (00:09 +0100)]
modes/asm/ghash-s390x.pl: +15% performance improvement on z10.
(cherry picked from commit d162584b1154153d997fed18a9df2e60771fe06c)

6 years agoAdd AES-NI+SHA256 stitch registrations (from master).
Andy Polyakov [Sat, 1 Feb 2014 23:05:02 +0000 (00:05 +0100)]
Add AES-NI+SHA256 stitch registrations (from master).

6 years agodso/dso_win32.c: fix compiler warning.
Andy Polyakov [Tue, 18 Dec 2012 18:19:54 +0000 (18:19 +0000)]
dso/dso_win32.c: fix compiler warning.
(cherry picked from commit 0a2d5003df1a9ecf801ac3b4a5cb7dda85449315)

6 years agocrypto/cryptlib.c: remove stdio dependency (update from master).
Andy Polyakov [Sat, 1 Feb 2014 22:27:49 +0000 (23:27 +0100)]
crypto/cryptlib.c: remove stdio dependency (update from master).

6 years agocamellia/asm/cmll-x86_64.pl: fix symptomless bugs (update from master).
Andy Polyakov [Sat, 1 Feb 2014 22:14:33 +0000 (23:14 +0100)]
camellia/asm/cmll-x86_64.pl: fix symptomless bugs (update from master).

6 years agoRemove redundant accessor (you can do the same thing, and more, with
Ben Laurie [Sat, 1 Feb 2014 21:53:09 +0000 (21:53 +0000)]
Remove redundant accessor (you can do the same thing, and more, with
X509_ALGOR_[gs]et0()).

6 years agoutil/pl/VC-32.pl fix typo.
Andy Polyakov [Tue, 18 Dec 2012 18:07:20 +0000 (18:07 +0000)]
util/pl/VC-32.pl fix typo.
(cherry picked from commit fb0a520897778ebeebe9aaaf116f207a838ebb3f)

6 years agoutil/pl/VC-32.pl: refresh, switch to ws2, add crypt32, fix typo (based on
Andy Polyakov [Tue, 18 Dec 2012 09:42:31 +0000 (09:42 +0000)]
util/pl/VC-32.pl: refresh, switch to ws2, add crypt32, fix typo (based on
suggestions from Pierre Delaage).
(cherry picked from commit 668bcfd5ca237fdf6fbef1ab463697a4a48caf39)

Resolved conflicts:

util/pl/VC-32.pl

6 years agoImprove WINCE support.
Andy Polyakov [Sat, 19 Jan 2013 20:23:13 +0000 (21:23 +0100)]
Improve WINCE support.

Submitted by: Pierre Delaage
(cherry picked from commit a006fef78e56b078549a80f4bb4518b6a02eba84)

Resolved conflicts:

crypto/bio/bss_dgram.c
ssl/d1_lib.c
util/pl/VC-32.pl

6 years agob_sock.c: make getsockopt work in cases when optlen is 64-bit value.
Andy Polyakov [Mon, 11 Jun 2012 08:52:11 +0000 (08:52 +0000)]
b_sock.c: make getsockopt work in cases when optlen is 64-bit value.
(cherry picked from commit 80c42f3e0c34451dd7cfc65e07bc639759ef07d2)

6 years agowp-mmx.pl: ~10% performance improvement.
Andy Polyakov [Sun, 15 Jul 2012 13:29:23 +0000 (13:29 +0000)]
wp-mmx.pl: ~10% performance improvement.
(cherry picked from commit ae007d4d09f2ed9940c6e581bab9290d78615506)

6 years agowp-x86_64.pl: ~10% performance improvement.
Andy Polyakov [Sun, 15 Jul 2012 13:37:35 +0000 (13:37 +0000)]
wp-x86_64.pl: ~10% performance improvement.
(cherry picked from commit 701d593f7095db84459c76265349a83d30a4cae5)

6 years agosha512-ia64.pl: 15-20% performance improvement.
Andy Polyakov [Sun, 15 Jul 2012 13:36:25 +0000 (13:36 +0000)]
sha512-ia64.pl: 15-20% performance improvement.
(cherry picked from commit 46a2b3387a3feb044527a58a89555029c809190d)

6 years agoobjxref.pl: improve portability.
Andy Polyakov [Sun, 22 Apr 2012 21:18:30 +0000 (21:18 +0000)]
objxref.pl: improve portability.
(cherry picked from commit 71fa3bc5ece9121d1aa9bb513b5641e9ea605e14)

6 years agoAdd volatile qualifications to two blocks of inline asm to stop GCC from
Adam Langley [Mon, 3 Jun 2013 19:45:11 +0000 (15:45 -0400)]
Add volatile qualifications to two blocks of inline asm to stop GCC from
eliminating them as dead code.

Both volatile and "memory" are used because of some concern that the compiler
may still cache values across the asm block without it, and because this was
such a painful debugging session that I wanted to ensure that it's never
repeated.
(cherry picked from commit 7753a3a68431aa81b82beea4c3f5374b41454679)

6 years agoPPC assembly pack: ppc64-mont update from master.
Andy Polyakov [Sat, 1 Feb 2014 20:51:51 +0000 (21:51 +0100)]
PPC assembly pack: ppc64-mont update from master.

6 years agoPPC assembly pack: jumbo update from master.
Andy Polyakov [Sat, 1 Feb 2014 20:48:31 +0000 (21:48 +0100)]
PPC assembly pack: jumbo update from master.

Add Vector Permutation AES and little-endian support.

6 years agocrypto/aes/asm/aesni-x86[_64].pl: jumbo update from master.
Andy Polyakov [Sat, 1 Feb 2014 20:27:46 +0000 (21:27 +0100)]
crypto/aes/asm/aesni-x86[_64].pl: jumbo update from 

6 years agocrypto/sha/asm/sha1-x86_64.pl: jumbo update from master.
Andy Polyakov [Sat, 1 Feb 2014 20:24:55 +0000 (21:24 +0100)]
crypto/sha/asm/sha1-x86_64.pl: jumbo update from 

6 years agoAdd more accessors.
Ben Laurie [Sat, 1 Feb 2014 18:29:26 +0000 (18:29 +0000)]
Add more accessors.

6 years agoAdd accessor for x509.cert_info.
Ben Laurie [Sat, 1 Feb 2014 17:52:26 +0000 (17:52 +0000)]
Add accessor for x509.cert_info.

6 years agoFix warning.
Ben Laurie [Wed, 29 Jan 2014 16:57:32 +0000 (17:57 +0100)]
Fix warning.

6 years agoClarify docs.
Dr. Stephen Henson [Wed, 29 Jan 2014 00:59:35 +0000 (00:59 +0000)]
Clarify docs.

Remove reference to ERR_TXT_MALLOCED in the error library as that is
only used internally. Indicate that returned error data must not be
freed.

6 years agotypo
Dr. Stephen Henson [Tue, 28 Jan 2014 15:35:16 +0000 (15:35 +0000)]
typo
(cherry picked from commit cb2182676bdf652070bc272a3896d957763a4324)

6 years agoFix demo comment: 0.9.9 never released.
Dr. Stephen Henson [Tue, 28 Jan 2014 15:15:26 +0000 (15:15 +0000)]
Fix demo comment: 0.9.9 never released.
(cherry picked from commit 717cc8589540b95122a652dee68e6a75b6262d93)

6 years agoCheck i before r[i].
Dr. Stephen Henson [Tue, 28 Jan 2014 15:10:27 +0000 (15:10 +0000)]
Check i before r[i].

PR#3244
(cherry picked from commit 9614d2c676ffe74ce0c919d9e5c0d622a011cbed)

6 years agoAdd loaded dynamic ENGINEs to list.
Dr. Stephen Henson [Tue, 28 Jan 2014 13:51:58 +0000 (13:51 +0000)]
Add loaded dynamic ENGINEs to list.

Always add a dynamically loaded ENGINE to list. Otherwise it can cause
problems when multiply loaded, especially if it adds new public key methods.
For all current engines we only want a single implementation anyway.
(cherry picked from commit e933f91f50108a43c0198cdc63ecdfdbc77b4d0d)

6 years agoCertificate callback doc.
Dr. Stephen Henson [Sat, 25 Jan 2014 23:20:34 +0000 (23:20 +0000)]
Certificate callback doc.
(cherry picked from commit 46ab9bbd7fa610d775fe645dd0fe6d509c8dff3a)

6 years agomake update
Dr. Stephen Henson [Mon, 27 Jan 2014 14:59:46 +0000 (14:59 +0000)]
make update

6 years agoAdd cert callback retry test.
Dr. Stephen Henson [Sun, 26 Jan 2014 00:51:09 +0000 (00:51 +0000)]
Add cert callback retry test.
(cherry picked from commit 3323314fc1c6d18e650a2de97f7cf9892ac92a60)

6 years agoSupport retries in certificate callback
Dr. Stephen Henson [Sat, 25 Jan 2014 13:31:07 +0000 (13:31 +0000)]
Support retries in certificate callback
(cherry picked from commit 0ebc965b9ca4352e407bb7cfa65ac235942117f6)

Conflicts:

ssl/s3_srvr.c
ssl/ssl3.h

6 years agoCompare encodings in X509_cmp as well as hash.
Dr. Stephen Henson [Sun, 26 Jan 2014 16:28:27 +0000 (16:28 +0000)]
Compare encodings in X509_cmp as well as hash.
(cherry picked from commit ec492c8a5a1491949166c4b37df8666741180f4d)

6 years agoNew function to set compression methods so they can be safely freed.
Dr. Stephen Henson [Mon, 27 Jan 2014 14:30:29 +0000 (14:30 +0000)]
New function to set compression methods so they can be safely freed.
(cherry picked from commit cbb67448277232c8403f96edad4931c4203e7746)

6 years agoAdd -engine_impl option to dgst which will use an implementation of
Dr. Stephen Henson [Fri, 5 Mar 2010 13:28:21 +0000 (13:28 +0000)]
Add -engine_impl option to dgst which will use an implementation of
an algorithm from the supplied engine instead of just the default one.
(cherry picked from commit bb845ee044587a91589357a772a02cffb0ba4454)

6 years agomake update
Dr. Stephen Henson [Thu, 23 Jan 2014 17:13:37 +0000 (17:13 +0000)]
make update

6 years agoAdd new function SSL_CTX_get_ssl_method().
Dr. Stephen Henson [Thu, 16 Jan 2014 14:06:19 +0000 (14:06 +0000)]
Add new function SSL_CTX_get_ssl_method().

Partial fix for PR#3183.
(cherry picked from commit ba168244a14bbd056e502d7daa04cae4aabe9d0d)

6 years agoOmit initial status request callback check.
Kaspar Brand [Thu, 16 Jan 2014 13:46:31 +0000 (13:46 +0000)]
Omit initial status request callback check.

PR#3178
(cherry picked from commit d0b039d4a3a19b106cc2cb938125b86aca4974aa)

6 years agoVMS fixes
Zoltan Arpadffy [Sat, 11 Jan 2014 22:44:04 +0000 (22:44 +0000)]
VMS fixes

6 years agotypo
Jeff Trawick [Fri, 10 Jan 2014 23:00:50 +0000 (23:00 +0000)]
typo
(cherry picked from commit 5edce5685f26c1bb7854d4cdf291b9604fcc5dbf)

6 years agotypo
Jeff Trawick [Fri, 10 Jan 2014 23:01:30 +0000 (23:01 +0000)]
typo
(cherry picked from commit 4b64e0cbdb563e13a6f7cd8631b31532c04f1234)

6 years agoFix bug in X509_V_FLAG_IGNORE_CRITICAL CRL handling.
Dr. Stephen Henson [Thu, 9 Jan 2014 22:47:22 +0000 (22:47 +0000)]
Fix bug in X509_V_FLAG_IGNORE_CRITICAL CRL handling.
(cherry picked from commit 8f4077ca69076cebaca51b7b666db1ed49e46b9e)

6 years agoupdate NEWS
Dr. Stephen Henson [Tue, 7 Jan 2014 15:44:09 +0000 (15:44 +0000)]
update NEWS

6 years agobn/asm/x86_64-mont5.pl: fix compilation error on Solaris.
Andy Polyakov [Thu, 9 Jan 2014 12:44:59 +0000 (13:44 +0100)]
bn/asm/x86_64-mont5.pl: fix compilation error on Solaris.
(cherry picked from commit eedab5241e32f9f185cfee23a0c67264d3e3ecf2)

6 years agoSync CHANGES
Dr. Stephen Henson [Tue, 7 Jan 2014 15:38:15 +0000 (15:38 +0000)]
Sync CHANGES

6 years agoAdd fix for CVE-2013-4353
Dr. Stephen Henson [Tue, 7 Jan 2014 15:37:35 +0000 (15:37 +0000)]
Add fix for CVE-2013-4353

6 years agoUpdate NEWS.
Dr. Stephen Henson [Tue, 7 Jan 2014 15:26:19 +0000 (15:26 +0000)]
Update NEWS.

6 years agosha/asm/sha256-armv4.pl: add NEON code path.
Andy Polyakov [Sat, 4 Jan 2014 17:04:53 +0000 (18:04 +0100)]
sha/asm/sha256-armv4.pl: add NEON code path.
(and shave off cycle even from integer-only code)
(cherry picked from commit ad0d2579cf3a293a35a5b606afc5a97c71cf6ca7)

6 years agoaesni-sha1-x86_64.pl: harmonize [Atom-specific optimizations] with master branch.
Andy Polyakov [Sat, 4 Jan 2014 16:40:13 +0000 (17:40 +0100)]
aesni-sha1-x86_64.pl: harmonize [Atom-specific optimizations] with master branch.

6 years agoRestore SSL_OP_MSIE_SSLV2_RSA_PADDING
Dr. Stephen Henson [Sat, 4 Jan 2014 13:50:52 +0000 (13:50 +0000)]
Restore SSL_OP_MSIE_SSLV2_RSA_PADDING

The flag SSL_OP_MSIE_SSLV2_RSA_PADDING hasn't done anything since OpenSSL
0.9.7h but deleting it will break source compatibility with any software
that references it. Restore it but #define to zero.

6 years agoUse algorithm specific chains for certificates.
Dr. Stephen Henson [Fri, 3 Jan 2014 22:38:03 +0000 (22:38 +0000)]
Use algorithm specific chains for certificates.

Fix a limitation in SSL_CTX_use_certificate_chain_file(): use algorithm
specific chains instead of the shared chain.

Update docs.
(cherry picked from commit a4339ea3ba045b7da038148f0d48ce25f2996971)

Conflicts:

CHANGES

6 years agossl/t1_enc.c: optimize PRF (suggested by Intel).
Andy Polyakov [Fri, 3 Jan 2014 20:52:49 +0000 (21:52 +0100)]
ssl/t1_enc.c: optimize PRF (suggested by Intel).
(cherry picked from commit e8b0dd57c0e9c53fd0708f0f458a7a2fd7a95c91)

6 years agoupdate NEWS
Dr. Stephen Henson [Thu, 2 Jan 2014 19:12:47 +0000 (19:12 +0000)]
update NEWS

6 years agoDon't change version number if session established
Dr. Stephen Henson [Tue, 24 Dec 2013 18:17:00 +0000 (18:17 +0000)]
Don't change version number if session established

When sending an invalid version number alert don't change the
version number to the client version if a session is already
established.

Thanks to Marek Majkowski for additional analysis of this issue.

PR#3191
(cherry picked from commit b77b58a398c8b9b4113f3fb6b48e162a3b8d4527)

6 years agoUpdate curve list size.
Dr. Stephen Henson [Tue, 24 Dec 2013 18:15:28 +0000 (18:15 +0000)]
Update curve list size.

6 years agosparcv9cap.c: omit random detection.
Andy Polyakov [Sat, 28 Dec 2013 12:31:14 +0000 (13:31 +0100)]
sparcv9cap.c: omit random detection.

PR: 3202
(cherry picked from commit 926725b3d7c1528f2dc116a48623c42264188277)

6 years agoARM assembly pack: make it work with older toolchain.
Andy Polyakov [Sat, 28 Dec 2013 11:17:08 +0000 (12:17 +0100)]
ARM assembly pack: make it work with older toolchain.
(cherry picked from commit 2218c296b4981af6f2639bbd7eabfb89437fe776)

6 years agoFix DTLS retransmission from previous session.
Dr. Stephen Henson [Fri, 20 Dec 2013 15:26:50 +0000 (15:26 +0000)]
Fix DTLS retransmission from previous session.

For DTLS we might need to retransmit messages from the previous session
so keep a copy of write context in DTLS retransmission buffers instead
of replacing it after sending CCS. CVE-2013-6450.
(cherry picked from commit 34628967f1e65dc8f34e000f0f5518e21afbfc7b)

6 years agoIgnore NULL parameter in EVP_MD_CTX_destroy.
Dr. Stephen Henson [Fri, 20 Dec 2013 15:12:26 +0000 (15:12 +0000)]
Ignore NULL parameter in EVP_MD_CTX_destroy.
(cherry picked from commit a6c62f0c25a756c263a80ce52afbae888028e986)

6 years agosha1-x86_64.pl: harmonize Win64 SE handlers for SIMD code pathes.
Andy Polyakov [Wed, 18 Dec 2013 21:12:08 +0000 (22:12 +0100)]
sha1-x86_64.pl: harmonize Win64 SE handlers for SIMD code pathes.
(and ensure stack alignment in the process)
(cherry picked from commit fc0503a25cd638b93f7af04640c20042e0329b3b)

6 years agoevp/e_[aes|camellia].c: fix typo in CBC subroutine.
Andy Polyakov [Wed, 18 Dec 2013 20:42:46 +0000 (21:42 +0100)]
evp/e_[aes|camellia].c: fix typo in CBC subroutine.

It worked because it was never called.
(cherry picked from commit e9c80e04c1a3b5a0de8e666155ab4ecb2697a77d)

6 years agosha512.c: fullfull implicit API contract in SHA512_Transform.
Andy Polyakov [Wed, 18 Dec 2013 20:27:35 +0000 (21:27 +0100)]
sha512.c: fullfull implicit API contract in SHA512_Transform.

SHA512_Transform was initially added rather as tribute to tradition
than for practucal reasons. But use was recently found in ssl/s3_cbc.c
and it turned to be problematic on platforms that don't tolerate
misasligned references to memory and lack assembly subroutine.
(cherry picked from commit cdd1acd788020d2c525331da1712ada778f1373c)

6 years agoCheck EVP errors for handshake digests.
Dr. Stephen Henson [Sat, 14 Dec 2013 13:55:48 +0000 (13:55 +0000)]
Check EVP errors for handshake digests.

Partial mitigation of PR#3200
(cherry picked from commit 0294b2be5f4c11e60620c0018674ff0e17b14238)

6 years agoverify parameter enumeration functions
Dr. Stephen Henson [Thu, 25 Feb 2010 00:08:23 +0000 (00:08 +0000)]
verify parameter enumeration functions
(cherry picked from commit 9b3d75706ef0114362f04665a3c745bfef59d023)

Conflicts:

crypto/x509/x509_vpm.c

6 years agoAdd opaque ID structure.
Dr. Stephen Henson [Wed, 11 Dec 2013 14:28:57 +0000 (14:28 +0000)]
Add opaque ID structure.

Move the IP, email and host checking fields from the public
X509_VERIFY_PARAM structure into an opaque X509_VERIFY_PARAM_ID
structure. By doing this the structure can be modified in future
without risk of breaking any applications.

6 years agoBackport TLS padding extension from master.
Dr. Stephen Henson [Fri, 13 Dec 2013 14:41:32 +0000 (14:41 +0000)]
Backport TLS padding extension from master.

6 years agoFix for partial chain notification.
Dr. Stephen Henson [Fri, 13 Dec 2013 14:05:32 +0000 (14:05 +0000)]
Fix for partial chain notification.

For consistency with other cases if we are performing
partial chain verification with just one certificate
notify the callback with ok==1.

6 years agoVerify parameter retrieval functions.
Dr. Stephen Henson [Fri, 13 Dec 2013 13:59:53 +0000 (13:59 +0000)]
Verify parameter retrieval functions.

New functions to retrieve internal pointers to X509_VERIFY_PARAM
for SSL_CTX and SSL structures.

6 years agoDon't use rdrand engine as default unless explicitly requested.
Dr. Stephen Henson [Wed, 11 Dec 2013 14:45:12 +0000 (14:45 +0000)]
Don't use rdrand engine as default unless explicitly requested.

6 years agoGet FIPS checking logic right.
Dr. Stephen Henson [Tue, 10 Dec 2013 12:52:27 +0000 (12:52 +0000)]
Get FIPS checking logic right.

We need to lock when *not* in FIPS mode.

6 years agoremove obsolete STATUS file
Dr. Stephen Henson [Tue, 10 Dec 2013 00:10:41 +0000 (00:10 +0000)]
remove obsolete STATUS file

6 years agoAdd release dates to NEWS
Dr. Stephen Henson [Tue, 10 Dec 2013 00:01:42 +0000 (00:01 +0000)]
Add release dates to NEWS

6 years agoARM assembly pack: SHA update from master.
Andy Polyakov [Mon, 9 Dec 2013 22:53:42 +0000 (23:53 +0100)]
ARM assembly pack: SHA update from master.

6 years agoARM assembly pack: AES update from master (including bit-sliced module).
Andy Polyakov [Mon, 9 Dec 2013 22:44:45 +0000 (23:44 +0100)]
ARM assembly pack: AES update from master (including bit-sliced module).

6 years agobn/asm/armv4-mont.pl: add NEON code path.
Andy Polyakov [Wed, 4 Dec 2013 21:37:49 +0000 (22:37 +0100)]
bn/asm/armv4-mont.pl: add NEON code path.
(cherry picked from commit d1671f4f1a39d938499c67efe5d4a14c34c09b31)

6 years agocrypto/bn/asm/x86_64-mont*.pl: update from master.
Andy Polyakov [Mon, 9 Dec 2013 21:40:53 +0000 (22:40 +0100)]
crypto/bn/asm/x86_64-mont*.pl: update from master.

Add MULX/AD*X code paths and optimize even original code path.

6 years agox86_64-xlate.pl: fix jrcxz in nasm case.
Andy Polyakov [Wed, 2 Oct 2013 22:26:09 +0000 (00:26 +0200)]
x86_64-xlate.pl: fix jrcxz in nasm case.
(cherry picked from commit 667053a2f3ad0788586f629f618d07b783bdde31)

6 years agox86_64-xlate.pl: minor update.
Andy Polyakov [Mon, 9 Dec 2013 20:23:19 +0000 (21:23 +0100)]
x86_64-xlate.pl: minor update.
(cherry picked from commit 41965a84c4bc0f6694fd17203920a6672e3fac7b)

6 years agoupdate $default_depflags
Dr. Stephen Henson [Sun, 8 Dec 2013 13:19:17 +0000 (13:19 +0000)]
update $default_depflags

6 years agoAvoid multiple locks in FIPS mode.
Dr. Stephen Henson [Wed, 4 Dec 2013 13:39:04 +0000 (13:39 +0000)]
Avoid multiple locks in FIPS mode.

PR: 3176.

In FIPS mode ssleay_rand_bytes is only used for PRNG seeding and is
performed in either a single threaded context (when the PRNG is first
initialised) or under a lock (reseeding). To avoid multiple locks disable
use of CRYPTO_LOCK_RAND in FIPS mode in ssleay_rand_bytes.

6 years agobn/asm/x86_64-mont5.pl: comply with Win64 ABI.
Andy Polyakov [Tue, 3 Dec 2013 22:59:55 +0000 (23:59 +0100)]
bn/asm/x86_64-mont5.pl: comply with Win64 ABI.

PR: 3189
Submitted by: Oscar Ciurana
(cherry picked from commit c5d5f5bd0fe8b2313bec844c0f80f3d49562bfa8)

6 years agocrypto/bn/asm/rsaz-x86_64.pl: make it work on Win64.
Andy Polyakov [Tue, 3 Dec 2013 21:28:48 +0000 (22:28 +0100)]
crypto/bn/asm/rsaz-x86_64.pl: make it work on Win64.
(cherry picked from commit 8bd7ca99961f341ce2070373e86f22505aed2b2a)

6 years agocrypto/bn/rsaz*: fix licensing note.
Andy Polyakov [Tue, 3 Dec 2013 21:05:17 +0000 (22:05 +0100)]
crypto/bn/rsaz*: fix licensing note.

rsaz_exp.c: harmonize line terminating;
asm/rsaz-*.pl: minor optimizations.
asm/rsaz-x86_64.pl: sync from master.
(cherry picked from commit 31ed9a21315c571db443c68e4f618ecb51c631f9)

6 years agobn/asm/rsaz-x86_64.pl: fix prototype.
Andy Polyakov [Tue, 3 Dec 2013 08:43:06 +0000 (09:43 +0100)]
bn/asm/rsaz-x86_64.pl: fix prototype.
(cherry picked from commit 6efef384c6f649399dcc837825a9ca5a37069733)

6 years agoFix warning.
Dr. Stephen Henson [Sun, 1 Dec 2013 23:30:21 +0000 (23:30 +0000)]
Fix warning.

6 years agoChange header order to pick up OPENSSL_SYS_WIN32
Dr. Stephen Henson [Sun, 1 Dec 2013 23:29:40 +0000 (23:29 +0000)]
Change header order to pick up OPENSSL_SYS_WIN32

6 years agoRecongnise no-dane and no-libunbound
Dr. Stephen Henson [Sun, 1 Dec 2013 23:12:27 +0000 (23:12 +0000)]
Recongnise no-dane and no-libunbound

6 years agomake update
Dr. Stephen Henson [Sun, 1 Dec 2013 23:09:44 +0000 (23:09 +0000)]
make update

6 years agoFix warnings.
Dr. Stephen Henson [Sun, 1 Dec 2013 23:08:13 +0000 (23:08 +0000)]
Fix warnings.

6 years agoWIN32 fixes.
Dr. Stephen Henson [Sun, 1 Dec 2013 23:07:18 +0000 (23:07 +0000)]
WIN32 fixes.

6 years agoRSAX no longer compiled.
Dr. Stephen Henson [Sun, 1 Dec 2013 23:06:33 +0000 (23:06 +0000)]
RSAX no longer compiled.

6 years agoSimplify and update openssl.spec
Dr. Stephen Henson [Wed, 27 Nov 2013 15:35:02 +0000 (15:35 +0000)]
Simplify and update openssl.spec

6 years agoNew functions to retrieve certificate from SSL_CTX
Dr. Stephen Henson [Mon, 18 Nov 2013 18:49:46 +0000 (18:49 +0000)]
New functions to retrieve certificate from SSL_CTX

New functions to retrieve current certificate or private key
from an SSL_CTX.

Constify SSL_get_private_key().
(cherry picked from commit a25f9adc778e17568fe2a325e5c3606adb8329f1)

6 years agoDon't define SSL_select_next_proto if OPENSSL_NO_TLSEXT set
Dr. Stephen Henson [Mon, 18 Nov 2013 16:52:10 +0000 (16:52 +0000)]
Don't define SSL_select_next_proto if OPENSSL_NO_TLSEXT set
(cherry picked from commit 60aeb18750382362ec1c4e1cf05a7222c99ec886)

6 years agoUse correct header length in ssl3_send_certifcate_request
Dr. Stephen Henson [Sun, 17 Nov 2013 17:48:18 +0000 (17:48 +0000)]
Use correct header length in ssl3_send_certifcate_request
(cherry picked from commit fdeaf55bf95e1e2a1e70cca8b68c7d8bbef7c8f0)