generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,288 Commits 16 Branches 258 Tags
Commit Graph

768 Commits

Author SHA1 Message Date
Richard Levitte
079495cad2 Have mkerr.pl treat already existing multiline string defs properly 
Since source reformat, we ended up with some error reason string
definitions that spanned two lines.  That in itself is fine, but we
sometimes edited them to provide better strings than what could be
automatically determined from the reason macro, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "Peer haven't sent GOST certificate, required for selected ciphersuite"},

However, mkerr.pl didn't treat those two-line definitions right, and
they ended up being retranslated to whatever the macro name would
indicate, for example:

    {ERR_REASON(SSL_R_NO_GOST_CERTIFICATE_SENT_BY_PEER),
     "No gost certificate sent by peer"},

Clearly not what we wanted.  This change fixes this problem.

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 2cfdfe0918f03f8323c9523a2beb2b363ae86ca7)
 2015-05-23 13:17:58 +02:00
StudioEtrange
ea04412c13 GitHub284: Fix typo in xx-32.pl scripts. 
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
 2015-05-20 04:36:44 -04:00
Dr. Stephen Henson
765e2465ca update ordinals 
Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-03-09 16:40:22 +00:00
Matt Caswell
09712fd0e3 Update mkerr.pl for new format 
Make the output from mkerr.pl consistent with the newly reformatted code.

Reviewed-by: Richard Levitte <levitte@openssl.org>
 2015-03-06 14:09:49 +00:00
Dr. Stephen Henson
42ad0100f1 Fix format script. 
The format script didn't correctly recognise some ASN.1 macros and
didn't reformat some files as a result. Fix script and reformat
affected files.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 437b14b533fe7f7408e3ebca6d5569f1d3347b1a)
 2015-03-02 13:43:40 +00:00
Dr. Stephen Henson
7b0ec6a4af Delete trailing whitespace from output. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:40 +00:00
Dr. Stephen Henson
e5ebff7b6a Add -d debug option to save preprocessed files. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:35 +00:00
Dr. Stephen Henson
9c392088de Test option -nc 
Add option -nc which sets COMMENTS=true but disables all indent comment
reformatting options.

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:30 +00:00
Matt Caswell
a75d7245e5 Add ecp_nistz256.c to list of files skipped by openssl-format-source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:25 +00:00
Matt Caswell
b10a8451e3 Manually reformat aes_x86core.c and add it to the list of files skipped by 
openssl-format-source

Conflicts:
	crypto/aes/aes_x86core.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:45:19 +00:00
Matt Caswell
3bc28b8022 Amend openssl-format-source so that it give more repeatable output 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:55 +00:00
Matt Caswell
d8305efeb4 Manually reformat aes_core.c 
Add aes_core.c to the list of files not processed by openssl-format-source

Conflicts:
	crypto/aes/aes_core.c

Conflicts:
	crypto/aes/aes_core.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:22 +00:00
Matt Caswell
7566807cfc Add obj_dat.h to the list of files that will not be processed by 
openssl-format-source

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:44:16 +00:00
Matt Caswell
bfe4de7257 Fix logic to check for indent.pro 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:43:26 +00:00
Matt Caswell
92fd726fb4 Fix make errors 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:50 +00:00
Richard Levitte
46d8227210 Make the script a little more location agnostic 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:45 +00:00
Matt Caswell
5d3dc701b9 Provide script for filtering data initialisers for structs/unions. indent just can't handle it. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:39 +00:00
Dr. Stephen Henson
25c438987b Script fixes. 
Don't use double newline for headers.
Don't interpret ASN1_PCTX as start of an ASN.1 module.

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:34 +00:00
Richard Levitte
016b92d112 Run expand before perl, to make sure things are properly aligned 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:29 +00:00
Richard Levitte
dd6da173fd Force the use of our indent profile 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:42:21 +00:00
Tim Hudson
6ff1bf382e Provide source reformating script. Requires GNU indent to be 
available.

Script written by Tim Hudson, with amendments by Steve Henson, Rich Salz and
Matt Caswell

Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-01-22 09:41:55 +00:00
Matt Caswell
36f309c50a Make output from openssl version -f consistent with previous versions 
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 2d2671790ee12dedd92c97f35b6feb755b8d4374)
 2015-01-13 11:29:21 +00:00
