jiigen666/libtorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve SSL error reporting and fix torrent_info::ssl_cert() bug

Browse Source
This commit is contained in:
Arvid Norberg
2014-01-20 01:01:03 +00:00
parent 8ab1d8b686
commit dca3f3c1a8
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/test_ssl.cpp
View File

@@ -142,7 +142,7 @@ void test_ssl(int test_idx, bool use_utp)
file.close();
add_torrent_params addp;
addp.save_path = ".";
addp.save_path = "tmp1_ssl";
addp.flags &= ~add_torrent_params::flag_paused;
addp.flags &= ~add_torrent_params::flag_auto_managed;
@@ -339,6 +339,7 @@ bool try_connect(session& ses1, int port
if (flags & (valid_certificate | invalid_certificate))
{
fprintf(stderr, "set_password_callback\n");
ctx.set_password_callback(boost::bind(&password_callback, _1, _2, "test"), ec);
if (ec)
{
@@ -347,6 +348,7 @@ bool try_connect(session& ses1, int port
TEST_CHECK(!ec);
return false;
}
fprintf(stderr, "use_certificate_file \"%s\"\n", certificate.c_str());
ctx.use_certificate_file(certificate, context::pem, ec);
if (ec)
{
@@ -355,6 +357,7 @@ bool try_connect(session& ses1, int port
TEST_CHECK(!ec);
return false;
}
fprintf(stderr, "use_private_key_file \"%s\"\n", private_key.c_str());
ctx.use_private_key_file(private_key, context::pem, ec);
if (ec)
{
@@ -363,6 +366,7 @@ bool try_connect(session& ses1, int port
TEST_CHECK(!ec);
return false;
}
fprintf(stderr, "use_tmp_dh_file \"%s\"\n", dh_params.c_str());
ctx.use_tmp_dh_file(dh_params, ec);
if (ec)
{
@@ -375,7 +379,7 @@ bool try_connect(session& ses1, int port
boost::asio::ssl::stream<boost::asio::ip::tcp::socket> ssl_sock(ios, ctx);
fprintf(stderr, "connecting\n");
fprintf(stderr, "connecting 127.0.0.1:%d\n", port);
ssl_sock.lowest_layer().connect(tcp::endpoint(
address_v4::from_string("127.0.0.1"), port), ec);
print_alerts(ses1, "ses1", true, true, true, &on_alert);
@@ -493,8 +497,10 @@ void test_malicious_peer()
, 16 * 1024, 13, false, combine_path("..", combine_path("ssl", "root_ca_cert.pem")));
file.close();
TEST_CHECK(!t->ssl_cert().empty());
add_torrent_params addp;
addp.save_path = ".";
addp.save_path = "tmp3_ssl";
addp.flags &= ~add_torrent_params::flag_paused;
addp.flags &= ~add_torrent_params::flag_auto_managed;
addp.ti = t;
@@ -502,9 +508,9 @@ void test_malicious_peer()
torrent_handle tor1 = ses1.add_torrent(addp, ec);
tor1.set_ssl_certificate(
combine_path("ssl", "peer_certificate.pem")
, combine_path("ssl", "peer_private_key.pem")
, combine_path("ssl", "dhparams.pem")
combine_path("..", combine_path("ssl", "peer_certificate.pem"))
, combine_path("..", combine_path("ssl", "peer_private_key.pem"))
, combine_path("..", combine_path("ssl", "dhparams.pem"))
, "test");
wait_for_listen(ses1, "ses1");