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

10553 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dr. Stephen Henson
2316286c0e Clarify -Verify and PSK. 
PR#3452
(cherry picked from commit ca2015a617)
 2014-07-15 20:23:35 +01:00
Dr. Stephen Henson
67bde7d465 Fix DTLS certificate requesting code. 
Use same logic when determining when to expect a client
certificate for both TLS and DTLS.

PR#3452
(cherry picked from commit c8d710dc5f)
 2014-07-15 18:23:44 +01:00
Dr. Stephen Henson
cd63f94d4d Don't allow -www etc options with DTLS. 
The options which emulate a web server don't make sense when doing DTLS.
Exit with an error if an attempt is made to use them.

PR#3453
(cherry picked from commit 58a2aaeade8bdecd0f9f0df41927f7cff3012547)
 2014-07-15 12:25:39 +01:00
Dr. Stephen Henson
2054eb771e Add ECC extensions with DTLS. 
PR#3449
 2014-07-15 12:20:30 +01:00
Dr. Stephen Henson
ea0ceb11a0 Use case insensitive compare for servername. 
PR#3445
(cherry picked from commit 1c3e9a7c67)
 2014-07-15 00:00:03 +01:00
Hubert Kario
00579b98c4 document -nextprotoneg option in man pages 
Add description of the option to advertise support of
Next Protocol Negotiation extension (-nextprotoneg) to
man pages of s_client and s_server.

PR#3444
(cherry picked from commit 7efd0e777e)

Conflicts:

	doc/apps/s_server.pod
 2014-07-14 23:43:58 +01:00
Dr. Stephen Henson
ee5a8d3e31 Use more common name for GOST key exchange. 
(cherry picked from commit 7aabd9c92fe6f0ea2a82869e5171dcc4518cee85)
 2014-07-14 18:31:54 +01:00
Matt Caswell
72370164c3 Fixed valgrind complaint due to BN_consttime_swap reading uninitialised data. 
This is actually ok for this function, but initialised to zero anyway if
PURIFY defined.

This does have the impact of masking any *real* unitialised data reads in bn though.

Patch based on approach suggested by Rich Salz.

PR#3415

(cherry picked from commit 77747e2d9a5573b1dbc15e247ce18c03374c760c)
 2014-07-13 22:23:10 +01:00
Peter Mosmans
704422ce1e Add names of GOST algorithms. 
PR#3440
(cherry picked from commit 924e5eda2c)
 2014-07-13 18:31:36 +01:00
Richard Levitte
8e8d7e1b26 * crypto/ui/ui_lib.c: misplaced brace in switch statement. 
Detected by dcruette@qualitesys.com

(cherry picked from commit 8b5dd34091)
 2014-07-13 19:15:30 +02:00
Ben Laurie
3ed6327571 Don't clean up uninitialised EVP_CIPHER_CTX on error (CID 483259). 
(cherry picked from commit c1d1b0114e)
 2014-07-10 17:52:37 +01:00
Matt Caswell
efd4f1dfd3 Fix memory leak in BIO_free if there is no destroy function. 
Based on an original patch by Neitrino Photonov <neitrinoph@gmail.com>

PR#3439

(cherry picked from commit 66816c53be)
 2014-07-09 23:34:35 +01:00
David Lloyd
00032b0ba1 Prevent infinite loop loading config files. 
PR#2985
(cherry picked from commit 9d23f422a3)
 2014-07-07 13:50:00 +01:00
Dr. Stephen Henson
a07f514fc0 Usage for -hack and -prexit -verify_return_error 
(cherry picked from commit ee724df75d)
 2014-07-06 22:48:57 +01:00
Dr. Stephen Henson
b197c770a6 Document certificate status request options. 
(cherry picked from commit cba3f1c739)

Conflicts:

	doc/apps/s_client.pod
	doc/apps/s_server.pod
 2014-07-06 22:48:52 +01:00
Dr. Stephen Henson
b7c9762598 s_server usage for certificate status requests 
(cherry picked from commit a44f219c00)
 2014-07-06 22:45:44 +01:00
Dr. Stephen Henson
a414bc8c3e Update ticket callback docs. 
(cherry picked from commit a23a6e85d8)
 2014-07-06 12:42:27 +01:00
Dr. Stephen Henson
98a3c3c514 Sanity check keylength in PVK files. 
PR#2277
(cherry picked from commit 733a6c882e92f8221bd03a51643bb47f5f81bb81)
 2014-07-06 00:36:11 +01:00
Jeffrey Walton
157fd05aad Added reference to platform specific cryptographic acceleration such as AES-NI 2014-07-06 00:04:32 +01:00
Matt Caswell
9f510ceb5d Fixed error in pod files with latest versions of pod2man 
(cherry picked from commit 07255f0a76d9d349d915e14f969b9ff2ee0d1953)
 2014-07-06 00:04:32 +01:00
Alan Hryngle
675b1c2fce Return smaller of ret and f. 
PR#3418.
(cherry picked from commit fdea4fff8f)
 2014-07-05 22:38:44 +01:00
Dr. Stephen Henson
c923132e9d Don't limit message sizes in ssl3_get_cert_verify. 
PR#319 (reoponed version).
(cherry picked from commit 7f6e957864)
 2014-07-05 13:30:55 +01:00
Dr. Stephen Henson
1864e3bed3 typo 
(cherry picked from commit 2cfbec1cae)
(cherry picked from commit a9661e45ac)
 2014-07-04 18:43:55 +01:00
Dr. Stephen Henson
af7bcd7daa Add license info. 
(cherry picked from commit 55707a36cc)
 2014-07-04 18:43:50 +01:00
