Merge remote-tracking branch 'origin/master'

Author: Michael Schaarschmidt

lib/net/ldap/password.rb

@@ -2,6 +2,7 @@
 require 'digest/sha1'
 require 'digest/md5'
 require 'base64'
+require 'securerandom'
 
 class Net::LDAP::Password
   class << self
@@ -26,7 +27,7 @@ def generate(type, str)
          when :sha
             attribute_value = '{SHA}' + Base64.encode64(Digest::SHA1.digest(str)).chomp! 
          when :ssha
-            srand; salt = (rand * 1000).to_i.to_s 
+	    salt = SecureRandom.random_bytes(16)
             attribute_value = '{SSHA}' + Base64.encode64(Digest::SHA1.digest(str + salt) + salt).chomp!
          else
             raise Net::LDAP::LdapError, "Unsupported password-hash type (#{type})"