Skip to content

Commit

Permalink
Remove deprecated methods for cert_req extensions (aws#2094)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lrstewart
lrstewart authored Jul 7, 2020
1 parent 460b4fa commit f3ad1a7
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 135 deletions.
4 changes: 2 additions & 2 deletions tests/unit/s2n_server_signature_algorithms_extension_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ int main(int argc, char **argv)
EXPECT_NOT_NULL(server_conn = s2n_connection_new(S2N_SERVER));

struct s2n_stuffer io;
s2n_stuffer_alloc(&io, s2n_extensions_server_signature_algorithms_size(server_conn));
EXPECT_SUCCESS(s2n_server_signature_algorithms_extension.send(server_conn, &io));
EXPECT_SUCCESS(s2n_stuffer_growable_alloc(&io, 0));

EXPECT_SUCCESS(s2n_server_signature_algorithms_extension.send(server_conn, &io));
EXPECT_SUCCESS(s2n_server_signature_algorithms_extension.recv(client_conn, &io));
EXPECT_EQUAL(s2n_stuffer_data_available(&io), 0);

Expand Down
110 changes: 5 additions & 105 deletions tests/unit/s2n_tls13_cert_request_extensions_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,71 +32,7 @@ int main(int argc, char **argv)
BEGIN_TEST();
EXPECT_SUCCESS(s2n_enable_tls13());

/* Test client fails to parse certificate request with no extensions */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

/* Write 0 length request context https://tools.ietf.org/html/rfc8446#section-4.3.2 */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
/* write total extension length */
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, 0));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_MISSING_EXTENSION);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}

/* Test client fails to parse certificate request with wrong extension type */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

/* Write supported versions extension instead */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_supported_versions_size(client_conn)));
EXPECT_SUCCESS(s2n_extensions_server_supported_versions_send(client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}

/* Test extension size greater than actual fails */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_signature_algorithms_size(client_conn) + 3));
EXPECT_SUCCESS(s2n_extensions_server_signature_algorithms_send(client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}

/* Test extension size smaller than actual fails */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

/* Extension size read inside of parsing the extension will be greater than data available
* as overall extension size written here is smaller than was actually written */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_signature_algorithms_size(client_conn) - 4));
EXPECT_SUCCESS(s2n_extensions_server_signature_algorithms_send(client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}

/* Test correct extension (sig_alg) */
/* Test correct required extension (sig_alg) sent and received */
{
struct s2n_connection *conn;
EXPECT_NOT_NULL(conn = s2n_connection_new(S2N_CLIENT));
Expand All @@ -110,53 +46,17 @@ int main(int argc, char **argv)
EXPECT_SUCCESS(s2n_connection_free(conn));
}

/* Test correct extension (sig alg) with wrong length */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_signature_algorithms_size(client_conn)));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, TLS_EXTENSION_SIGNATURE_ALGORITHMS));
/* From s2n_extensions_server_signature_algorithms_send() */
uint16_t total_size = s2n_extensions_server_signature_algorithms_size(client_conn);
uint16_t extension_size = total_size - 4;
/* Subtract further to make the extension_size smaller than it actually is */
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, extension_size - 4));
EXPECT_SUCCESS(s2n_send_supported_sig_scheme_list(client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

/* Test again with extension size larger than it actually is */
EXPECT_SUCCESS(s2n_stuffer_wipe(&client_conn->handshake.io));
EXPECT_TRUE(s2n_stuffer_data_available(&client_conn->handshake.io) == 0);

EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_signature_algorithms_size(client_conn)));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, TLS_EXTENSION_SIGNATURE_ALGORITHMS));
total_size = s2n_extensions_server_signature_algorithms_size(client_conn);
extension_size = total_size - 4;
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, extension_size + 4));
EXPECT_SUCCESS(s2n_send_supported_sig_scheme_list(client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}

/* Test two of the same extension */
/* Test client fails to parse certificate request with no extensions */
{
struct s2n_connection *client_conn;
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

/* Write 0 length request context https://tools.ietf.org/html/rfc8446#section-4.3.2 */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, 2 * s2n_extensions_server_signature_algorithms_size(client_conn)));
EXPECT_SUCCESS(s2n_extensions_server_signature_algorithms_send(client_conn, &client_conn->handshake.io));
EXPECT_SUCCESS(s2n_extensions_server_signature_algorithms_send(client_conn, &client_conn->handshake.io));
EXPECT_SUCCESS(s2n_extension_list_send(S2N_EXTENSION_LIST_EMPTY, client_conn, &client_conn->handshake.io));

EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_DUPLICATE_EXTENSION);
EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_MISSING_EXTENSION);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
}
Expand Down
8 changes: 5 additions & 3 deletions tests/unit/s2n_tls13_cert_request_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@ int main(int argc, char **argv)
EXPECT_NOT_NULL(client_conn = s2n_connection_new(S2N_CLIENT));
client_conn->actual_protocol_version = S2N_TLS13;

EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 2));
EXPECT_SUCCESS(s2n_stuffer_write_uint16(&client_conn->handshake.io, s2n_extensions_server_signature_algorithms_size(client_conn)));
EXPECT_SUCCESS(s2n_extensions_server_signature_algorithms_send(client_conn, &client_conn->handshake.io));
/* Request context correct */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 0));
EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_MISSING_EXTENSION);

/* Request context incorrect */
EXPECT_SUCCESS(s2n_stuffer_write_uint8(&client_conn->handshake.io, 2));
EXPECT_FAILURE_WITH_ERRNO(s2n_tls13_cert_req_recv(client_conn), S2N_ERR_BAD_MESSAGE);

EXPECT_SUCCESS(s2n_connection_free(client_conn));
Expand Down
20 changes: 2 additions & 18 deletions tls/extensions/s2n_server_signature_algorithms.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@
#include <stdint.h>

#include "tls/extensions/s2n_client_signature_algorithms.h"
#include "tls/s2n_connection.h"
#include "tls/s2n_tls.h"
#include "tls/s2n_tls_parameters.h"
#include "tls/s2n_signature_algorithms.h"

#include "stuffer/s2n_stuffer.h"
#include "utils/s2n_safety.h"

static int s2n_signature_algorithms_recv(struct s2n_connection *conn, struct s2n_stuffer *extension);
Expand All @@ -38,21 +40,3 @@ static int s2n_signature_algorithms_recv(struct s2n_connection *conn, struct s2n
{
return s2n_recv_supported_sig_scheme_list(extension, &conn->handshake_params.server_sig_hash_algs);
}

/* Old-style extension functions -- remove after extensions refactor is complete */

int s2n_extensions_server_signature_algorithms_size(struct s2n_connection *conn)
{
/* extra 6 = 2 from extension type, 2 from extension size, 2 from list length */
return s2n_supported_sig_scheme_list_size(conn) + 6;
}

int s2n_extensions_server_signature_algorithms_send(struct s2n_connection *conn, struct s2n_stuffer *out)
{
return s2n_extension_send(&s2n_server_signature_algorithms_extension, conn, out);
}

int s2n_extensions_server_signature_algorithms_recv(struct s2n_connection *conn, struct s2n_stuffer *extension)
{
return s2n_extension_recv(&s2n_server_signature_algorithms_extension, conn, extension);
}
7 changes: 0 additions & 7 deletions tls/extensions/s2n_server_signature_algorithms.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,5 @@
#pragma once

#include "tls/extensions/s2n_extension_type.h"
#include "tls/s2n_connection.h"
#include "stuffer/s2n_stuffer.h"

extern const s2n_extension_type s2n_server_signature_algorithms_extension;

/* Old-style extension functions -- remove after extensions refactor is complete */
int s2n_extensions_server_signature_algorithms_send(struct s2n_connection *conn, struct s2n_stuffer *out);
int s2n_extensions_server_signature_algorithms_recv(struct s2n_connection *conn, struct s2n_stuffer *extension);
int s2n_extensions_server_signature_algorithms_size(struct s2n_connection *conn);

0 comments on commit f3ad1a7

Please sign in to comment.