Rich Salz
3fa2fff86f Merge branch 'rsalz-docfixes' 2014-07-03 12:53:36 -04:00
Rich Salz
b372a64e10 Close 3170, remove reference to Ariel Glenn's old 0.9.8 doc 
(cherry picked from commit f1112985e8)
 2014-07-03 12:51:33 -04:00
Andy Polyakov
e432336433 bn_exp.c: fix x86_64-specific crash with one-word modulus. 
PR: #3397
(cherry picked from commit eca441b2b4)
 2014-07-02 21:21:02 +02:00
Dr. Stephen Henson
f3b0e0215c update release notes 2014-07-02 18:32:03 +01:00
Matt Smart
a6cc0e0a0d Fix doc typo. 
ERR_get_error(3) references the non-existent
ERR_get_last_error_line_data instead of the one that does exist,
ERR_peek_last_error_line_data.

PR#3283
(cherry picked from commit 5cc99c6cf5)
 2014-07-02 03:45:07 +01:00
Thijs Alkemade
b2cb6dc1ef Make disabling last cipher work. 
(cherry picked from commit 7cb472bd0d)
 2014-07-02 03:32:50 +01:00
Geoff Thorpe
f87f88a69f 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-07-02 01:50:51 +01:00
Dr. Stephen Henson
6d87cd2f03 ASN1 sanity check. 
Primitive encodings shouldn't use indefinite length constructed
form.

PR#2438 (partial).
(cherry picked from commit 398e99fe5e)
 2014-07-02 01:00:18 +01:00
Ben Laurie
2db3ea2929 Fix possible buffer overrun. 2014-07-01 23:39:17 +01:00
Dr. Stephen Henson
c28b055a0c Fix copy for CCM, GCM and XTS. 
Internal pointers in CCM, GCM and XTS contexts should either be
NULL or set to point to the appropriate key schedule. This needs
to be adjusted when copying contexts.
(cherry picked from commit c2fd5d79ff)
 2014-06-30 14:00:00 +01:00
Jeffrey Walton
02e8d46119 Clarified that the signature's buffer size, s, is not used as an 
IN parameter.

Under the old docs, the only thing stated was "at most
EVP_PKEY_size(pkey) bytes will be written". It was kind of misleading
since it appears EVP_PKEY_size(pkey) WILL be written regardless of the
signature's buffer size.

(cherry picked from commit 6e6ba36d98)
 2014-06-29 23:36:51 +01:00
ZNV
105a3db56e Make EVP_CIPHER_CTX_copy work in GCM mode. 
PR#3272
(cherry picked from commit 370bf1d708)
 2014-06-29 22:02:42 +01:00
Dr. Stephen Henson
295befec25 Fix memory leak. 
PR#2531
(cherry picked from commit 44724beead)
 2014-06-29 13:52:03 +01:00
Ken Ballou
cb34cb1f23 Typo. 
PR#3173
(cherry picked from commit 76ed5a42ea)
 2014-06-29 13:39:24 +01:00
Dr. Stephen Henson
86f393ceb7 Show errors on CSR verification failure. 
If CSR verify fails in ca utility print out error messages.
Otherwise some errors give misleading output: for example
if the key size exceeds the library limit.

PR#2875
(cherry picked from commit a30bdb55d1)
 2014-06-29 13:34:44 +01:00
Dr. Stephen Henson
d6d324374e Make no-ssl3 no-ssl2 do more sensible things. 
(cherry picked from commit 7ae6a4b659)
 2014-06-29 03:05:37 +01:00
Dr. Stephen Henson
14999bcc59 Clarify protocols supported. 
Update protocols supported and note that SSLv2 is effectively disabled
by default.

PR#3184
(cherry picked from commit 1b13a4f38dfc385d5e776f6b3e06c5795874cf9b)
 2014-06-29 00:04:43 +01:00
Dr. Stephen Henson
046e288edf Typo. 
PR#3107
(cherry picked from commit 7c206db928)
 2014-06-28 12:43:18 +01:00
Dr. Stephen Henson
d8b11e75cb Don't disable state strings with no-ssl2 
Some state strings were erronously not compiled when no-ssl2
was set.

PR#3295
(cherry picked from commit 0518a3e19e)
 2014-06-28 00:56:42 +01:00
yogesh nagarkar
0df7959d43 Fix compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUG 
PR#3141
(cherry picked from commit d183545d45)
 2014-06-28 00:41:49 +01:00
Andreas Westfeld
5894eb1f33 Fix typo in ideatest.c 
(cherry picked from commit d1d4382dcb)
 2014-06-28 00:06:40 +01:00
Ken Ballou
6daba1dc6a Remove redundant check. 
PR#3174
(cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
 2014-06-27 23:18:21 +01:00
Dr. Stephen Henson
69b8f2895b Fix for EVP_PBE_alg_add(). 
In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size.

PR#3206
(cherry picked from commit efb7caef637a1de8468ca109efd355a9d0e73a45)
 2014-06-27 22:58:55 +01:00
Dr. Stephen Henson
0ace876730 Tolerate critical AKID in CRLs. 
PR#3014
(cherry picked from commit 11da66f8b1)
 2014-06-27 18:50:33 +01:00
Tom Greenslade
e9daf8a9ce Handle IPv6 addresses in OCSP_parse_url. 
PR#2783
(cherry picked from commit b36f35cda9)
 2014-06-27 17:31:44 +01:00
Tomas Mraz
cf0156622a Don't advertise ECC ciphersuits in SSLv2 compatible client hello. 
PR#3374
(cherry picked from commit 0436369fcc)
 2014-06-27 16:52:05 +01:00