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 924e5eda2c82d737cc5a1b9c37918aa6e34825da)
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 8b5dd340919e511137696792279f595a70ae2762)
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 c1d1b0114e9d370c30649e46182393dbfc00e20c)
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 66816c53bea0ecddb9448da7ea9a51a334496127)
2014-07-09 23:34:35 +01:00
David Lloyd
00032b0ba1
Prevent infinite loop loading config files.
...
PR#2985
(cherry picked from commit 9d23f422a32cb333a5e803199ae230706b1bf9f5)
2014-07-07 13:50:00 +01:00
Dr. Stephen Henson
a07f514fc0
Usage for -hack and -prexit -verify_return_error
...
(cherry picked from commit ee724df75d9ad67fd954253ac514fddb46f1e3c6)
2014-07-06 22:48:57 +01:00
Dr. Stephen Henson
b197c770a6
Document certificate status request options.
...
(cherry picked from commit cba3f1c739f012aaadb85aaefaf8de424d2695e2)
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 a44f219c009798054d6741e919cba5b2e656dbf4)
2014-07-06 22:45:44 +01:00
Dr. Stephen Henson
a414bc8c3e
Update ticket callback docs.
...
(cherry picked from commit a23a6e85d8dcd5733a343754f434201f3c9aa6f0)
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 fdea4fff8fb058be928980600b24cf4c62ef3630)
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 7f6e9578648728478e84246fd3e64026b8b6a48e)
2014-07-05 13:30:55 +01:00
Dr. Stephen Henson
1864e3bed3
typo
...
(cherry picked from commit 2cfbec1caea8f9567bdff85d33d22481f2afb40a)
(cherry picked from commit a9661e45acda0bedcb2413b412f9ffc3f9fb2354)
2014-07-04 18:43:55 +01:00
Dr. Stephen Henson
af7bcd7daa
Add license info.
...
(cherry picked from commit 55707a36cce3584457f687ff020842c079624ee8)
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 f1112985e847286033ac573e70bdee752d26f46f)
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 eca441b2b4d33d2a18d163ef9b4b3aff14251c73)
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 5cc99c6cf5e908df6b00b04af7f08e99c0698c7b)
2014-07-02 03:45:07 +01:00
Thijs Alkemade
b2cb6dc1ef
Make disabling last cipher work.
...
(cherry picked from commit 7cb472bd0d0fd9da3d42bed1acc56c3a79fc5328)
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 647f360e2e86818cee1f2d0429e071d14814e0b5)
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 398e99fe5e06edb11f55a39ce0883d9aa633ffa9)
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 c2fd5d79ffc4fc9d120a0faad579ce96473e6a2f)
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 6e6ba36d980f67b6e5c7b139f78da7acbbf8ec76)
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 370bf1d708e6d7af42e1752fb078d0822c9bc73d)
2014-06-29 22:02:42 +01:00
Dr. Stephen Henson
295befec25
Fix memory leak.
...
PR#2531
(cherry picked from commit 44724beeadf95712a42a8b21dc71bf110e89a262)
2014-06-29 13:52:03 +01:00
Ken Ballou
cb34cb1f23
Typo.
...
PR#3173
(cherry picked from commit 76ed5a42ea68dd08bba44e4003b7e638e5d8a4a3)
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 a30bdb55d1361b9926eef8127debfc2e1bb8c484)
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 7ae6a4b659facfd7ad8131238aa1d349cb3fc951)
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 7c206db9280865ae4af352dbc14e9019a6c4795d)
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 0518a3e19e18cfc441cab261b28441b8c8bd77bf)
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 d183545d4589f1e7a40190400b8b99ea3d1f7f97)
2014-06-28 00:41:49 +01:00
Andreas Westfeld
5894eb1f33
Fix typo in ideatest.c
...
(cherry picked from commit d1d4382dcb3fdcad4758ef7e7dd7b61dbf5abbfe)
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 11da66f8b1fbe5777fe08cc6ace9e1f2c1576a50)
2014-06-27 18:50:33 +01:00
Tom Greenslade
e9daf8a9ce
Handle IPv6 addresses in OCSP_parse_url.
...
PR#2783
(cherry picked from commit b36f35cda964544a15d53d3fdfec9b2bab8cacb1)
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 0436369fccd128cb7f6a8538d5fed1c876c437af)
2014-06-27 16:52:05 +01:00
Jeffrey Walton
86cac6d3b2
Clarify docs.
...
Document that the certificate passed to SSL_CTX_add_extra_chain_cert()
should not be freed by the application.
PR#3409
(cherry picked from commit 0535c2d67ca2d684087ef90be35d5fb207aab227)
Add restrictions section present in other branches.
Conflicts:
doc/ssl/SSL_CTX_add_extra_chain_cert.pod
2014-06-27 16:41:45 +01:00
Dr. Stephen Henson
f46ea1d8e2
Remove ancient obsolete files under pkcs7.
...
(cherry picked from commit 7be6b27aaf5ed77f13c93dc89a2c27a42082db3f)
2014-06-27 13:54:45 +01:00
Dr. Stephen Henson
0980992d44
Memory leak and NULL derefernce fixes.
...
PR#3403
2014-06-27 03:21:10 +01:00
Dr. Stephen Henson
38a503fb8a
Fix OID encoding for one component.
...
OIDs with one component don't have an encoding.
PR#2556 (Bug#1)
2014-06-27 03:17:15 +01:00
Huzaifa Sidhpurwala
fef58ce79e
Make sure BN_sqr can never return a negative value.
...
PR#3410
(cherry picked from commit e14e764c0d5d469da63d0819c6ffc0e1e9e7f0bb)
2014-06-26 23:50:36 +01:00
Jenny Yung
da0d5e78bc
Memory allocation checks.
...
PR#3399.
2014-06-26 23:32:17 +01:00
Miod Vallat
ad212c1ed1
Fix off-by-one errors in ssl_cipher_get_evp()
...
In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.
Bug discovered and fixed by Miod Vallat from the OpenBSD team.
PR#3375
2014-06-22 23:20:39 +01:00