rex-socket 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e03fb63e7486cc7a61cc293d0dbb37393498c616
-  data.tar.gz: 683f42beeb59df6ce2b424a206aa26790108d163
+  metadata.gz: c071cc13e6d51ecc958ae811200859e60675a57f
+  data.tar.gz: 661b1ebf9f43c87f1ef5f7760e484960db8267ec
 SHA512:
-  metadata.gz: 1e374551466dfb1faed2dffb38848a951d306e93206611b3d4cbefc2ecc0cfc5d6d2e69d18871679c6b4734809f66ea46c7d7019a99199b7df047359b01a58b7
-  data.tar.gz: d98c67986b353ccb5078ceb6a572fe2f40616b7c6f614b4d5855fdf09ca2ec89d2d1f7defd51ff9e6b0a3f63f400843048b329121a499f549dbb07dedae9fcf4
+  metadata.gz: 7f7ae577e318e988bb740583ba15fbcb2a1944a3b2a19b9a29da7ce188feff89257eda4c382107ad1f790c539e4406bfb6a5f4ae06f6c3cb4d0583581b80eaff
+  data.tar.gz: 9ce5bd1040689fdb16605e9ddb214c821ff62e928c4b59eaa1372681f03f02b3a7f8c5b4ff8fa2c235a7a56bc854998995e14dfc2ce329a8204dda2643dfa50b

data/lib/rex/socket.rb

@@ -289,10 +289,11 @@ module Socket
   # nil if it's not convertable.
   #
   def self.addr_atoc(mask)
+    bits = is_ipv6?(mask) ? 128 : 32
     mask_i = resolv_nbo_i(mask)
     cidr = nil
-    0.upto(32) do |i|
-      if ((1 << i)-1) << (32-i) == mask_i
+    0.upto(bits) do |i|
+      if ((1 << i)-1) << (bits - i) == mask_i
         cidr = i
         break
       end
@@ -304,9 +305,11 @@ module Socket
   # Resolves a CIDR bitmask into a dotted-quad. Returns
   # nil if it's not convertable.
   #
-  def self.addr_ctoa(cidr)
-    return nil unless (0..32) === cidr.to_i
-    addr_itoa(((1 << cidr)-1) << 32-cidr)
+  def self.addr_ctoa(cidr, v6: false)
+    bits = v6 ? 128 : 32
+    cidr = cidr.to_i
+    return nil unless (0..bits) === cidr
+    addr_itoa(((1 << cidr)-1) << bits-cidr, v6)
   end
 
   #

data/lib/rex/socket/version.rb

@@ -1,5 +1,5 @@
 module Rex
   module Socket
-    VERSION = "0.1.13"
+    VERSION = "0.1.14"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rex-socket
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - David Maloney
@@ -88,7 +88,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler