facets 2.0.5 → 2.1.0

data/lib/more/facets/crypt.rb

@@ -39,6 +39,7 @@
 #
 #   - Poul-Henning Kamp
 
+require 'stringio'
 
 # = Crypt(3)
 #
@@ -170,45 +171,258 @@ module Crypt
 end
 
 
+class BiCrypt
 
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
+  ULONG   = 0x100000000
 
-=begin test
+  def block_size
+    return(8)
+  end
 
-  require "test/unit"
+  def initialize(userKey)
+
+    # These are the S-boxes given in Applied Cryptography 2nd Ed., p. 333
+    @sBox = [
+      [4, 10, 9, 2, 13, 8, 0, 14, 6, 11, 1, 12, 7, 15, 5, 3],
+      [14, 11, 4, 12, 6, 13, 15, 10, 2, 3, 8, 1, 0, 7, 5, 9],
+      [5, 8, 1, 13, 10, 3, 4, 2, 14, 15, 12, 7, 6, 0, 9, 11],
+      [7, 13, 10, 1, 0, 8, 9, 15, 14, 4, 6, 12, 11, 2, 5, 3],
+      [6, 12, 7, 1, 5, 15, 13, 8, 4, 10, 9, 14, 0, 3, 11, 2],
+      [4, 11, 10, 0, 7, 2, 1, 13, 3, 6, 8, 5, 9, 12, 15, 14],
+      [13, 11, 4, 1, 3, 15, 5, 9, 0, 10, 14, 7, 6, 8, 2, 12],
+      [1, 15, 13, 0, 5, 7, 10, 4, 9, 2, 3, 14, 6, 11, 8, 12]
+    ]
+
+    # These are the S-boxes given in the GOST source code listing in Applied
+    # Cryptography 2nd Ed., p. 644.  They appear to be from the DES S-boxes
+    # [13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7 ],
+    # [ 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1 ],
+    # [12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11 ],
+    # [ 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9 ],
+    # [ 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15 ],
+    # [10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8 ],
+    # [15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10 ],
+    # [14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7 ]
+
+    # precalculate the S table
+    @sTable = precalculate_S_table()
+
+    # derive the 32-byte key from the user-supplied key
+    userKeyLength = userKey.length
+    @key = userKey[0..31].unpack('C'*32)
+    if (userKeyLength < 32)
+      userKeyLength.upto(31) { @key << 0 }
+    end
+  end
 
-  class CryptTest < Test::Unit::TestCase
 