Matt Caswell
181ae2badb Fix build failure on Windows due to undefined cflags identifier 
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 5c5e7e1a7eb114cf136e1ae4b6a413bc48ba41eb)
 2015-01-08 19:28:43 +00:00
Matt Caswell
64eec8f898 Remove blank line from start of cflags character array in buildinf.h 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit b691154e18c0367643696db3cf73debe9ddfa9ae)
 2015-01-06 15:39:32 +00:00
Dr. Stephen Henson
31c65a7bc0 update ordinals 
Reviewed-by: Emilia Käsper <emilia@openssl.org>
 2015-01-05 16:50:31 +00:00
Matt Caswell
c4b969639a Fix a problem if CFLAGS is too long cversion.c fails to compile when config 
is run with --strict-warnings.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 488f16e31b8f5ec2513410929325d0830d76762d)
 2014-12-19 14:11:20 +00:00
Tim Hudson
b7eaea7397 no-ssl2 with no-ssl3 does not mean drop the ssl lib 
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit c882abd52269a59ed8e0510e5febf667428ece85)
 2014-10-20 15:25:13 +10:00
Geoff Thorpe
525b6c7585 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 647f360e2e86818cee1f2d0429e071d14814e0b5)
 2014-07-02 01:50:58 +01:00
Dr. Stephen Henson
0737acd2a8 Update ordinals. 
Use a previously unused value as we will be updating multiple released
branches.
 2014-03-12 14:41:00 +00:00
Andy Polyakov
24a47191f3 BC-32.pl: pre-1.0.2-specific refresh for Borland C. 
PR: 3251
Suggested by: Thorsten Schning
(cherry picked from commit 3ae1b53496acd3f25e9b9089ed5fb6000e41a557)
 2014-02-24 16:55:46 +01:00
Andy Polyakov
4ba2edd2a5 BC-32.pl: refresh Borland C support. 
PR: 3251
Suggested by: Thorsten Schning
(cherry picked from commit 779c51c6446f384c2f2a7bd5cc4c3e0366baf628)
 2014-02-24 16:49:50 +01:00
Dr. Stephen Henson
c6b82f7ee9 Add ordinal for CRYPTO_memcmp: since this will affect multiple 
branches it needs to be in a "gap".
(cherry picked from commit 81ce0e14e72e8e255ad1bd9c7cfaa47a6291919c)
 2013-02-05 16:46:20 +00:00
Dr. Stephen Henson
f47f99f295 stop warning 2012-01-04 15:26:29 +00:00
Dr. Stephen Henson
1d23fb382e update date 2011-05-19 17:56:47 +00:00
Richard Levitte
a530963f05 make update (1.0.0-stable) 2011-03-22 23:56:18 +00:00
Richard Levitte
bc5a53f5e9 * 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:13 +00:00
Richard Levitte
2d842a90f8 Apply all the changes submitted by Steven M. Schweda <sms@antinode.info> 2011-03-19 09:44:53 +00:00
Bodo Möller
6545372c24 OCSP stapling fix (OpenSSL 0.9.8r/1.0.0d) 
Submitted by: Neel Mehta, Adam Langley, Bodo Moeller
 2011-02-08 17:10:53 +00:00
Bodo Möller
d48df9a91b 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:04:40 +00:00
Dr. Stephen Henson
a01dc637bd ignore leading null fields 2010-12-03 19:31:06 +00:00
Andy Polyakov
2c23b0716e 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:28:34 +00:00
Dr. Stephen Henson
1f238b1c4a make no-gost work on Windows 2010-09-02 17:23:36 +00:00
Andy Polyakov
eec48070a1 util/cygwin.sh: maintainer's update [from HEAD]. 
Submitted by: Corinna Vinschen
 2010-08-24 21:52:00 +00:00
Dr. Stephen Henson
982d68a0c0 Add modes.h to mkdef.pl, update ordinals. 2010-07-25 16:56:06 +00:00
Dr. Stephen Henson
7585a86a76 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:57:07 +00:00
Andy Polyakov
afce9bcca1 VC-32.pl: fix /Fd name generation [from HEAD]. 
PR: 2284
 2010-06-09 15:49:09 +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