commit 38e15bf848c285587b86054e2f5540862cc6a83f parent 34fc9301b4e5e9ad37807179ac39255cb4a6b5bd Author: kyle <kyle@getaddrinfo.net> Date: Sun, 6 Dec 2015 18:28:05 -0700 sl: print out ssl version and cipher Diffstat:
15 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/sl b/sl @@ -64,7 +64,9 @@ while (my $new_sock = $listen_sock->accept()) { SSL_cert_file => 'ssl/cert_chain.pem', SSL_key_file => 'ssl/privkey.pem' ) or die "failed to ssl handshake: $SSL_ERROR"; - #log_print(IO::Socket::SSL->get_fingerprint($new_sock) . "\n"); + my $ssl_ver = $new_sock->get_sslversion(); + my $ssl_cipher = $new_sock->get_cipher(); + log_print("ssl started, ver = '$ssl_ver' cipher = '$ssl_cipher'\n"); # each child opens their own database connection my $dbh = DBI->connect( diff --git a/tests/add_friend/server.log.good b/tests/add_friend/server.log.good @@ -1,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' unknown device <base64> unknown device <base64> unknown device <base64> diff --git a/tests/bad_msg/server.log.good b/tests/bad_msg/server.log.good @@ -1,4 +1,5 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: unknown message type 0xbadd disconnected! diff --git a/tests/double_register/server.log.good b/tests/double_register/server.log.good @@ -1,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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/mutual_friends_basic/server.log.good b/tests/mutual_friends_basic/server.log.good @@ -1,7 +1,9 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new connection (pid = <digits>) +ssl started, 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,4 +1,5 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> disconnected! diff --git a/tests/new_device_bad_phnum/server.log.good b/tests/new_device_bad_phnum/server.log.good @@ -1,4 +1,5 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: received phone number '403867530&' invalid disconnected! diff --git a/tests/new_list/server.log.good b/tests/new_list/server.log.good @@ -1,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, 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,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: name field missing disconnected! diff --git a/tests/payload_invalid/server.log.good b/tests/payload_invalid/server.log.good @@ -1,8 +1,10 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: 7000 byte message too large disconnected! new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: received phone number <digits> invalid device id <digits> invalid device id <digits> invalid diff --git a/tests/two_lists_same_name/server.log.good b/tests/two_lists_same_name/server.log.good @@ -1,5 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) +ssl started, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' new_device: success <digits> <base64> new_list: <string> new_list: adding first member devid = <base64>