tor257 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc6459576a0d752b91848a555a9983ce97e75e0
-  data.tar.gz: dd188829c42d946c92c79abd27831bce0a2e830a
+  metadata.gz: f89549934fb8710f963e0edacdb82adbd64d16eb
+  data.tar.gz: 872fa3a68230a6e00305340571e510d9b6eb8e01
 SHA512:
-  metadata.gz: 9fa19dd857c52a21eb240739a81a3baeeac58b69e06456ec3d7e4c9232373554b8fae5d970300f23fa4c7120eeb325b6d66f032a73c812ebacd47c3761ca5503
-  data.tar.gz: 65c788e83eeefbcbf6efc2de10b8c778b1251164d632bd3f1d4c5eb98ed721f30f74a8939f23a8364c747b466133176c81d2fcaa2876fd44ba4bbc5788f92094
+  metadata.gz: 3e1af237dd5dc985851ed96e031187cfc74648de9abe8249caff132b47db6637c9cea1773b6c8bd92c313ad887d2f06c8fbe73bb9656ed3184f07a68c56cca26
+  data.tar.gz: 747c227f786581177c1c59c8bd970963fd5e060d726b1871640fd2dc505f116fadee1217cfc47e19fb85c40bc719f341308530dd026cbed902a23c330458456d

data/CHANGELOG

@@ -1,3 +1,7 @@
+v0.2
+	- Improve usability
+	- Improve algorithm with bloc rotations
+
 v0.1
 	- Initialize the project
 	- Implement algorithm

data/bin/tor257

@@ -10,10 +10,14 @@ module Argument
     @@opt ||= OptionParser.new do |opts|
       opts.banner = "Usage: tor257 -p=keyphrase | -f=keyfile [-b=fd] [-v]"
 
-      opts.on("--verbose", "Developper mode (on STDERR)") do
+      opts.on("--verbose", "More verbose") do
         $verbose = true
       end
 
+      opts.on("--debug", "Developper mode (on STDERR)") do
+        $debug = true
+      end
+
       opts.on("--passphrase=pass", "Key (Passphrase)") do |key|
         $key = key
       end
@@ -39,29 +43,37 @@ module Argument
 
 end
 
-require 'tor257'
-
 begin
   Argument.parse
+
+  if $debug # to load local env
+    load Dir.pwd + '/lib/tor257.rb'
+  else
+    require 'tor257'
+  end
+
   include Tor257
 
   trap("SIGINT") do
     exit 0
   end
+
   key = Key.new($key)
+  i = 0
   loop do
-    str = STDIN.gets
+    str = STDIN.read 4096
     if str.nil?
       exit 0
     end
-    str.chomp!
     str = $fi64 ? Base64.decode64(str) : str
+    STDERR.puts "Bloc ##{i} [#{str}] with [#{key}]" if $verbose
     # STDERR.puts "\"#{str}\""
     m = Message.new str
     out = m.encrypt(key)
-    STDOUT.puts $fo64 ? Base64.encode64(out) : out
+    STDOUT.write $fo64 ? Base64.encode64(out) : out
+    i += 1
   end
 rescue => err
-  puts "Error: #{err.message}"
-  puts err.backtrace.join("\n") if $verbose
+  STDERR.puts "Error: #{err.message}"
+  STDERR.puts err.backtrace.join("\n") if $verbose
 end

data/lib/tor257.rb

@@ -1 +1 @@
-require_relative 'tor257/core.rb'
+require_relative 'tor257/core'

data/lib/tor257/Integer.rb

@@ -0,0 +1,8 @@
+class Integer
+
+  def ror count, size=32
+    count = count % size
+    ((self >> count) | (self << (size - count))) & (2**size-1)
+  end
+
+end

data/lib/tor257/core.rb

@@ -1,28 +1,35 @@
 # coding: utf-8
 
