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

265 commits

Author SHA1 Message Date
Emilia Kasper
5c4fd8b515 Initialize variable 
newsig may be used (freed) uninitialized on a malloc error.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 6824941440)
 2015-04-21 19:27:24 +02:00
Emilia Kasper
496c79f60c make update 
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
 2015-04-21 17:50:36 +02:00
Richard Levitte
186578be45 Initialised 'ok' and redo the logic. 
The logic with how 'ok' was calculated didn't quite convey what's "ok",
so the logic is slightly redone to make it less confusing.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 06affe3dac)
 2015-04-21 01:45:47 +02:00
Matt Caswell
f4c5cd3085 Fix return checks in GOST engine 
Filled in lots of return value checks that were missing the GOST engine, and
added appropriate error handling.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 8817e2e0c9)
 2015-04-20 23:10:56 +01:00
Matt Caswell
0ddf91c5f3 Fix misc NULL derefs in sureware engine 
Fix miscellaneous NULL pointer derefs in the sureware engine.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 7b611e5fe8)
 2015-04-20 23:10:56 +01:00
Edgar Pek
98e6f07901 Fix null-pointer dereference 
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit bcfa19a8d1)
 2015-02-22 13:23:53 +01:00
Richard Levitte
681da86ebb Transfer a fix from 1.0.1 
manually picked from e7b85bc402
Reviewed-by: Stephen Henson <steve@openssl.org>

(cherry picked from commit 774ccae63c)
 2015-02-13 13:40:47 +01:00
Matt Caswell
d3b7cac41b Fix for reformat problems with e_padlock.c 
Reviewed-by: Andy Polyakov <appro@openssl.org>
 2015-01-22 14:12:11 +00:00
Matt Caswell
83975c80bb Re-align some comments after running the reformat script. 
This should be a one off operation (subsequent invokation of the
script should not move them)

This commit is for the 1.0.2 changes

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:31:48 +00:00
Matt Caswell
323d39e87f Rerun util/openssl-format-source -v -c . 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:31:48 +00:00
Matt Caswell
ae5c8664e5 Run util/openssl-format-source -v -c . 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:31:38 +00:00
Matt Caswell
335d4d06a7 Tweaks for comments due to indent's inability to handle them 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:55 +00:00
Matt Caswell
f3b6ee30f4 Move more comments that confuse indent 
Conflicts:
	crypto/dsa/dsa.h
	demos/engines/ibmca/hw_ibmca.c
	ssl/ssl_locl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:28:49 +00:00
Matt Caswell
cc6e2a5936 Fix strange formatting by indent 
Conflicts:
	crypto/hmac/hmac.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:26:58 +00:00
Andy Polyakov
d72781b4c9 engines/e_ubsec.c: make it indent-friendly. 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:25:33 +00:00
Matt Caswell
c695ebe2a0 Additional comment changes for reformat of 1.0.2 
Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:23:58 +00:00
Matt Caswell
e19d4a99b8 Further comment amendments to preserve formatting prior to source reformat 
(cherry picked from commit 4a7fa26ffd65bf36beb8d1cb8f29fc0ae203f5c5)

Conflicts:
	crypto/x509v3/pcy_tree.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:23:50 +00:00
Tim Hudson
6977c7e2ba mark all block comments that need format preserving so that 
indent will not alter them when reformatting comments

(cherry picked from commit 1d97c84351)

Conflicts:
	crypto/bn/bn_lcl.h
	crypto/bn/bn_prime.c
	crypto/engine/eng_all.c
	crypto/rc4/rc4_utl.c
	crypto/sha/sha.h
	ssl/kssl.c
	ssl/t1_lib.c

Reviewed-by: Tim Hudson <tjh@openssl.org>
 2015-01-22 09:23:04 +00:00
Emilia Kasper
0e1c318ece Build fixes 
Various build fixes, mostly uncovered by clang's unused-const-variable
and unused-function errors.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
 2014-12-17 14:27:49 +01:00
Rich Salz
3258429883 RT3271 update; extra; semi-colon; confuses; some; 
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(cherry picked from commit cb4bb56bae)
 2014-09-10 15:09:53 -04:00
Rich Salz
e61c648fd6 RT3271: Don't use "if !" in shell lines 
For portability don't use "if ! expr"

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit b999f66e34)
 2014-09-09 17:05:50 -04:00
Andy Polyakov
2064e2db08 Please Clang's sanitizer. 
PR: #3424,#3423,#3422
(cherry picked from commit 021e5043e5)
 2014-07-09 22:45:38 +02:00
Richard Levitte
a61e509e9b Adjust VMS build to Unix build. Most of all, make it so the disabled 
algorithms MD2 and RC5 don't get built.
Also, disable building the test apps in crypto/des and crypto/pkcs7, as
they have no support at all.
 2014-06-18 13:43:09 +02:00
Richard Levitte
1be1d05184 Make sure that disabling the MAYLOSEDATA3 warning is only done when the 
compiler supports it.  Otherwise, there are warnings about it lacking
everywhere, which is quite tedious to read through while trying to check
for other warnings.
 2014-06-14 16:58:11 +02:00
