From 5ac18e9156640de8d4d5ae1220a1438ff1677f11 Mon Sep 17 00:00:00 2001 From: RageLtMan Date: Thu, 11 Apr 2013 19:11:25 -0400 Subject: [PATCH] commant update --- lib/rex/socket/parameters.rb | 14 +++++++++++++- lib/rex/socket/ssl_tcp.rb | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/lib/rex/socket/parameters.rb b/lib/rex/socket/parameters.rb index f5a08f6b5a..805f1181a2 100644 --- a/lib/rex/socket/parameters.rb +++ b/lib/rex/socket/parameters.rb @@ -68,6 +68,14 @@ class Rex::Socket::Parameters # # A file containing an SSL certificate (for server sockets) # + # [SSLCipher] + # + # Specify SSL cipher to use for context + # + # [SSLVerifyMode] + # + # Specify SSL cerificate verification mechanism + # # [Proxies] # # List of proxies to use. @@ -355,7 +363,11 @@ class Rex::Socket::Parameters # # The SSL certificate, in pem format, stored as a string. See +SslTcpServer#make_ssl+ # - attr_accessor :ssl_cert + attr_accessor :ssl_certa + # + # The SSL context verification mechanism + # + attr_accessor :ssl_verify_mode # # Whether we should use IPv6 # diff --git a/lib/rex/socket/ssl_tcp.rb b/lib/rex/socket/ssl_tcp.rb index 8615b7f5cd..273381dd75 100644 --- a/lib/rex/socket/ssl_tcp.rb +++ b/lib/rex/socket/ssl_tcp.rb @@ -72,7 +72,7 @@ begin self.sslctx = OpenSSL::SSL::SSLContext.new(version) # Configure the SSL context - # TODO: Allow the user to specify the verify mode and callback + # TODO: Allow the user to specify the verify mode callback # Valid modes: # VERIFY_CLIENT_ONCE # VERIFY_FAIL_IF_NO_PEER_CERT