-def TOR257_KEYS(k)
+require_relative 'Integer'
+
+def TOR257_KEYS(k, offsets)
   [
-    ((k << 0) & 0xff) + ((k & 0b00000000) >> 8),
-    ((k << 2) & 0xff) + ((k & 0b11000000) >> 6),
-    ((k << 5) & 0xff) + ((k & 0b11111000) >> 3),
-    ((k << 7) & 0xff) + ((k & 0b11111110) >> 1)
+    k.ror(0 - offsets[0], 8),
+    k.ror(-2 - offsets[1], 8),
+    k.ror(-5 - offsets[2], 8),
+    k.ror(-7 - offsets[3], 8),
   ]
 end
 
-def TOR257_KEY(k)
-  TOR257_KEYS(k).inject(&:^)
+def TOR257_KEY(k, offsets)
+  TOR257_KEYS(k, offsets).inject(&:^)
 end
 
 # @param b [Integer 8b]
 # @param k [Integer 8b]
-def TOR257(b, k)
-  return b ^ TOR257_KEY(k)
+def TOR257(b, k, offsets)
+  return b ^ TOR257_KEY(k, offsets)
 end
 
 module Tor257
 
   class Key < String
 
+    def initialize s
+      super(s)
+      raise ArgumentError, "Key must be at least 32 bits strong" if size() < 4
+    end
+
     def subkey(i)
       # return self[i % self.size].bytes
       @koff = nil
@@ -55,17 +62,25 @@ module Tor257
 
   end
 
+  # The message can be cut in 32 bits blocs
   class Message < String
 
     def encrypt(key)
       raise ArgumentError unless key.is_a? Key
       i = 0
-      out = Message.new(self.bytes.map do |b|
-                          skey = key.subkey(i)
-                          skey.each{|k| b = TOR257(b, k) }
-                          i += 1
-                          b.chr
-                        end.join)
+      rotate_matrix = [1, 2, 4, 8]
+      out = self.bytes.map do |b|
+        skey = key.subkey(i)
+        STDERR.write "[#{b}]\t+ [#{skey}\t>> #{rotate_matrix}]\t-> " if $verbose
+        skey.each_with_index do |k|
+          b = TOR257(b, k, rotate_matrix)
+        end
+        STDERR.write " [#{b}]\n" if $verbose
+        i += 1
+        rotate_matrix.rotate! 1 if i % 4 == 0 # bloc of 32
+        b.chr
+      end.join
+      out = Message.new(out)
       out
     end
 

data/tor257.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'tor257'
-  s.version     = '0.1'
+  s.version     = '0.2'
   s.date        = Time.now.getgm.to_s.split.first
   s.summary     = File.read("CHANGELOG").match(/^v[^\n]+\n((\t[^\n]+\n)+)/m)[1].split("\t").join
   s.description = 'An experimental encryption algorithm'
@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.email       = ['poulet_a@epitech.eu']
   s.files       = %w(
 lib/tor257.rb
+lib/tor257/Integer.rb
 lib/tor257/core.rb
 
 README.md

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tor257
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - poulet_a
@@ -59,6 +59,7 @@ files:
 - README.md
 - bin/tor257
 - lib/tor257.rb
+- lib/tor257/Integer.rb
 - lib/tor257/core.rb
 - tor257.gemspec
 homepage: https://github.com/pouleta/tor257
@@ -84,6 +85,6 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: "- Initialize the project - Implement algorithm"
+summary: "- Improve usability - Improve algorithm with bloc rotations"
 test_files: []
 has_rdoc: 

metadata.gz.sig

@@ -1,2 +1,3 @@
-���ߢ�Ty�-W�p�z���\3*Wg�|?�/�	81�#��g|y���ԂV���׎I	[��\9��`�
	�Y���Aˀ���x�%�+��\bx�Z ���b���/q"N��m!S@��.����
-a:wG���;����^_���Ư�~�Qd�+IAG�ݫe��)A�x�X�5�2>ln�����ќ�����-{WWu.R��X??�@
+�w����QZp������8dY��y������4j�W�Ju1��L�A�ƥ��)_��(�[�
+�I��L67.���c����ξ"�`�me��ӕs��f�����0��zn�)��
��&�"�o~@T�T��
+�q��6fW1D�db�'U�k��u�B5�/��WV�>MkT������<�u��֏��Z�u���"	p�ɉµ�%���|}1B
�oo9��Q`�)