refactor pem parser to use the rex-socket gem version

use rex-socket's pem aprser instead of the old one we used
to have in rex::parser

MS-1715

Author: David Maloney

lib/msf/core/handler/reverse_http.rb

@@ -3,7 +3,7 @@
 require 'rex/sync/ref'
 require 'rex/payloads/meterpreter/uri_checksum'
 require 'rex/post/meterpreter'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 require 'msf/core/payload/windows/verify_ssl'
 require 'rex/user_agent'
 

lib/msf/core/payload/windows/verify_ssl.rb

@@ -1,7 +1,7 @@
 # -*- coding: binary -*-
 
 require 'msf/core'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 
 module Msf
 
@@ -25,7 +25,7 @@ def get_ssl_cert_hash(verify_cert, handler_cert)
       raise ArgumentError, "Verifying SSL cert is enabled but no handler cert is configured"
     end
 
-    hash = Rex::Parser::X509Certificate.get_cert_file_hash(handler_cert)
+    hash = Rex::Socket::X509Certificate.get_cert_file_hash(handler_cert)
     print_status("Meterpreter will verify SSL Certificate with SHA1 hash #{hash.unpack("H*").first}")
     hash
   end

lib/rex/payloads/meterpreter/config.rb

@@ -2,7 +2,7 @@
 require 'msf/core/payload/uuid'
 require 'msf/core/payload/windows'
 require 'msf/core/reflective_dll_loader'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 
 class Rex::Payloads::Meterpreter::Config
 

lib/rex/post/meterpreter/client_core.rb

@@ -13,7 +13,7 @@
 require 'rex/payloads/meterpreter/uri_checksum'
 
 # certificate hash checking
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 
 module Rex
 module Post
@@ -686,7 +686,7 @@ def transport_prepare_request(method, opts={})
       request.add_tlv(TLV_TYPE_TRANS_UA, opts[:ua])
 
       if transport == METERPRETER_TRANSPORT_HTTPS && opts[:cert]
-        hash = Rex::Parser::X509Certificate.get_cert_file_hash(opts[:cert])
+        hash = Rex::Socket::X509Certificate.get_cert_file_hash(opts[:cert])
         request.add_tlv(TLV_TYPE_TRANS_CERT_HASH, hash)
       end
 

lib/rex/socket/ssl_tcp_server.rb

@@ -2,7 +2,7 @@
 require 'rex/socket'
 require 'rex/socket/tcp_server'
 require 'rex/io/stream_server'
-require 'rex/parser/x509_certificate'
+require 'rex/socket/x509_certificate'
 
 ###
 #
@@ -115,7 +115,7 @@ def accept(opts = {})
   # @param [String] ssl_cert
   # @return [String, String, Array]
   def self.ssl_parse_pem(ssl_cert)
-    Rex::Parser::X509Certificate.parse_pem(ssl_cert)
+    Rex::Socket::X509Certificate.parse_pem(ssl_cert)
   end
 
   #