denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed ecp_format to ansi_format, as point formats in TLS use different identifiers

Browse Source
This commit is contained in:
Martin Willi
2010-09-06 18:37:24 +02:00
parent 3f5de7b65f
commit ec7d4e70d3
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtls/tls_crypto.c
+1 -1
View File
@@ -306,7 +306,7 @@ ENUM(tls_named_curve_names, TLS_SECT163K1, TLS_SECP521R1,
"SECP521R1", "SECP521R1",
); );
ENUM(tls_ecp_format_names, TLS_ECP_COMPRESSED, TLS_ECP_HYBRID_Y, ENUM(tls_ansi_point_format_names, TLS_ANSI_COMPRESSED, TLS_ANSI_HYBRID_Y,
"compressed", "compressed",
"compressed y", "compressed y",
"uncompressed", "uncompressed",
src/libtls/tls_crypto.h
+8 -8
View File
@@ -361,18 +361,18 @@ extern enum_name_t *tls_named_curve_names;
/** /**
* EC Point format, ANSI X9.62. * EC Point format, ANSI X9.62.
*/ */
enum tls_ecp_format_t { enum tls_ansi_point_format_t {
TLS_ECP_COMPRESSED = 2, TLS_ANSI_COMPRESSED = 2,
TLS_ECP_COMPRESSED_Y = 3, TLS_ANSI_COMPRESSED_Y = 3,
TLS_ECP_UNCOMPRESSED = 4, TLS_ANSI_UNCOMPRESSED = 4,
TLS_ECP_HYBRID = 6, TLS_ANSI_HYBRID = 6,
TLS_ECP_HYBRID_Y = 7, TLS_ANSI_HYBRID_Y = 7,
}; };
/** /**
* Enum names for tls_ecp_format_t. * Enum names for tls_ansi_point_format_t.
*/ */
extern enum_name_t *tls_ecp_format_names; extern enum_name_t *tls_ansi_point_format_names;
/** /**
* TLS crypto helper functions. * TLS crypto helper functions.
src/libtls/tls_peer.c
+3 -3
View File
@@ -449,10 +449,10 @@ static status_t process_ec_key_exchange(private_tls_peer_t *this,
return NEED_MORE; return NEED_MORE;
} }
if (pub.ptr[0] != TLS_ECP_UNCOMPRESSED) if (pub.ptr[0] != TLS_ANSI_UNCOMPRESSED)
{ {
DBG1(DBG_TLS, "DH point format '%N' not supported", DBG1(DBG_TLS, "DH point format '%N' not supported",
tls_ecp_format_names, pub.ptr[0]); tls_ansi_point_format_names, pub.ptr[0]);
this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR); this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR);
return NEED_MORE; return NEED_MORE;
} }
@@ -918,7 +918,7 @@ static status_t send_key_exchange_dhe(private_tls_peer_t *this,
else else
{ /* ECP uses 8bit length header only, but a point format */ { /* ECP uses 8bit length header only, but a point format */
writer->write_uint8(writer, pub.len + 1); writer->write_uint8(writer, pub.len + 1);
writer->write_uint8(writer, TLS_ECP_UNCOMPRESSED); writer->write_uint8(writer, TLS_ANSI_UNCOMPRESSED);
writer->write_data(writer, pub); writer->write_data(writer, pub);
} }
free(pub.ptr); free(pub.ptr);
src/libtls/tls_server.c
+3 -3
View File
@@ -419,10 +419,10 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this,
return NEED_MORE; return NEED_MORE;
} }
if (pub.ptr[0] != TLS_ECP_UNCOMPRESSED) if (pub.ptr[0] != TLS_ANSI_UNCOMPRESSED)
{ {
DBG1(DBG_TLS, "DH point format '%N' not supported", DBG1(DBG_TLS, "DH point format '%N' not supported",
tls_ecp_format_names, pub.ptr[0]); tls_ansi_point_format_names, pub.ptr[0]);
this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR); this->alert->add(this->alert, TLS_FATAL, TLS_INTERNAL_ERROR);
return NEED_MORE; return NEED_MORE;
} }
@@ -857,7 +857,7 @@ static status_t send_server_key_exchange(private_tls_server_t *this,
else else
{ /* ECP uses 8bit length header only, but a point format */ { /* ECP uses 8bit length header only, but a point format */
writer->write_uint8(writer, chunk.len + 1); writer->write_uint8(writer, chunk.len + 1);
writer->write_uint8(writer, TLS_ECP_UNCOMPRESSED); writer->write_uint8(writer, TLS_ANSI_UNCOMPRESSED);
writer->write_data(writer, chunk); writer->write_data(writer, chunk);
} }
free(chunk.ptr); free(chunk.ptr);