-    def array_test(arr, algo)
-      arr.each do |password, hash|
-        assert(Crypt.check(password, hash, algo))
-      end
+  def precalculate_S_table()
+    sTable = [[], [], [], []]
+    0.upto(3) { |i|
+      0.upto(255) { |j|
+        t = @sBox[2*i][j % 16] | (@sBox[2*i+1][j/16] << 4)
+        u = (8*i + 11) % 32
+        v = (t << u) | (t >> (32-u))
+        sTable[i][j] = (v % ULONG)
+      }
+    }
+    return(sTable)
+  end
+
+
+  def f(longWord)
+    longWord = longWord % ULONG
+    a, b, c, d = [longWord].pack('L').unpack('CCCC')
+    return(@sTable[3][d] ^ @sTable[2][c] ^ @sTable[1][b] ^ @sTable[0][a])
+  end
+
+  def encrypt_pair(xl, xr)
+    3.times {
+      xr ^= f(xl+@key[0])
+      xl ^= f(xr+@key[1])
+      xr ^= f(xl+@key[2])
+      xl ^= f(xr+@key[3])
+      xr ^= f(xl+@key[4])
+      xl ^= f(xr+@key[5])
+      xr ^= f(xl+@key[6])
+      xl ^= f(xr+@key[7])
+    }
+    xr ^= f(xl+@key[7])
+    xl ^= f(xr+@key[6])
+    xr ^= f(xl+@key[5])
+    xl ^= f(xr+@key[4])
+    xr ^= f(xl+@key[3])
+    xl ^= f(xr+@key[2])
+    xr ^= f(xl+@key[1])
+    xl ^= f(xr+@key[0])
+    return([xr, xl])
+  end
+
+
+  def decrypt_pair(xl, xr)
+    xr ^= f(xl+@key[0])
+    xl ^= f(xr+@key[1])
+    xr ^= f(xl+@key[2])
+    xl ^= f(xr+@key[3])
+    xr ^= f(xl+@key[4])
+    xl ^= f(xr+@key[5])
+    xr ^= f(xl+@key[6])
+    xl ^= f(xr+@key[7])
+    3.times {
+      xr ^= f(xl+@key[7])
+      xl ^= f(xr+@key[6])
+      xr ^= f(xl+@key[5])
+      xl ^= f(xr+@key[4])
+      xr ^= f(xl+@key[3])
+      xl ^= f(xr+@key[2])
+      xr ^= f(xl+@key[1])
+      xl ^= f(xr+@key[0])
+    }
+    return([xr, xl])
+  end
+
+  def encrypt_block(block)
+    xl, xr = block.unpack('NN')
+    xl, xr = encrypt_pair(xl, xr)
+    encrypted = [xl, xr].pack('NN')
+    return(encrypted)
+  end
+
+
+  def decrypt_block(block)
+    xl, xr = block.unpack('NN')
+    xl, xr = decrypt_pair(xl, xr)
+    decrypted = [xl, xr].pack('NN')
+    return(decrypted)
+  end
+
+  # When this module is mixed in with an encryption class, the class
+  # must provide three methods: encrypt_block(block) and decrypt_block(block)
+  # and block_size()
+
+  def generate_initialization_vector(words)
+    srand(Time.now.to_i)
+    vector = ""
+    words.times {
+      vector << [rand(ULONG)].pack('N')
+    }
+    return(vector)
+  end
+
+
+  def encrypt_stream(plainStream, cryptStream)
+    # Cypher-block-chain mode
+
+    initVector = generate_initialization_vector(block_size() / 4)
+    chain = encrypt_block(initVector)
+    cryptStream.write(chain)
+
+    while ((block = plainStream.read(block_size())) && (block.length == block_size()))
+      block = block ^ chain
+      encrypted = encrypt_block(block)
+      cryptStream.write(encrypted)
+      chain = encrypted
     end
 
-    def test_md5
-      a = [ [' ', '$1$yiiZbNIH$YiCsHZjcTkYd31wkgW8JF.'],
-        ['pass', '$1$YeNsbWdH$wvOF8JdqsoiLix754LTW90'],
-        ['____fifteen____', '$1$s9lUWACI$Kk1jtIVVdmT01p0z3b/hw1'],
-        ['____sixteen_____', '$1$dL3xbVZI$kkgqhCanLdxODGq14g/tW1'],
-        ['____seventeen____', '$1$NaH5na7J$j7y8Iss0hcRbu3kzoJs5V.'],
-        ['__________thirty-three___________', '$1$HO7Q6vzJ$yGwp2wbL5D7eOVzOmxpsy.'],
-        ['apache', '$apr1$J.w5a/..$IW9y6DR0oO/ADuhlMF5/X1']
-      ]
-      array_test(a, :md5)
+    # write the final block
+    # At most block_size()-1 bytes can be part of the message.
+    # That means the final byte can be used to store the number of meaningful
+    # bytes in the final block
+    block = '' if block.nil?
+    buffer = block.split('')
+    remainingMessageBytes = buffer.length
+    # we use 7-bit characters to avoid possible strange behavior on the Mac
+    remainingMessageBytes.upto(block_size()-2) { buffer << rand(128).chr }
+    buffer << remainingMessageBytes.chr
+    block = buffer.join('')
+    block = block ^ chain
+    encrypted = encrypt_block(block)
+    cryptStream.write(encrypted)
+  end
+
+
+  def decrypt_stream(cryptStream, plainStream)
+    # Cypher-block-chain mode
+    chain = cryptStream.read(block_size())
+
+    while (block = cryptStream.read(block_size()))
+      decrypted = decrypt_block(block)
+      plainText = decrypted ^ chain
+      plainStream.write(plainText) unless cryptStream.eof?
+      chain = block
     end
 
