wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11165 commits 20 branches 302 tags 153 MiB
Commit graph

819 commits

Author SHA1 Message Date
Dr. Stephen Henson
789b12599d Add conditional unit testing interface. 
Don't call internal functions directly call them through
SSL_test_functions(). This also makes unit testing work on
Windows and platforms that don't export internal functions
from shared libraries.

By default unit testing is not enabled: it requires the compile
time option "enable-unit-test".
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit e0fc7961c4)

Conflicts:

	ssl/heartbeat_test.c
	ssl/ssl.h
	util/mkdef.pl
 2014-07-24 19:42:26 +01:00
Dr. Stephen Henson
f284fc7cc3 Add test header to Makefile, update ordinals 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2014-07-20 20:50:38 +01:00
Viktor Dukhovni
7f7e11ee5c Implement sk_deep_copy. 
(cherry picked from commit 66d884f067)
 2014-07-07 19:19:13 +10:00
Dr. Stephen Henson
fa7a0efbac make update 2014-06-12 10:52:49 +01:00
Dr. Stephen Henson
3fe8f005b0 Fix Windows build. 2014-06-12 10:52:49 +01:00
Dr. Stephen Henson
e3beef1e1b Remove experimental DANE code. 
Remove experimental DANE/dnssec code: not ready for use in an
official release yet.
 2014-06-10 14:59:10 +01:00
Ben Laurie
3435ef467f Only copy opensslconf.h at init time. 2014-05-24 15:48:24 +01:00
Geoff Thorpe
c434f7f80f util/mkerr.pl: fix perl warning 
Gets rid of this;

defined(@array) is deprecated at ../util/mkerr.pl line 792.
        (Maybe you should just omit the defined()?)
defined(@array) is deprecated at ../util/mkerr.pl line 800.
        (Maybe you should just omit the defined()?)

Signed-off-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit 647f360e2e)
 2014-04-30 11:52:08 -04:00
Dr. Stephen Henson
8b0336c810 Update ordinals. 
Use a previously unused value as we will be updating multiple released
branches.
(cherry picked from commit 0737acd2a8)
 2014-03-12 14:41:52 +00:00
Dr. Stephen Henson
8394109c89 Add new VMS hack symbol, update ordinals. 2014-03-02 13:50:06 +00:00
Andy Polyakov
c3006e0f5a util/pl/VC-32.pl: harmonize with 1.0.1 and fix typo. 2014-02-25 13:41:40 +01:00
Dr. Stephen Henson
ab03ead035 we need /MD for fips builds 2014-02-24 18:21:35 +00:00
Andy Polyakov
aedabeee3a BC-32.pl: refresh Borland C support. 
PR: 3251
Suggested by: Thorsten Schöning
(cherry picked from commit 779c51c644)
 2014-02-24 16:45:15 +01:00
Dr. Stephen Henson
7743be3aac make update 2014-02-20 22:57:24 +00:00
Dr. Stephen Henson
3ecce3dbeb Don't use getcwd in non-copy builds. 
(cherry picked from commit f3a3903260)
 2014-02-15 20:17:59 +00:00
Dr. Stephen Henson
71eca86c30 Don't override $srcd for non copy builds. 2014-02-15 20:16:13 +00:00
Dr. Stephen Henson
dd1e3bd8d4 recognise multiblock 2014-02-15 18:19:35 +00:00
Dr. Stephen Henson
c55fef76f7 Add /fixed flag for FIPS links where appropriate. 2014-02-15 17:16:19 +00:00
Dr. Stephen Henson
75917fac8e Make upate. 
Revert libssl ordinals to OpenSSL 1.0.1 values first to tidy up and
avoid entries for deleted functions.
 2014-02-09 19:59:54 +00:00
Ben Laurie
ed0dc93d89 Add new asm modules. 2014-02-09 12:18:16 +00:00
Dr. Stephen Henson
f407eec799 make update 2014-02-06 14:31:09 +00:00
Andy Polyakov
41235f30fb util/pl/VC-32.pl fix typo. 
(cherry picked from commit fb0a520897)
 2014-02-01 22:55:25 +01:00
Andy Polyakov
130c15ef5a util/pl/VC-32.pl: refresh, switch to ws2, add crypt32, fix typo (based on 
suggestions from Pierre Delaage).
(cherry picked from commit 668bcfd5ca)

Resolved conflicts:

	util/pl/VC-32.pl
 2014-02-01 22:53:24 +01:00
Andy Polyakov
2cc5142fb1 Improve WINCE support. 
Submitted by: Pierre Delaage
(cherry picked from commit a006fef78e)

Resolved conflicts:

	crypto/bio/bss_dgram.c
	ssl/d1_lib.c
	util/pl/VC-32.pl
 2014-02-01 22:48:56 +01:00
