提交 · f13615c5b828aeb8e3d9bf2545c803633d1c684f · OpenHarmony / Third Party Openssl

23 6月, 2017 1 次提交

Fix OBJ_create() to tolerate a NULL sn and ln · f13615c5

由 Matt Caswell 提交于 6月 22, 2017

In 1.0.2 and before OBJ_create() allowed the sn or ln parameter to be NULL.
Commit 52832e47 changed that so that it crashed if they were NULL.

This was causing problems with the built-in config oid module. If a long
name was provided OBJ_create() is initially called with a NULL ln and
therefore causes a crash.

Fixes #3733
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3753)

f13615c5

22 6月, 2017 7 次提交

Fix tls1_generate_master_secret · f6373823

由 Alexey Komnin 提交于 6月 22, 2017

Reviewed-by: NKurt Roeckx <kurt@roeckx.be>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3751)

f6373823

Fix the names of ChaCha20-Poly1305 cipher suites in t1_trce.c. · 32bbf777

由 David Benjamin 提交于 6月 21, 2017

Per RFC 7905, the cipher suite names end in "_SHA256". The original
implementation targeted the -03 draft, but there was a -04 draft right
before the RFC was published to make the names consistent.
Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3748)

32bbf777

TAP line filter BIO. · a69de3f2

由 Pauli 提交于 6月 22, 2017

This is an implementation of a BIO filter that produce TAP compatible output
for the test framework.  The current test indentation level is honoured.

The test output functions have been modified to not attempt to indent
their output and to not include the leading '#' character.

The filter is applied to bio_err only.  bio_out is left unchanged, although
tests using bio_out have been modified to use bio_err instead.
Reviewed-by: NRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3732)

a69de3f2

R
Configure: give config targets the possibility to enable or disable features · 906eb3d0
由 Richard Levitte 提交于 6月 22, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3745)
```
906eb3d0

Remove duplicate see also reference to BIO_s_mem. · 410e8c93

由 Pauli 提交于 6月 20, 2017

Reviewed-by: NTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3731)

410e8c93

Add OCSP_resp_get1_id() accessor · db17e43d

由 Sascha Steinbiss 提交于 11月 08, 2016

Adding a get1 style accessor as brought up in mailing list post
https://mta.openssl.org/pipermail/openssl-users/2016-November/004796.htmlReviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1876)

db17e43d

Avoid compiler complaining · 15b1688a

由 Paul Yang 提交于 6月 22, 2017

initialize some local variables
Reviewed-by: NMatt Caswell <matt@openssl.org>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3741)

15b1688a

21 6月, 2017 32 次提交

M
Add documentation for the SSL_export_keying_material() function · 23cec1f4
由 Matt Caswell 提交于 6月 21, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3735)
```
23cec1f4

sha/asm/sha512p8-ppc.pl: add POWER8 performance data. · b5cdec2f

由 Andy Polyakov 提交于 6月 18, 2017

[skip ci]
Reviewed-by: NBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3705)

b5cdec2f

Add Keccak-1600 modules for PPC64 and POWER8. · 53ddf7dd

由 Andy Polyakov 提交于 6月 17, 2017

[skip ci]
Reviewed-by: NBernd Edlinger <bernd.edlinger@hotmail.de>
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3705)

53ddf7dd

Fix DTLS failure when used in a build which has SCTP enabled · 99240875

由 Matt Caswell 提交于 6月 20, 2017

The value of BIO_CTRL_DGRAM_SET_PEEK_MODE was clashing with the value for
BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE. In an SCTP enabled build
BIO_CTRL_DGRAM_SCTP_SET_IN_HANDSHAKE was used unconditionally with
the reasoning that it would be ignored if SCTP wasn't in use. Unfortunately
due to this clash, this wasn't the case. The BIO ended up going into peek
mode and was continually reading the same data over and over - throwing it
away as a replay.

Fixes #3723
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3724)

99240875

由 Matt Caswell 提交于 6月 21, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

72257204

M
Use constants rather than macros for the cipher bytes in the apps · adfc3786
由 Matt Caswell 提交于 6月 21, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
adfc3786

Add some tests for the new TLSv1.3 PSK code · ca8c71ba

由 Matt Caswell 提交于 6月 20, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

ca8c71ba

Fix some bugs in the TLSv1.3 PSK code · 011d768a

由 Matt Caswell 提交于 6月 20, 2017

Found while developing the PSK tests
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

011d768a

M
Make the input parameters for SSL_SESSION_set1_master_key const · 725b0f1e
由 Matt Caswell 提交于 6月 20, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
725b0f1e
M
Document SSL_set_psk_find_session_callback() and SSL_CTX equivalent · 8ead6158
由 Matt Caswell 提交于 6月 19, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
8ead6158
M
Document SSL_set_psk_use_session_callback() and SSL_CTX equivalent · 93a048a1
由 Matt Caswell 提交于 6月 16, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
93a048a1

Tweak the client side PSK callback · dc87d5a9

由 Matt Caswell 提交于 6月 16, 2017

Ensure that we properly distinguish between successful return (PSK
provided), successful return (no PSK provided) and failure.
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

dc87d5a9

M
Add documentation for SSL_CTX_set_psk_use_session_callback() · 801d9fbd
由 Matt Caswell 提交于 6月 16, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
801d9fbd

Document SSL_CIPHER_get_handshake_digest() · 9c39fa1e

由 Matt Caswell 提交于 6月 14, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

9c39fa1e

Document SSL_SESSION_set_protocol_version() · 267869d3

由 Matt Caswell 提交于 6月 14, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

267869d3

Document SSL_SESSION_set1_master_key() · 5eb72736

由 Matt Caswell 提交于 6月 14, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

5eb72736

Add documentation for SSL_SESSION_set_cipher() · 7721978c

由 Matt Caswell 提交于 6月 13, 2017

Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

7721978c

Fix no-psk · 14e35350

由 Matt Caswell 提交于 6月 13, 2017

Broken through previous PSK related commits
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)

14e35350

M
Add the ability to set a TLSv1.3 PSK via just the key bytes · 5ffff599
由 Matt Caswell 提交于 6月 12, 2017
```
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3670)
```
5ffff599

Add SSL_SESSION_set_protocol_version() · 5a43d511