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

864 commits

Author SHA1 Message Date
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
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
Dr. Stephen Henson
e24b01cc6f Have EC_NISTP224_64_GCC_128 treated like any algorithm, and have disabled by 
default. If we don't do it this way, it screws up libeay.num.
(update from HEAD, original from levitte).
 2011-05-12 13:10:27 +00:00
Dr. Stephen Henson
d7fc9ffc51 Update ordinals. 2011-05-11 23:03:06 +00:00
Richard Levitte
9f427a52cb make update (1.0.1-stable) 
This meant a slight renumbering in util/libeay.num due to symbols
appearing in 1.0.0-stable.  However, since there's been no release on
this branch yet, it should be harmless.
 2011-03-23 00:06:04 +00:00
Richard Levitte
5a39d3a838 * util/mkdef.pl: Add crypto/o_str.h and crypto/o_time.h. Maybe some 
more need to be added...
 2011-03-22 23:54:15 +00:00
Richard Levitte
01d2e27a2b Apply all the changes submitted by Steven M. Schweda <sms@antinode.info> 2011-03-19 09:47:47 +00:00
Ben Laurie
a149b2466e Add SRP. 2011-03-16 11:26:40 +00:00
Bodo Möller
8c93c4dd42 OCSP stapling fix (OpenSSL 0.9.8r/1.0.0d) 
Submitted by: Neel Mehta, Adam Langley, Bodo Moeller
 2011-02-08 17:48:41 +00:00
Dr. Stephen Henson
decef971f4 add -stripcr option to copy.pl from 0.9.8 2011-02-03 14:58:02 +00:00
Bodo Möller
a288aaefc4 Assorted bugfixes: 
- safestack macro changes for C++ were incomplete
- RLE decompression boundary case
- SSL 2.0 key arg length check

Submitted by: Google (Adam Langley, Neel Mehta, Bodo Moeller)
 2011-02-03 12:03:57 +00:00
Dr. Stephen Henson
dfda027ae8 ignore leading null fields 2010-12-03 19:31:23 +00:00
Andy Polyakov
e011160f3c VC-32.pl: default to nasm if neither nasm or nasmw is is found at the moment [from HEAD]. 
PR: 2338
 2010-09-13 16:29:00 +00:00
Dr. Stephen Henson
e50e5f9336 make no-gost work on Windows 2010-09-02 17:23:58 +00:00
Dr. Stephen Henson
3081e2ca73 update ordinals 2010-08-26 14:25:53 +00:00
Andy Polyakov
308b9ad8f0 util/cygwin.sh: maintainer's update [from HEAD]. 
Submitted by: Corinna Vinschen
 2010-08-24 21:52:15 +00:00
Dr. Stephen Henson
528ff4b451 Add modes.h to mkdef.pl, update ordinals. 2010-07-25 17:48:35 +00:00
Dr. Stephen Henson
f6c29ba3dc Fix WIN32 build system to correctly link ENGINE DLLs contained in a 
directory: currently the GOST ENGINE is the only case.
 2010-07-24 17:55:47 +00:00
Andy Polyakov
9728978b75 VC-32.pl: unconditionally generate symbols.pdb [from HEAD]. 2010-06-01 06:03:20 +00:00
Dr. Stephen Henson
8c00014d7e make update 2010-04-13 17:08:50 +00:00
Richard Levitte
dc9461e23f A few more things that aren't built on VAX 2010-04-13 14:39:08 +00:00
Dr. Stephen Henson
5b0a79a27a PR: 2220 
Fixes to make OpenSSL compile with no-rc4
 2010-04-06 11:18:32 +00:00
Dr. Stephen Henson
9caf25d144 PR: 1904 
Submitted by: David Woodhouse <dwmw2@infradead.org>

Pass passphrase minimum length down to UI.
 2010-03-27 19:27:51 +00:00
Dr. Stephen Henson
724cca4178 make update 2010-03-09 17:23:51 +00:00
Dr. Stephen Henson
008fa4584d update year 2010-02-09 14:13:00 +00:00
Dr. Stephen Henson
961f1dea06 make update 2010-02-07 13:47:08 +00:00