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

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index 586222ec3b5fb9780d8e2ab598da6b5fea0fbea4..982798b8a84ad48a7f9c5fe7830dcee191594994 100644 (file)
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -306,7 +306,7 @@ ENUM(tls_named_curve_names, TLS_SECT163K1, TLS_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 y",
        "uncompressed",

diff --git a/src/libtls/tls_crypto.h b/src/libtls/tls_crypto.h
index b41ae5f13f56ad6a2d50c7a923f74594605725be..175a7acaf8381adc412bdc7f7047b83e198475bb 100644 (file)
--- a/src/libtls/tls_crypto.h
+++ b/src/libtls/tls_crypto.h
@@ -361,18 +361,18 @@ extern enum_name_t *tls_named_curve_names;
 /**
  * EC Point format, ANSI X9.62.
  */
-enum tls_ecp_format_t {
-       TLS_ECP_COMPRESSED =    2,
-       TLS_ECP_COMPRESSED_Y =  3,
-       TLS_ECP_UNCOMPRESSED =  4,
-       TLS_ECP_HYBRID =                6,
-       TLS_ECP_HYBRID_Y =              7,
+enum tls_ansi_point_format_t {
+       TLS_ANSI_COMPRESSED =   2,
+       TLS_ANSI_COMPRESSED_Y = 3,
+       TLS_ANSI_UNCOMPRESSED = 4,
+       TLS_ANSI_HYBRID =               6,
+       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.

diff --git a/src/libtls/tls_peer.c b/src/libtls/tls_peer.c
index ac22bd1c5f37ac3df2b82024ca2154c91b658574..bcc4eba3efd00c1924d0a8389dac3e2b4fdd9613 100644 (file)
--- a/src/libtls/tls_peer.c
+++ b/src/libtls/tls_peer.c
@@ -449,10 +449,10 @@ static status_t process_ec_key_exchange(private_tls_peer_t *this,
                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",
-                        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);
                return NEED_MORE;
        }
@@ -918,7 +918,7 @@ static status_t send_key_exchange_dhe(private_tls_peer_t *this,
        else
        {       /* ECP uses 8bit length header only, but a point format */
                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);
        }
        free(pub.ptr);

diff --git a/src/libtls/tls_server.c b/src/libtls/tls_server.c
index e48e6c5b7ec61a0cfd6d28fc5d510d9875a80af7..d1accbc2e968c15c9811f0d8db8c4ec4d86551db 100644 (file)
--- a/src/libtls/tls_server.c
+++ b/src/libtls/tls_server.c
@@ -419,10 +419,10 @@ static status_t process_key_exchange_dhe(private_tls_server_t *this,
                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",
-                        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);
                return NEED_MORE;
        }
@@ -857,7 +857,7 @@ static status_t send_server_key_exchange(private_tls_server_t *this,
        else
        {       /* ECP uses 8bit length header only, but a point format */
                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);
        }
        free(chunk.ptr);