-    def test_bad_algo
-      assert_raise(ArgumentError) do
-        Crypt.crypt("qsdf", :qsdf)
-      end
+    # write the final block, omitting the padding
+    buffer = plainText.split('')
+    remainingMessageBytes = buffer.last.unpack('C').first
+    remainingMessageBytes.times { plainStream.write(buffer.shift) }
+  end
+
+
+  def carefully_open_file(filename, mode)
+    begin
+      aFile = File.new(filename, mode)
+    rescue
+      puts "Sorry. There was a problem opening the file <#{filename}>."
+      aFile.close() unless aFile.nil?
+      raise
     end
+    return(aFile)
+  end
+
+
+  def encrypt_file(plainFilename, cryptFilename)
+    plainFile = carefully_open_file(plainFilename, 'rb')
+    cryptFile = carefully_open_file(cryptFilename, 'wb+')
+    encrypt_stream(plainFile, cryptFile)
+    plainFile.close unless plainFile.closed?
+    cryptFile.close unless cryptFile.closed?
+  end
+
 
+  def decrypt_file(cryptFilename, plainFilename)
+    cryptFile = carefully_open_file(cryptFilename, 'rb')
+    plainFile = carefully_open_file(plainFilename, 'wb+')
+    decrypt_stream(cryptFile, plainFile)
+    cryptFile.close unless cryptFile.closed?
+    plainFile.close unless plainFile.closed?
   end
 
-=end
 
+  def encrypt_string(plainText)
+    plainStream = StringIO.new(plainText)
+    cryptStream = StringIO.new('')
+    encrypt_stream(plainStream, cryptStream)
+    cryptText = cryptStream.string
+    return(cryptText)
+  end
+
+
+  def decrypt_string(cryptText)
+    cryptStream = StringIO.new(cryptText)
+    plainStream = StringIO.new('')
+    decrypt_stream(cryptStream, plainStream)
+    plainText = plainStream.string
+    return(plainText)
+  end
+
+end
+
+
+class String
+
+  def ^(aString)
+    a = self.unpack('C'*(self.length))
+    b = aString.unpack('C'*(aString.length))
+    if (b.length < a.length)
+      (a.length - b.length).times { b << 0 }
+    end
+    xor = ""
+    0.upto(a.length-1) { |pos|
+      x = a[pos] ^ b[pos]
+      xor << x.chr()
+    }
+    return(xor)
+  end
+
+end

data/lib/more/facets/ziputils.rb

@@ -140,7 +140,7 @@ module ZipUtils
     raise ArgumentError if folder == '.*'
     # name of file to create
     file ||= File.basename(File.expand_path(folder)) + '.zip'
-    cmd = "zip -ru #{file} #{folder}"
+    cmd = "zip -rqu #{file} #{folder}"
     # display equivalent commandline
     if options[:verbose] or options[:dryrun]
       puts cmd

data/log/history.txt

@@ -0,0 +1,22 @@
+= Facets Revision History
+
+== 2.1.0 / 2007-11-10
+
+* Major Changes
+  * command.rb has been completely rewritten. The API has changed completely!
+  * There is no longer a Commmand::Optoins class. Use Console::Arguments instead.
+  * Added BiCrypt class to crypt.rb for simple two-way encyrption.
+* Minor Changes
+  * module/attr.rb now has attr_reader!, attr_writer! and attr_accessor!
+  * All attr_xxx methods have coresponding alias_xxx methods.
+  * Fixed bug in Enumerable#cluster_by which returned nil instead of [].
+
+== 2.0.5 / 2007-11-07
+
+* Major Changes
+  * Added final methods Gavin Sinclair's Extensions project (contributed by Noah Gibbs).
+* Minor Changes
+  * Fixes bug with Dictionary#initialize
+  * Fixes bug with Hash#-
+  * Also improves changelog production.
+

data/log/release.txt

