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

866 commits

Author SHA1 Message Date
Kristian Amlie
7934ce27cd Don't use "grep -q", "-q" is not POSIX, and fails on Solaris. 
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
 2016-01-18 16:20:51 +01:00
Dr Stephen Henson
9501418ea2 Don't use applink for static builds. 
Reviewed-by: Rich Salz <rsalz@openssl.org>
 2015-12-09 00:30:29 +00:00
Emilia Kasper
c97c7f8d53 make depend: prefer clang over makedepend 
Reviewed-by: Rich Salz <rsalz@openssl.org>
 2015-10-14 19:08:54 +02:00
Dr. Stephen Henson
d62c64b947 Link in applink with fips_premain_dso 
PR#4042

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-09-29 18:43:02 +01:00
Rich Salz
3be39dc1e3 RT4044: Remove .cvsignore files. 
Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-09-15 11:58:27 -04:00
Richard Levitte
b012b497ea Add new types to indent.pro 
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 3da9505dc0)
 2015-08-17 18:24:33 +02:00
Dirk Wetter
49cc3f4038 GH336: Return an exit code if report fails 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit e36ce2d986)
 2015-08-01 14:33:09 -04:00
Ernie Hershey
033b558181 GH322: Fix typo in generated comment. 
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(cherry picked from commit ad282e638b)
 2015-07-15 03:32:50 -04:00
Richard Levitte
9f0b86c68b Conversion to UTF-8 where needed 
This leaves behind files with names ending with '.iso-8859-1'.  These
should be safe to remove.  If something went wrong when re-encoding,
there will be some files with names ending with '.utf8' left behind.

Reviewed-by: Rich Salz <rsalz@openssl.org>
 2015-07-14 01:17:45 +02:00
Richard Levitte
5a3ce86e21 Small script to re-encode files that need it to UTF-8 
This requires 'iconv' and that 'file' can take the options '-b' and '-i'.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit f608b4064d)
 2015-07-14 01:13:44 +02:00
Dr. Stephen Henson
2a7059c56f Sort @sstacklst correctly. 
Reviewed-by: Rich Salz <rsalz@openssl.org>
 2015-07-09 16:56:45 +01:00
Dr. Stephen Henson
adba3b3bf1 make update 
Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-06-03 15:18:20 +01:00
StudioEtrange
17b753f23a GitHub284: Fix typo in xx-32.pl scripts. 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Signed-off-by: Rich Salz <rsalz@openssl.org>
 2015-05-20 04:34:42 -04:00
Andy Polyakov
051b41df41 mk1mf.pl: replace chop for windows. 
Backport old patch to make it work in mixture of perls for Windows.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Cherry-picked from 7bb98eee3c
 2015-05-15 14:18:21 -04:00
Richard Levitte
42802a94be 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 2cfdfe0918)
 2015-04-08 21:46:15 +02:00
Dr. Stephen Henson
ef116b0003 update ordinals 
Reviewed-by: Matt Caswell <matt@openssl.org>
 2015-03-09 16:57:24 +00:00
Matt Caswell
6ee3997134 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:07:05 +00:00
Dr. Stephen Henson
6fff54b0ce 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 437b14b533)
 2015-03-02 13:43:17 +00:00
Rich Salz
db7cb7ab9a Remove unused eng_rsax and related asm file 
Reviewed-by: Andy Polyakov <appro@openssl.org>
 2015-01-26 10:46:26 -05:00
Dr. Stephen Henson
a1b20ff654 Delete trailing whitespace from output. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:43 +00:00
Dr. Stephen Henson
628afe685e Add -d debug option to save preprocessed files. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:38 +00:00
Dr. Stephen Henson
defc825e9e 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:28:32 +00:00
Matt Caswell
3807db9d91 Add ecp_nistz256.c to list of files skipped by openssl-format-source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:20 +00:00
Matt Caswell
0f344da8f7 Manually reformat aes_x86core.c and add it to the list of files skipped by 
openssl-format-source

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:14 +00:00
Matt Caswell
d18d367d90 Amend openssl-format-source so that it give more repeatable output 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:27:41 +00:00
Matt Caswell
e4e5457c29 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

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:27:10 +00:00
Matt Caswell
9b214383c1 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:27:05 +00:00
Matt Caswell
39108d595e Fix logic to check for indent.pro 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:25:58 +00:00
Matt Caswell
d2f8517ad0 Fix make errors 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:25:13 +00:00
Richard Levitte
27df27d4b9 Make the script a little more location agnostic 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:25:06 +00:00
Matt Caswell
4a81e0f0d6 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:24:59 +00:00
Dr. Stephen Henson
24e6a032bf 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:24:44 +00:00
Richard Levitte
9d63b5e375 Run expand before perl, to make sure things are properly aligned 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:24:38 +00:00
Richard Levitte
a45030fc9b Force the use of our indent profile 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:24:32 +00:00
Tim Hudson
45b575a031 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:24:12 +00:00
Matt Caswell
36f694e09a Make output from openssl version -f consistent with previous versions 
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 2d2671790e)
 2015-01-13 11:28:54 +00:00
Matt Caswell
5cee72382c Fix build failure on Windows due to undefined cflags identifier 
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 5c5e7e1a7e)
 2015-01-08 19:24:09 +00:00
Matt Caswell
8dc461eccf Remove blank line from start of cflags character array in buildinf.h 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit b691154e18)
 2015-01-06 15:35:15 +00:00
Dr. Stephen Henson
d96c24926d update ordinals 
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 31c65a7bc0)
 2015-01-05 16:51:41 +00:00
Matt Caswell
b651407268 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 488f16e31b)
 2014-12-19 14:05:25 +00:00
Guenter
261e64b85e NetWare compilation fix. 
Workaround for NetWare CodeWarrior compiler which doesn't properly lookup
includes when in same directory as the C file which includes it.

PR#3569
Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

(cherry picked from commit 333fad9f2d)
 2014-11-27 14:03:57 +00:00
Dr. Stephen Henson
017a15cbd2 New option no-ssl3-method which removes SSLv3_*method 
When no-ssl3 is set only make SSLv3 disabled by default. Retain -ssl3
options for s_client/s_server/ssltest.

When no-ssl3-method is set SSLv3_*method() is removed and all -ssl3
options.

We should document this somewhere, e.g. wiki, FAQ or manual page.
Reviewed-by: Emilia Käsper <emilia@openssl.org>

(cherry picked from commit 3881d8106d)
 2014-11-19 22:54:30 +00:00
Tim Hudson
bb086221dd no-ssl2 with no-ssl3 does not mean drop the ssl lib 
Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit c882abd522)
 2014-10-20 15:26:16 +10:00
Matt Caswell
c2a2ff3f0a Fix SRTP compile issues for windows 
Related to CVE-2014-3513

This fix was developed by the OpenSSL Team

Reviewed-by: Tim Hudson <tjh@openssl.org>

Conflicts:
	util/mkdef.pl
	util/ssleay.num

Conflicts:
	util/mkdef.pl
 2014-10-15 08:54:26 -04:00
Ben Laurie
f58cfe0422 Fix single makefile. 
Reviewed-by: Geoffrey Thorpe <geoff@geoffthorpe.net>
 2014-10-06 18:06:18 +01:00
Emilia Kasper
972868b23d make update 
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
 2014-09-23 18:20:26 +02:00
Dr. Stephen Henson
39d64e9351 update ordinals 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2014-08-28 18:24:14 +01:00
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