summaryrefslogtreecommitdiffstats
path: root/regress/lib/libssl/ssl
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2014-06-13 04:29:13 +0000
committermiod <miod@openbsd.org>2014-06-13 04:29:13 +0000
commitd0eebffa6276f45fb0db91c36d104704cd8ac54b (patch)
tree712b65430df2667b20028ce7e1c0243a7a7e6d5d /regress/lib/libssl/ssl
parentsync (diff)
downloadwireguard-openbsd-d0eebffa6276f45fb0db91c36d104704cd8ac54b.tar.xz
wireguard-openbsd-d0eebffa6276f45fb0db91c36d104704cd8ac54b.zip
Remove support for the `opaque PRF input' extension, which draft has expired
7 years ago and never made it into an RFC. That code wasn't compiled in anyway unless one would define the actual on-the-wire extension id bytes; crank libssl major. With help and enlightenment from Brendan MacDonell.
Diffstat (limited to 'regress/lib/libssl/ssl')
-rw-r--r--regress/lib/libssl/ssl/ssltest.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/regress/lib/libssl/ssl/ssltest.c b/regress/lib/libssl/ssl/ssltest.c
index 38c70906bb5..ad24b1f7131 100644
--- a/regress/lib/libssl/ssl/ssltest.c
+++ b/regress/lib/libssl/ssl/ssltest.c
@@ -380,31 +380,6 @@ err:
}
}
-#ifdef TLSEXT_TYPE_opaque_prf_input
- struct cb_info_st { void *input;
- size_t len;
- int ret;
-};
-
-struct cb_info_st co1 = { "C", 1, 1 }; /* try to negotiate oqaque PRF input */
-struct cb_info_st co2 = { "C", 1, 2 }; /* insist on oqaque PRF input */
-struct cb_info_st so1 = { "S", 1, 1 }; /* try to negotiate oqaque PRF input */
-struct cb_info_st so2 = { "S", 1, 2 }; /* insist on oqaque PRF input */
-
-int
-opaque_prf_input_cb(SSL *ssl, void *peerinput, size_t len, void *arg_)
-{
- struct cb_info_st *arg = arg_;
-
- if (arg == NULL)
- return 1;
-
- if (!SSL_set_tlsext_opaque_prf_input(ssl, arg->input, arg->len))
- return 0;
- return arg->ret;
-}
-#endif
-
int
main(int argc, char *argv[])
{
@@ -747,13 +722,6 @@ bad:
SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
-#ifdef TLSEXT_TYPE_opaque_prf_input
- SSL_CTX_set_tlsext_opaque_prf_input_callback(c_ctx, opaque_prf_input_cb);
- SSL_CTX_set_tlsext_opaque_prf_input_callback(s_ctx, opaque_prf_input_cb);
- SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(c_ctx, &co1); /* or &co2 or NULL */
- SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(s_ctx, &so1); /* or &so2 or NULL */
-#endif
-
if (!SSL_CTX_use_certificate_file(s_ctx, server_cert, SSL_FILETYPE_PEM)) {
ERR_print_errors(bio_err);
} else if (!SSL_CTX_use_PrivateKey_file(s_ctx,