Dr. Stephen Henson
cee1d9e02f make update 2014-01-27 14:59:46 +00:00
Dr. Stephen Henson
3f4742b48c make update 2014-01-23 17:13:37 +00:00
Dr. Stephen Henson
81b6dfe40d Recongnise no-dane and no-libunbound 2013-12-01 23:12:27 +00:00
Dr. Stephen Henson
bc35b8e435 make update 2013-12-01 23:09:44 +00:00
Piotr Sikora
edc687ba0f Fix compilation with no-nextprotoneg. 
PR#3106
 2013-11-14 01:20:58 +00:00
Andy Polyakov
ca44f72938 Make Makefiles OSF-make-friendly. 
PR: 3165
(cherry picked from commit d1cf23ac86)
 2013-11-12 21:53:39 +01:00
Dr. Stephen Henson
03ee8c2ed7 Fix no-ssl-trace 2013-10-20 22:07:33 +01:00
Ben Laurie
6d7fa9c25c Support new rsaz asm stuff. 2013-07-31 16:37:19 +01:00
Trevor
e27711cfdd Trying cherrypick: 
Add support for arbitrary TLS extensions.

Contributed by Trevor Perrin.

Conflicts:

	CHANGES
	ssl/ssl.h
	ssl/ssltest.c
	test/testssl

Fix compilation due to #endif.

Cherrypicking more stuff.

Cleanup of custom extension stuff.

serverinfo rejects non-empty extensions.

Omit extension if no relevant serverinfo data.

Improve error-handling in serverinfo callback.

Cosmetic cleanups.

s_client documentation.

s_server documentation.

SSL_CTX_serverinfo documentation.

Cleaup -1 and NULL callback handling for custom extensions, add tests.

Cleanup ssl_rsa.c serverinfo code.

Whitespace cleanup.

Improve comments in ssl.h for serverinfo.

Whitespace.

Cosmetic cleanup.

Reject non-zero-len serverinfo extensions.

Whitespace.

Make it build.

Conflicts:

	test/testssl
 2013-07-03 11:53:30 +01:00
Ben Laurie
e887c4187e Backport single makefile from master. 2013-06-13 15:09:48 +01:00
Dr. Stephen Henson
c3466040ec Update ordinals. 2013-03-04 19:28:57 +00:00
Dr. Stephen Henson
73390e6ba5 Add ordinal for CRYPTO_memcmp: since this will affect multiple 
branches it needs to be in a "gap".
(cherry picked from commit 81ce0e14e7)
 2013-02-06 13:56:13 +00:00
Dr. Stephen Henson
46b11600b0 update ordinals 2012-12-29 14:18:14 +00:00
Dr. Stephen Henson
1166323530 Update ordinals. 2012-12-26 23:53:52 +00:00
Dr. Stephen Henson
44c970746f typo 2012-12-26 22:43:43 +00:00
Dr. Stephen Henson
bc200e691c SSL/TLS record tracing code (backport from HEAD). 2012-12-26 22:40:46 +00:00
Andy Polyakov
f8cab37bc1 VC-32.pl: fix typo [from HEAD]. 
Submitted by: Pierre Delaage
 2012-12-16 19:40:51 +00:00
Andy Polyakov
02620cfcd5 Cumulative updates from HEAD. 2012-10-29 22:29:29 +00:00
Dr. Stephen Henson
74daafaa94 use correct year automatically 2012-10-22 13:03:31 +00:00
Dr. Stephen Henson
74d89b0d93 PR: 2840 
Reported by: David McCullough <david_mccullough@mcafee.com>

Restore fips configuration module from 0.9.8.
 2012-07-03 20:20:11 +00:00
Dr. Stephen Henson
3a89e9f106 update year 2012-04-07 22:14:16 +00:00
Dr. Stephen Henson
79e75e04ea recognise DECLARE_PEM_write_const, update ordinals 
(backport from HEAD)
 2012-04-07 20:48:12 +00:00
Andy Polyakov
7e8b5493a4 util/cygwin.sh update [from HEAD]. 
PR: 2761
Submitted by: Corinna Vinschen
 2012-03-31 11:07:09 +00:00
Dr. Stephen Henson
424ba8b588 PR: 2708 
Submitted by: Bruce Stephens <bruce.stephens@isode.com>

Translate path separators correctly for $fipsdir in util/mk1mf.pl
 2012-02-12 23:20:21 +00:00
Dr. Stephen Henson
285d9189c7 PR: 2652 
Submitted by: Arpadffy Zoltan <Zoltan.Arpadffy@scientificgames.se>

OpenVMS fixes.
 2012-01-05 14:30:08 +00:00
Dr. Stephen Henson
03467ce6bd recognise HEARTBEATS in mkdef.pl script 2011-12-31 23:49:45 +00:00