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

85 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
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
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
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
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
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
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
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
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
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
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
Andy Polyakov
73b408c242 engine/Makefile: harmonize engine install rule for .dylib extension on MacOS X [from HEAD]. 
PR: 2319
 2010-08-24 21:46:58 +00:00
Dr. Stephen Henson
e97359435e Fix warnings (From HEAD, original patch by Ben). 2010-06-15 17:25:15 +00:00
Dr. Stephen Henson
dce2b5a8fc PR: 2254 
Submitted by: Ger Hobbelt <ger@hobbelt.com>
Approved by: steve@openssl.org

Check for <= 0 i2d return value.
 2010-05-22 00:40:58 +00:00
Dr. Stephen Henson
5daa9411a0 fix bug in ccgost CFB mode code 2010-04-14 00:33:22 +00:00
Dr. Stephen Henson
094d4019b8 check ASN1 type before using it 2010-04-14 00:30:12 +00:00
Dr. Stephen Henson
4ffd2ad1d3 make GOST MAC work again 2010-04-08 10:54:54 +00:00
Dr. Stephen Henson
03fd7f27db Submitted by: Dmitry Ivanov <vonami@gmail.com> 
Don't leave dangling pointers in GOST engine if calls fail.
 2010-02-16 14:30:19 +00:00
Richard Levitte
d89b895cfd size_t doesn't compare less than zero... 2010-01-27 01:18:26 +00:00
Dr. Stephen Henson
2e155fde39 PR: 2141 
Submitted by: "NARUSE, Yui" <naruse@airemix.jp>

Remove non-ASCII comment which causes compilation errors on some versions
of VC++.
 2010-01-19 19:28:03 +00:00
Dr. Stephen Henson
a1e1165200 PR: 2135 
Submitted by: Mike Frysinger <vapier@gentoo.org>

Change missed references to lib to $(LIBDIR)
 2010-01-16 20:06:10 +00:00
Bodo Möller
8bbd0e826c Use properly local variables for thread-safety. 
Submitted by: Martin Rex
 2009-12-22 11:52:15 +00:00
Dr. Stephen Henson
db6e41f0ed PR: 2070 
Submitted by: Alexander Nikitovskiy <Nikitovski@ya.ru>
Approved by: steve@openssl.org

Fix wrong cast.
 2009-10-19 13:13:14 +00:00
Dr. Stephen Henson
7171ade2c2 Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru> 
Reviewed by: steve@openssl.org

EVP_CTRL_PBE_PRF_NID suppot for Gost engine.
 2009-07-01 11:23:07 +00:00
Dr. Stephen Henson
bfd502f027 Updates from HEAD. 2009-06-16 16:39:20 +00:00
Dr. Stephen Henson
8355647403 Typo. 2009-05-07 16:26:44 +00:00
Richard Levitte
c44544a1d7 Update from HEAD 2009-05-05 08:46:30 +00:00
Richard Levitte
88d9f669c5 Add local symbol hacks for OpenVMS 2009-04-26 12:26:04 +00:00
Dr. Stephen Henson
9990cb75c1 PR: 1894 
Submitted by: Ger Hobbelt <ger@hobbelt.com>
Approved by: steve@openssl.org

Fix various typos and stuff.
 2009-04-16 17:22:51 +00:00
Dr. Stephen Henson
5f590d2218 PR: 1887 (part) 
Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru>
Approved by: steve@openssl.org

Added error codes for ccgost.
 2009-04-10 11:07:35 +00:00
Dr. Stephen Henson
1dad4f3672 PR: 1882 
Submitted by: Corinna Vinschen <vinschen@redhat.com>
Approved by: steve@openssl.org

Typo.
 2009-04-02 15:04:01 +00:00
Dr. Stephen Henson
70b2186e24 Stop warnings. 2009-03-31 19:54:51 +00:00
Dr. Stephen Henson
b6af2c7e3e Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru> 
Reviewed by: steve@openssl.org

Update ccgost engine to support parameter files.
 2009-03-17 15:38:34 +00:00
Dr. Stephen Henson
2c618ab993 Submitted by: "Victor B. Wagner" <vitus@cryptocom.ru> 
Reviewed by: steve@openssl.org

Change default Gost parameter set to id_Gost28147_89_CryptoPro_A_ParamSet
 2009-02-16 21:52:01 +00:00