projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sign CertificateVerify messages using PSS padding
[oweals/openssl.git]
/
test
/
ssl_test_ctx.h
diff --git
a/test/ssl_test_ctx.h
b/test/ssl_test_ctx.h
index 1074f8ee72a26a60185118dfaf41266cc86a3001..995d518ed37690300e2774088d907f94fc36f788 100644
(file)
--- a/
test/ssl_test_ctx.h
+++ b/
test/ssl_test_ctx.h
@@
-56,8
+56,8
@@
typedef enum {
typedef enum {
SSL_TEST_HANDSHAKE_SIMPLE = 0, /* Default */
SSL_TEST_HANDSHAKE_RESUME,
typedef enum {
SSL_TEST_HANDSHAKE_SIMPLE = 0, /* Default */
SSL_TEST_HANDSHAKE_RESUME,
- /* Not yet implemented */
- SSL_TEST_HANDSHAKE_RENEG
OTIATE
+ SSL_TEST_HANDSHAKE_RENEG_SERVER,
+ SSL_TEST_HANDSHAKE_RENEG
_CLIENT
} ssl_handshake_mode_t;
typedef enum {
} ssl_handshake_mode_t;
typedef enum {
@@
-65,6
+65,12
@@
typedef enum {
SSL_TEST_CT_VALIDATION_PERMISSIVE,
SSL_TEST_CT_VALIDATION_STRICT
} ssl_ct_validation_t;
SSL_TEST_CT_VALIDATION_PERMISSIVE,
SSL_TEST_CT_VALIDATION_STRICT
} ssl_ct_validation_t;
+
+typedef enum {
+ SSL_TEST_CERT_STATUS_NONE = 0, /* Default */
+ SSL_TEST_CERT_STATUS_GOOD_RESPONSE,
+ SSL_TEST_CERT_STATUS_BAD_RESPONSE
+} ssl_cert_status_t;
/*
* Server/client settings that aren't supported by the SSL CONF library,
* such as callbacks.
/*
* Server/client settings that aren't supported by the SSL CONF library,
* such as callbacks.
@@
-88,6
+94,8
@@
typedef struct {
char *alpn_protocols;
/* Whether to set a broken session ticket callback. */
int broken_session_ticket;
char *alpn_protocols;
/* Whether to set a broken session ticket callback. */
int broken_session_ticket;
+ /* Should we send a CertStatus message? */
+ ssl_cert_status_t cert_status;
} SSL_TEST_SERVER_CONF;
typedef struct {
} SSL_TEST_SERVER_CONF;
typedef struct {
@@
-109,6
+117,8
@@
typedef struct {
* Both peers will send |app_data_size| bytes interleaved.
*/
int app_data_size;
* Both peers will send |app_data_size| bytes interleaved.
*/
int app_data_size;
+ /* Maximum send fragment size. */
+ int max_fragment_size;
/*
* Extra server/client configurations. Per-handshake.
/*
* Extra server/client configurations. Per-handshake.
@@
-149,6
+159,8
@@
typedef struct {
char *expected_alpn_protocol;
/* Whether the second handshake is resumed or a full handshake (boolean). */
int resumption_expected;
char *expected_alpn_protocol;
/* Whether the second handshake is resumed or a full handshake (boolean). */
int resumption_expected;
+ /* Expected temporary key type */
+ int expected_tmp_key_type;
} SSL_TEST_CTX;
const char *ssl_test_result_name(ssl_test_result_t result);
} SSL_TEST_CTX;
const char *ssl_test_result_name(ssl_test_result_t result);
@@
-162,6
+174,7
@@
const char *ssl_session_ticket_name(ssl_session_ticket_t server);
const char *ssl_test_method_name(ssl_test_method_t method);
const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode);
const char *ssl_ct_validation_name(ssl_ct_validation_t mode);
const char *ssl_test_method_name(ssl_test_method_t method);
const char *ssl_handshake_mode_name(ssl_handshake_mode_t mode);
const char *ssl_ct_validation_name(ssl_ct_validation_t mode);
+const char *ssl_certstatus_name(ssl_cert_status_t cert_status);
/*
* Load the test case context from |conf|.
/*
* Load the test case context from |conf|.