David Ramos
3329765bba Initialise alg. 
PR#3313
(cherry picked from commit 7e2c6f7eb0)
 2014-06-01 13:05:08 +01:00
Andy Polyakov
59314f304e engines/ccgost/gosthash.c: simplify and avoid SEGV. 
PR: 3275
(cherry picked from commit ea38f02049)
 2014-03-07 11:03:25 +01:00
Zoltan Arpadffy
dabd4f1986 OpenVMS fixes. 2014-02-25 15:16:03 +00:00
Dr. Stephen Henson
f407eec799 make update 2014-02-06 14:31:09 +00:00
Andy Polyakov
2ad673c611 engines/e_capi.c: TCHAR support (cumilative update from master). 2014-02-02 00:17:38 +01:00
Andy Polyakov
c76d6922b1 engines/ccgost/gost89.h: make word32 defintion unconditional. 
Original definition depended on __LONG_MAX__ that is not guaranteed to
be present. As we don't support platforms with int narrower that 32 bits
it's appropriate to make defition inconditional.

PR: 3165
(cherry picked from commit 96180cac04)
 2013-11-08 23:10:21 +01:00
Andy Polyakov
011f89893c Add support for Cygwin-x86_64. 
PR: 3110
Submitted by Corinna Vinschen.
(cherry picked from commit b3ef742cbb)
 2013-10-14 16:59:05 +02:00
Dr. Stephen Henson
d6dc5c506a Add control to retrieve signature MD. 
(cherry picked from commit 810639536c)
 2013-10-01 14:01:17 +01:00
Ben Laurie
e887c4187e Backport single makefile from master. 2013-06-13 15:09:48 +01:00
Andy Polyakov
5cfefd3ce3 engines/ccgost: GOST fixes [from master]. 
Submitted by: Dmitry Belyavsky, Seguei Leontiev
PR: 2821
 2013-01-19 18:24:03 +01:00
Dr. Stephen Henson
bda5153703 PR: 2880 
Submitted by: "Florian Rüchel" <florian.ruechel@ruhr-uni-bochum.de>

Correctly handle local machine keys in the capi ENGINE.
 2012-11-18 15:21:12 +00:00
Dr. Stephen Henson
957c7c0e88 Don't load GOST ENGINE if it is already loaded. 
Multiple copies of the ENGINE will cause problems when it is cleaned up as
the methods are stored in static structures which will be overwritten and
freed up more than once.

Set static methods to NULL when the ENGINE is freed so it can be reloaded.
 2012-09-01 11:30:35 +00:00
Andy Polyakov
c4aa6b041b gosthash.c: use memmove in circle_xor8, as input pointers can be equal 
[from HEAD].

PR: 2858
 2012-08-13 16:37:58 +00:00
Ben Laurie
68d2cf51bc Reduce version skew: trivia (I hope). 2012-06-03 22:03:37 +00:00
Dr. Stephen Henson
c0b31ccb87 PR: 2744 
Submitted by: Dmitry Belyavsky <beldmit@gmail.com>

CMS support for ccgost engine
 2012-03-11 13:40:05 +00:00
Dr. Stephen Henson
8e8b247341 PR: 2743 
Reported by: Dmitry Belyavsky <beldmit@gmail.com>

Fix memory leak if invalid GOST MAC key given.
 2012-02-29 14:12:52 +00:00
Dr. Stephen Henson
cc4b48c27c PR: 2703 
Submitted by: Alexey Melnikov <alexey.melnikov@isode.com>

Fix some memory and resource leaks in CAPI ENGINE.
 2012-02-11 23:12:59 +00:00
Dr. Stephen Henson
cac9c92cc0 PR: 2705 
Submitted by: Alexey Melnikov <alexey.melnikov@isode.com>

Only create ex_data indices once for CAPI engine.
 2012-02-11 23:07:58 +00:00
Dr. Stephen Henson
d7ecc206ba only include bn.h once 2012-01-24 23:00:36 +00:00
Andy Polyakov
9b2a29660b Sanitize usage of <ctype.h> functions. It's important that characters 
are passed zero-extended, not sign-extended [from HEAD].
PR: 2682
 2012-01-12 16:28:03 +00:00
Dr. Stephen Henson
a17b5d5a4f Check GOST parameters are not NULL (CVE-2012-0027) 2012-01-04 23:03:20 +00:00
Dr. Stephen Henson
88ef78745e PR: 2586 
Submitted by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Reviewed by: steve

Zero structure fields properly.
 2011-09-01 13:45:35 +00:00
Dr. Stephen Henson
be79342515 PR: 2586 
Submitted by: Thomas Jarosch <thomas.jarosch@intra2net.com>
Reviewed by: steve

Fix brace mismatch.
 2011-09-01 13:37:28 +00:00
Dr. Stephen Henson
baee44c3de Stop warning. 2011-06-21 16:42:15 +00:00
Dr. Stephen Henson
c65d409afd Fix warnings in shared builds. 2011-06-14 12:58:00 +00:00
Dr. Stephen Henson
676cd3a283 new flag to stop ENGINE methods being registered 2011-05-15 15:58:38 +00:00