@@ -0,0 +1,10 @@
+== 2.1.0 / 2007-11-10
+
+* Major Changes
+  * command.rb has been completely rewritten. The API has changed completely!
+  * There is no longer a Commmand::Optoins class. Use Console::Arguments instead.
+  * Added BiCrypt class to crypt.rb for simple two-way encyrption.
+* Minor Changes
+  * module/attr.rb now has attr_reader!, attr_writer! and attr_accessor!
+  * All attr_xxx methods have coresponding alias_xxx methods.
+  * Fixed bug in Enumerable#cluster_by which returned nil instead of [].

data/log/todo.txt

@@ -0,0 +1,4 @@
+== Facets To Do List
+
+* Write new command.rb tests.
+

data/meta/google_ad.html

@@ -0,0 +1,15 @@
+<div style="position: absolute; top: 5px; right: 10px;">
+  <script type="text/javascript"><!--
+  google_ad_client = "pub-1126154564663472";
+  google_ad_width = 234;
+  google_ad_height = 60;
+  google_ad_format = "234x60_as";
+  google_ad_type = "text_image";
+  //2007-08-31: facets
+  google_ad_channel = "2923120207";
+  //-->
+  </script>
+  <script type="text/javascript"
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+  </script>
+</div>

data/meta/icli.yaml

@@ -7,11 +7,11 @@ rubyforge:
     store     : pkg
     package   : All of Facets
     name      : facets
-    notelog   : RELEASE
-    changelog : doc/log/Changelog.txt
+    notelog   : WHATSNEW
+    changelog : log/release.txt
 
   publish: {}
 
   post:
-    file: RELEASE
+    file: WHATSNEW
 

data/meta/manifest.txt

@@ -2,7 +2,7 @@
 AUTHORS
 LICENSE
 README
-RELEASE
+WHATSNEW
 demo
 demo/bench
 demo/bench/enumerable
@@ -463,12 +463,23 @@ lib/methods/facets/module
 lib/methods/facets/module/alias_accessor.rb
 lib/methods/facets/module/alias_method_chain.rb
 lib/methods/facets/module/alias_module_function.rb
+lib/methods/facets/module/alias_reader.rb
+lib/methods/facets/module/alias_setter.rb
+lib/methods/facets/module/alias_switcher.rb
+lib/methods/facets/module/alias_tester.rb
+lib/methods/facets/module/alias_toggler.rb
+lib/methods/facets/module/alias_validator.rb
+lib/methods/facets/module/alias_writer.rb
 lib/methods/facets/module/all_instance_methods.rb
 lib/methods/facets/module/ancestor.rb
+lib/methods/facets/module/attr_accessor.rb
+lib/methods/facets/module/attr_reader.rb
 lib/methods/facets/module/attr_setter.rb
+lib/methods/facets/module/attr_switcher.rb
 lib/methods/facets/module/attr_tester.rb
 lib/methods/facets/module/attr_toggler.rb
 lib/methods/facets/module/attr_validator.rb
+lib/methods/facets/module/attr_writer.rb
 lib/methods/facets/module/basename.rb
 lib/methods/facets/module/by_name.rb
 lib/methods/facets/module/can.rb
@@ -726,12 +737,20 @@ lib/more/facets/uploadutils.rb
 lib/more/facets/version.rb
 lib/more/facets/yaml.rb
 lib/more/facets/ziputils.rb
+log
+log/changelog.txt
+log/history.txt
+log/release.txt
+log/todo.txt
 meta
-meta/facets-2.0.5.roll
+meta/facets-2.1.0.roll
+meta/google_ad.html
 meta/icli.yaml
 meta/manifest.txt
 task
 task/clean
+task/clobber
+task/clobber/package
 task/config
 task/config/general.yaml
 task/config/rdoc.yaml
@@ -745,6 +764,9 @@ task/methods
 task/prepare
 task/publish
 task/rdoc
+task/release
+task/special
+task/special/quickopts
 task/stats
 task/syntax
 task/test
@@ -886,7 +908,6 @@ test/unit/test_buildingblock.rb
 test/unit/test_bytes.rb
 test/unit/test_class_extension.rb
 test/unit/test_classmethods.rb
-test/unit/test_command.rb
 test/unit/test_compare_on.rb
 test/unit/test_conversion.rb
 test/unit/test_coroutine.rb