commit 84bcca0010053d61cae27f9297b72bb58a102bac parent d688035222641b7d8a72c89639e9e58435893bae Author: kyle <kyle@0x30.net> Date: Sun, 27 Dec 2015 20:39:26 -0700 sl: tweak ssl started message Diffstat:
15 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sl b/sl @@ -64,7 +64,7 @@ while (my $client_sock = $listen_sock->accept()) { ) or die "failed ssl handshake: $SSL_ERROR"; my $ssl_ver = $client_sock->get_sslversion(); my $ssl_cipher = $client_sock->get_cipher(); - log_print("ssl started, ver = '$ssl_ver' cipher = '$ssl_cipher'\n"); + log_print("ssl ok, ver = '$ssl_ver' cipher = '$ssl_cipher'\n"); # open a new database connection my $dbh = DBI->connect( diff --git a/tests/add_friend/server.log.good b/tests/add_friend/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> add_friend: <base64> adding <digits> disconnected! diff --git a/tests/add_friend_bad_num/server.log.good b/tests/add_friend_bad_num/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> add_friend: <base64> adding <base64> add_friend: bad friends number <base64> diff --git a/tests/bad_deviceid/server.log.good b/tests/bad_deviceid/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' device_id: unknown device <base64> device_id: '&^%_invalid_base64' not base64 device_id: unknown device <base64> diff --git a/tests/bad_msg/server.log.good b/tests/bad_msg/server.log.good @@ -1,4 +1,4 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: unknown message type 47837 diff --git a/tests/double_register/server.log.good b/tests/double_register/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_device: phone number <digits> already exists disconnected! diff --git a/tests/leave_list_self/server.log.good b/tests/leave_list_self/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: <string> new_list: adding first member devid = <base64> diff --git a/tests/list_request_basic/server.log.good b/tests/list_request_basic/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: <string> new_list: adding first member devid = <base64> diff --git a/tests/msg_ok/server.log.good b/tests/msg_ok/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> ok: device <base64> checking in disconnected! diff --git a/tests/mutual_friends_basic/server.log.good b/tests/mutual_friends_basic/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> add_friend: <base64> adding <digits> add_friend: added friend is a member @@ -11,7 +11,7 @@ list_request: found mutual friend <base64> list_request: found mutual friends list <string> disconnected! new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> add_friend: <base64> adding <digits> add_friend: added friend is a member diff --git a/tests/new_device/server.log.good b/tests/new_device/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_device: phone number '403867530&' invalid disconnected! diff --git a/tests/new_list/server.log.good b/tests/new_list/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: <string> new_list: adding first member devid = <base64> diff --git a/tests/new_list_missing_name/server.log.good b/tests/new_list_missing_name/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: error, no name disconnected! diff --git a/tests/payload_invalid/server.log.good b/tests/payload_invalid/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: 7000 byte message too large new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' diff --git a/tests/two_lists_same_name/server.log.good b/tests/two_lists_same_name/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) -ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' +ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: <string> new_list: adding first member devid = <base64>