Commit graph

788 commits

Author SHA1 Message Date
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
Dr. Stephen Henson
296aca9dcf fix deprecated statement 2011-12-27 14:36:57 +00:00
Dr. Stephen Henson
7bb4f8ff12 recognise no-sctp 2011-12-25 14:59:40 +00:00
Dr. Stephen Henson
7dd6407a4c update ordinals 2011-12-25 14:48:44 +00:00
Dr. Stephen Henson
53de315b78 recognise SCTP in mkdef.pl script 2011-12-25 14:47:46 +00:00
Dr. Stephen Henson
2d4c9ab518 delete unimplemented function from header file, update ordinals 2011-12-23 14:10:35 +00:00
Dr. Stephen Henson
50771f7ce3 update ordinals 2011-12-22 16:10:04 +00:00
Dr. Stephen Henson
2a6e3ef37e update ordinals 2011-11-22 14:45:27 +00:00
Dr. Stephen Henson
115d528c23 add cryptlib.h to mkdef.pl 2011-11-22 14:44:42 +00:00
Dr. Stephen Henson
7e0fd45ce3 update ordinals 2011-11-21 22:56:33 +00:00
Dr. Stephen Henson
b138ea54ee add strp.h to mkdef.pl headers 2011-11-21 22:55:12 +00:00
Dr. Stephen Henson
9c115a4acc recognise NEXTPROTONEG 2011-11-21 22:35:35 +00:00
Dr. Stephen Henson
6d5eb464c9 Recognise new ECC option (from HEAD). 2011-10-21 12:53:07 +00:00
Bodo Möller
67f8de9ab8 "make update" 2011-10-19 15:24:44 +00:00
Bodo Möller
3d520f7c2d Fix warnings.
Also, use the common Configure mechanism for enabling/disabling the 64-bit ECC code.
2011-10-19 08:58:35 +00:00
Dr. Stephen Henson
7e9cfcd0dc Recognise no-rsax option. 2011-10-15 13:22:26 +00:00
Dr. Stephen Henson
6b00cd746a Update ordinals. 2011-10-09 23:14:20 +00:00
Dr. Stephen Henson
38e408076e Update ordinals. 2011-10-09 15:28:52 +00:00
Dr. Stephen Henson
064a6176ac Update ordinals. 2011-08-26 10:45:17 +00:00
Dr. Stephen Henson
7ca035db88 Update ordinals. 2011-07-08 12:12:30 +00:00
Dr. Stephen Henson
45bf825066 Set FIPSLINK correctly now trailing slash is removed from FIPSDIR. 2011-06-18 19:35:03 +00:00
Dr. Stephen Henson
4a18d5c89b Don't add trailing slash to FIPSDIR: it causes problems with Windows builds. 2011-06-18 19:02:12 +00:00
Dr. Stephen Henson
174b26c497 Preliminary WIN32 support for FIPS capable OpenSSL building. 2011-06-17 12:50:40 +00:00
Dr. Stephen Henson
907cd7217e update ordinals 2011-06-10 17:17:55 +00:00
Dr. Stephen Henson
b8d78a5520 add cmac to Windows build, update ordinals 2011-06-10 14:12:55 +00:00
Dr. Stephen Henson
b4baca9261 Recognise "fips" in mkdef.pl script. 2011-06-06 15:46:25 +00:00
Dr. Stephen Henson
f610a516a0 Backport from HEAD:
New option to disable characteristic two fields in EC code.

Make no-ec2m work on Win32 build.
2011-06-06 11:49:36 +00:00
Dr. Stephen Henson
1a5538251f update date 2011-05-19 17:56:12 +00:00
Dr. Stephen Henson
c6ead3cdd3 Recognise and ignore no-ec-nistp224-64-gcc-128 (from HEAD). 2011-05-13 12:46:12 +00:00
Dr. Stephen Henson
2d53648ce7 typo 2011-05-13 12:44:37 +00:00
Dr. Stephen Henson
64ca6ac26b Recognise NO_NISTP224-64-GCC-128 2011-05-13 12:38:02 +00:00
Dr. Stephen Henson
6a6b0c8b51 Add SSL_INTERN definition. 2011-05-12 13:12:49 +00:00