summaryrefslogtreecommitdiff
path: root/src/regress/lib/libssl
diff options
context:
space:
mode:
authormiod <>2014-06-13 04:29:13 +0000
committermiod <>2014-06-13 04:29:13 +0000
commit9ef9f06708ef4fe615f3485f5d82f3fb919fdf03 (patch)
tree4a096128d8787d1beedaa53fd558a98773de0840 /src/regress/lib/libssl
parentcc594d5ff9b7bb08404d34d62287ee1dfd6b8332 (diff)
downloadopenbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.gz
openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.tar.bz2
openbsd-9ef9f06708ef4fe615f3485f5d82f3fb919fdf03.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 'src/regress/lib/libssl')
-rw-r--r--src/regress/lib/libssl/ssl/ssltest.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/src/regress/lib/libssl/ssl/ssltest.c b/src/regress/lib/libssl/ssl/ssltest.c
index 38c70906bb..ad24b1f713 100644
--- a/src/regress/lib/libssl/ssl/ssltest.c
+++ b/src/regress/lib/libssl/ssl/ssltest.c
@@ -380,31 +380,6 @@ err:
380 } 380 }
381} 381}
382 382
383#ifdef TLSEXT_TYPE_opaque_prf_input
384 struct cb_info_st { void *input;
385 size_t len;
386 int ret;
387};
388
389struct cb_info_st co1 = { "C", 1, 1 }; /* try to negotiate oqaque PRF input */
390struct cb_info_st co2 = { "C", 1, 2 }; /* insist on oqaque PRF input */
391struct cb_info_st so1 = { "S", 1, 1 }; /* try to negotiate oqaque PRF input */
392struct cb_info_st so2 = { "S", 1, 2 }; /* insist on oqaque PRF input */
393
394int
395opaque_prf_input_cb(SSL *ssl, void *peerinput, size_t len, void *arg_)
396{
397 struct cb_info_st *arg = arg_;
398
399 if (arg == NULL)
400 return 1;
401
402 if (!SSL_set_tlsext_opaque_prf_input(ssl, arg->input, arg->len))
403 return 0;
404 return arg->ret;
405}
406#endif
407
408int 383int
409main(int argc, char *argv[]) 384main(int argc, char *argv[])
410{ 385{
@@ -747,13 +722,6 @@ bad:
747 722
748 SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb); 723 SSL_CTX_set_tmp_rsa_callback(s_ctx, tmp_rsa_cb);
749 724
750#ifdef TLSEXT_TYPE_opaque_prf_input
751 SSL_CTX_set_tlsext_opaque_prf_input_callback(c_ctx, opaque_prf_input_cb);
752 SSL_CTX_set_tlsext_opaque_prf_input_callback(s_ctx, opaque_prf_input_cb);
753 SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(c_ctx, &co1); /* or &co2 or NULL */
754 SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(s_ctx, &so1); /* or &so2 or NULL */
755#endif
756
757 if (!SSL_CTX_use_certificate_file(s_ctx, server_cert, SSL_FILETYPE_PEM)) { 725 if (!SSL_CTX_use_certificate_file(s_ctx, server_cert, SSL_FILETYPE_PEM)) {
758 ERR_print_errors(bio_err); 726 ERR_print_errors(bio_err);
759 } else if (!SSL_CTX_use_PrivateKey_file(s_ctx, 727 } else if (!SSL_CTX_use_PrivateKey_file(s_ctx,