rex-socket 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 679b9b84b7330ecd3b3c19bf55e6829bdf5c55f19ec928902867e58200a1b6f7
-  data.tar.gz: e083b54db2bd91b5de5ca8db7a795443bff6f52fc2cb3dee695e0c3b869af0a7
+SHA1:
+  metadata.gz: d324f9013128cde497a5e115e4c7573c6700add0
+  data.tar.gz: 9b45082ec8785468b0a5a36c6bf5eee8b8e50ca4
 SHA512:
-  metadata.gz: c33ba960993643b36c4a9fe36772094ee2ac9396b928e63ec78f2d04c79f7396dba4aaa08aad61180f179471679c94e319392ed3eb4e7203f50c1e0c254c04be
-  data.tar.gz: d02f730116d109024e0364f4b8612b584e11fbc1307166321a4178b75b307699a6f9301fa78df913b77e541e373506bcd18b028d2db2bfb4d725a81e84c5f4b0
+  metadata.gz: 46cdc0c917347c6754763f072d9cd4ccee6121904cf591d153ba4ff860a1e7182a5906353bb8574ac0cee3b4668a36c7916900721a7c04e9dd7d5561487d9121
+  data.tar.gz: a9b518568244c4dc29f92fc2a273aa45c9cfdd8f17212693839e40406fe0e285d149661fb0a2bd0d18b6032a22e4bee25a17569dd4369f378a3972c3256b5acd

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+[搚�����mNb���*��D�����pz�ɘ��ua����	�0J�su��̾1�֨���'��5����)����\b <��Y�������[,�;)�3	�3�q��@	�h���2��C�|�*v;�����Q7b��:�&F��i�`��LL�Z��N�V�+K��

data.tar.gz.sig

@@ -0,0 +1,3 @@
+�6,|���V�-uVȎ�wh�J��ì*�m�Fʅ�&^�Q��l2дSRq��d���F|	R4��i|���ݣ|��]��<D�<Ո2}�����̍�|����ӡo��*�᳗�3�ō߂C��L����!���x�4m�����>�P~8}���b5s��k�
+����Mj	�q��j�ӷ�$I��ߡ�[���8�0�w��^.�`���IM����P��mǭ
+
n$�����*�h�����va��s

data/lib/rex/socket/ssl.rb

@@ -13,10 +13,12 @@ module Rex::Socket::Ssl
 
   module CertProvider
 
-    def self.ssl_generate_subject(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
-      st  = Rex::Text.rand_state
-      loc = Rex::Text.rand_name.capitalize
-      "/C=US/ST=#{st}/L=#{loc}/O=#{org.capitalize}/CN=#{cn}"
+    def self.ssl_generate_subject(cn: nil, org: nil, loc: nil, st: nil)
+      st  ||= Rex::Text.rand_state
+      loc ||= Rex::Text.rand_name.capitalize
+      org ||= Rex::Text.rand_name.capitalize
+      cn  ||= Rex::Text.rand_hostname
+      "/C=US/ST=#{st}/L=#{loc}/O=#{org}/CN=#{cn}"
     end
 
     def self.ssl_generate_issuer
@@ -30,11 +32,11 @@ module Rex::Socket::Ssl
     # certificate. This matches a typical "snakeoil" cert.
     #
     # @return [String, String, Array]
-    def self.ssl_generate_certificate(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
+    def self.ssl_generate_certificate(cert_vars: {}, **opts)
       yr      = 24*3600*365
       vf      = Time.at(Time.now.to_i - rand(yr * 3) - yr)
       vt      = Time.at(vf.to_i + (rand(9)+1) * yr)
-      subject = ssl_generate_subject(cn, org)
+      subject = ssl_generate_subject(**cert_vars)
       issuer  = ssl_generate_issuer
       key     = OpenSSL::PKey::RSA.new(2048){ }
       cert    = OpenSSL::X509::Certificate.new
@@ -88,8 +90,8 @@ module Rex::Socket::Ssl
     @@cert_provider.ssl_generate_issuer
   end
 
-  def self.ssl_generate_certificate(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
-    @@cert_provider.ssl_generate_certificate(cn, org)
+  def self.ssl_generate_certificate(**opts)
+    @@cert_provider.ssl_generate_certificate(**opts)
   end
 
   #
@@ -102,8 +104,8 @@ module Rex::Socket::Ssl
   #
   # Shim for the ssl_generate_certificate module method
   #
-  def ssl_generate_certificate(cn = Rex::Text.rand_hostname, org = Rex::Text.rand_name)
-    Rex::Socket::Ssl.ssl_generate_certificate(cn, org)
+  def ssl_generate_certificate(**opts)
+    Rex::Socket::Ssl.ssl_generate_certificate(**opts)
   end
 
   #
@@ -117,7 +119,7 @@ module Rex::Socket::Ssl
     if params.ssl_cert
       key, cert, chain = ssl_parse_pem(params.ssl_cert)
     else
-      key, cert, chain = ssl_generate_certificate(params.ssl_cn)
+      key, cert, chain = ssl_generate_certificate(cert_vars: {cn: params.ssl_cn})
     end
 
     ctx = OpenSSL::SSL::SSLContext.new()

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.19"
+    VERSION = "0.1.20"
   end
 end

metadata

@@ -1,14 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.20
 platform: ruby
 authors:
 - David Maloney
 autorequire: 
 bindir: exe
-cert_chain: []
-date: 2019-08-28 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4G
+  A1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNp
+  Z24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4
+  MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxTaWduIFJvb3QgQ0EgLSBSMzETMBEG
+  A1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2lnbjCCASIwDQYJKoZI
+  hvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWtiHL8
+  RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsT
+  gHeMCOFJ0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmm
+  KPZpO/bLyCiR5Z2KYVc3rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zd
+  QQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjlOCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZ
+  XriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2xmmFghcCAwEAAaNCMEAw
+  DgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFI/wS3+o
+  LkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZU
+  RUm7lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMp
+  jjM5RcOO5LlXbKr8EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK
+  6fBdRoyV3XpYKBovHd7NADdBj+1EbddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQX
+  mcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18YIvDQVETI53O9zJrlAGomecs
+  Mx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7rkpeDMdmztcpH
+  WD9f
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIElDCCA3ygAwIBAgIOSBtqBybS6D8mAtSCWs0wDQYJKoZIhvcNAQELBQAwTDEg
+  MB4GA1UECxMXR2xvYmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2Jh
+  bFNpZ24xEzARBgNVBAMTCkdsb2JhbFNpZ24wHhcNMTYwNjE1MDAwMDAwWhcNMjQw
+  NjE1MDAwMDAwWjBaMQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBu
+  di1zYTEwMC4GA1UEAxMnR2xvYmFsU2lnbiBDb2RlU2lnbmluZyBDQSAtIFNIQTI1
+  NiAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjYVVI6kfU6/J
+  7TbCKbVu2PlC9SGLh/BDoS/AP5fjGEfUlk6Iq8Zj6bZJFYXx2Zt7G/3YSsxtToZA
+  F817ukcotdYUQAyG7h5LM/MsVe4hjNq2wf6wTjquUZ+lFOMQ5pPK+vldsZCH7/g1
+  LfyiXCbuexWLH9nDoZc1QbMw/XITrZGXOs5ynQYKdTwfmOPLGC+MnwhKkQrZ2TXZ
+  g5J2Yl7fg67k1gFOzPM8cGFYNx8U42qgr2v02dJsLBkwXaBvUt/RnMngDdl1EWWW
+  2UO0p5A5rkccVMuxlW4l3o7xEhzw127nFE2zGmXWhEpX7gSvYjjFEJtDjlK4Prau
+  niyX/4507wIDAQABo4IBZDCCAWAwDgYDVR0PAQH/BAQDAgEGMB0GA1UdJQQWMBQG
+  CCsGAQUFBwMDBggrBgEFBQcDCTASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQW
+  BBQPOueslJF0LZYCc4OtnC5JPxmqVDAfBgNVHSMEGDAWgBSP8Et/qC5FJK5NUPpj
+  move4t0bvDA+BggrBgEFBQcBAQQyMDAwLgYIKwYBBQUHMAGGImh0dHA6Ly9vY3Nw
+  Mi5nbG9iYWxzaWduLmNvbS9yb290cjMwNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDov
+  L2NybC5nbG9iYWxzaWduLmNvbS9yb290LXIzLmNybDBjBgNVHSAEXDBaMAsGCSsG
+  AQQBoDIBMjAIBgZngQwBBAEwQQYJKwYBBAGgMgFfMDQwMgYIKwYBBQUHAgEWJmh0
+  dHBzOi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMA0GCSqGSIb3DQEB
+  CwUAA4IBAQAVhCgM7aHDGYLbYydB18xjfda8zzabz9JdTAKLWBoWCHqxmJl/2DOK
+  XJ5iCprqkMLFYwQL6IdYBgAHglnDqJQy2eAUTaDVI+DH3brwaeJKRWUtTUmQeGYy
+  DrBowLCIsI7tXAb4XBBIPyNzujtThFKAzfCzFcgRCosFeEZZCNS+t/9L9ZxqTJx2
+  ohGFRYzUN+5Q3eEzNKmhHzoL8VZEim+zM9CxjtEMYAfuMsLwJG+/r/uBAXZnxKPo
+  4KvcM1Uo42dHPOtqpN+U6fSmwIHRUphRptYCtzzqSu/QumXSN4NTS35nfIxA9gcc
+  sK8EBtz4bEaIcpzrTp3DsLlUo7lOl8oU
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIE5jCCA86gAwIBAgIMKDuO03uv6RWXR1uAMA0GCSqGSIb3DQEBCwUAMFoxCzAJ
+  BgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMTAwLgYDVQQDEydH
+  bG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gU0hBMjU2IC0gRzMwHhcNMTYwOTEz
+  MTgxMDIyWhcNMTkxMTExMTUxNTM4WjBgMQswCQYDVQQGEwJVUzEWMBQGA1UECBMN
+  TWFzc2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMRMwEQYDVQQKEwpSYXBpZDcg
+  TExDMRMwEQYDVQQDEwpSYXBpZDcgTExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+  MIIBCgKCAQEAl0HeC0FzN1BJ4nQkxsBng3peS9Bdi9rpSGx+g0Ximd+M/7twmund
+  bzn2JPbNK/Gp/rq/SytrNSLcUzcbH/0z5Ltyw1/jQsGtRBrns0NZSRXqupQDW5R6
+  HFpaIAl3OdsesmIQc/fm0uhh8dkfHVo7UsZO/TeCPoy0uHXTI6aFBPzMMsdz+gf3
+  cCCLsnNKQh/T2Q/jwBs3NTPoyza/pPZcvGogKcWCeNihTO5Rn1Fc71sMHSjQsDtn
+  1fWGKYGi0qjvZ4lpGM9IFZMTbySKHbPLhhHnBOoV7avGemdky3AEsUeiT+6DY0P1
+  IydBy24uVNhGATglME1ttlT4Eme/to0M6wIDAQABo4IBpDCCAaAwDgYDVR0PAQH/
+  BAQDAgeAMIGUBggrBgEFBQcBAQSBhzCBhDBIBggrBgEFBQcwAoY8aHR0cDovL3Nl
+  Y3VyZS5nbG9iYWxzaWduLmNvbS9jYWNlcnQvZ3Njb2Rlc2lnbnNoYTJnM29jc3Au
+  Y3J0MDgGCCsGAQUFBzABhixodHRwOi8vb2NzcDIuZ2xvYmFsc2lnbi5jb20vZ3Nj
+  b2Rlc2lnbnNoYTJnMzBWBgNVHSAETzBNMEEGCSsGAQQBoDIBMjA0MDIGCCsGAQUF
+  BwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNvbS9yZXBvc2l0b3J5LzAIBgZn
+  gQwBBAEwCQYDVR0TBAIwADA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmds
+  b2JhbHNpZ24uY29tL2dzY29kZXNpZ25zaGEyZzMuY3JsMBMGA1UdJQQMMAoGCCsG
+  AQUFBwMDMB0GA1UdDgQWBBSm8RBpBC/cK9VmxzO2+RWnacN8CTAfBgNVHSMEGDAW
+  gBQPOueslJF0LZYCc4OtnC5JPxmqVDANBgkqhkiG9w0BAQsFAAOCAQEANVO3uYQl
+  h8iicbaXE3odrL+kXXmeeNgt4BD3x7GKAVIVixtwBS6pvrshjc1LN0tm3ruiv8oy
+  cq4FiEmVUXZejSRvVVtABeWdZWo+lJ8NxCBUEYYmnMrjgFIbGiEbBsg7PGtyeQsA
+  5Wbg7Lx889mS1tKfQBcPif8EjpTiXNfMiywmpaMYmvm+yQgzrRLDbjz6JV0Rc5Ga
+  WChka+LTPnMtsWJuFM8ka8icMeS28/nAGERdewxWvz+DeAPMORdTJ7aqb6+Y9xuz
+  G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
+  8mVuTXnyJOKRJA==
+  -----END CERTIFICATE-----
+date: 2019-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: The Ruby Exploitation (Rex) Socket Abstraction Library.