ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

tls-server: Support x25519/448 for TLS 1.2

This commit is contained in:
Tobias Brunner 2021-02-11 17:47:55 +01:00
parent f77ecf0728
commit 966a26eaa2
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libtls/tls_server.c
View File

@ -829,12 +829,14 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this,
bio_reader_t *reader)
{
chunk_t premaster, pub;
diffie_hellman_group_t group;
bool ec;
this->crypto->append_handshake(this->crypto,
TLS_CLIENT_KEY_EXCHANGE, reader->peek(reader));
ec = diffie_hellman_group_is_ec(this->dh->get_dh_group(this->dh));
group = this->dh->get_dh_group(this->dh);
ec = diffie_hellman_group_is_ec(group);
if ((ec && !reader->read_data8(reader, &pub)) ||
(!ec && (!reader->read_data16(reader, &pub) || pub.len == 0)))
{
@ -843,7 +845,9 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this,
return NEED_MORE;
}
if (ec)
if (ec &&
group != CURVE_25519 &&
group != CURVE_448)
{
if (pub.ptr[0] != TLS_ANSI_UNCOMPRESSED)
{
@ -1528,12 +1532,17 @@ static status_t send_server_key_exchange(private_tls_server_t *this,
{
writer->write_data16(writer, chunk);
}
else
else if (group != CURVE_25519 &&
group != CURVE_448)
{ /* ECP uses 8bit length header only, but a point format */
writer->write_uint8(writer, chunk.len + 1);
writer->write_uint8(writer, TLS_ANSI_UNCOMPRESSED);
writer->write_data(writer, chunk);
}
else
{ /* ECPoint uses an 8-bit length header only */
writer->write_data8(writer, chunk);
}
free(chunk.ptr);
chunk = chunk_cat("ccc", chunk_from_thing(this->client_random),