sha512t 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2829c30ba19cb48066239992d14753ec4d546c49
-  data.tar.gz: a68b9c8fc14233070fa58a5a35e592b1c5e32ab7
+  metadata.gz: b00ec75a952b8e835cd734ba306841e2e8816b3f
+  data.tar.gz: cebcb2b1aa7246a1a52e7f3eadf2bd338061bd91
 SHA512:
-  metadata.gz: 03f933eb7dcc7ffedf728a7c9dfe68bffde142666a39096d03d8b3a3ed807cba61cf5ac8f5d37652350f5ea7214c4e19619a79269a089aa9cc5a730de72ddb26
-  data.tar.gz: 87606be5de26152b4e6df998e4d431a630b4812d16f80e0b4420cdc4e59bbba4ac19ddc51c6a292cbc363e31d63b429d5e7bf97ae3c65d23b4e0251f73946526
+  metadata.gz: df627c2249fb3685ab277ffa5f9bf8b76fc09454a42a3ae6fd6c984086730ce9a9cfd5023ff06a5a17fffc3256aea62027ed375be50ec3df344a9e1b70ad607e
+  data.tar.gz: 4ec1836c8022c5340d02be78a7c372e8d27745a07dc4a69642aaaad15dcb7e2e9572b64ea08d895ebcc894999fed49b3e72fe3ff049d82d14d529737e2d0b001

data/lib/sha512.rb

@@ -41,44 +41,21 @@ class Sha512
   end
 
   def preprocessing(message)
-    # Preprocessing Step 1: Padding the message  
-    bytes = message.bytes.to_a 
-    l = bytes.size * 8
-    padded_message = ""
-    zero = "0"
-
-    bytes.each do |byte|
-      bit = byte.to_s(2)
-      if bit.length < 8
-        bit = (zero * (8 - bit.length)) + bit
-      end
-      padded_message += bit
-    end
+    # Preprocessing Step 1: Padding the message
+    preprocessed_message = message.unpack('B*')[0]
+    message_length = preprocessed_message.length
     
     # padding with a one bit
-    padded_message += "1"
+    preprocessed_message += "1"
     
     # add k zero bits, where k is the smallest non-negative solution to the equation l+1+k = 896 mod 1024
-    blocks = (896-(l+1))
-    while blocks < 0 do
-      blocks += 1024
-    end
-    padded_message += zero * blocks
+    preprocessed_message += "0" * ((896-(message_length+1)) % 1024)
 
     # append 128-bit block that is equal to the number of l expressed using a binary representation
-    last_bit_block = l.to_s(2)
-    if last_bit_block.length < 128
-      last_bit_block = (zero * (128 - last_bit_block.length)) + last_bit_block
-    end
-    padded_message += last_bit_block
+    preprocessed_message += message_length.to_s(2).rjust(128, '0')
 
     # Preprocessing Step 2: Parsing the message
-    parsed_message = []
-    for block in 0..padded_message.size/64-1
-      parsed_message.push(padded_message[(64*block)..(64*block)+63])
-    end
-
-    return parsed_message
+    return preprocessed_message.chars.each_slice(64).map(&:join)
   end
 
   def hash_computation(p, iv)
@@ -139,11 +116,7 @@ class Sha512
     # Convert hash to hex-String    
     hash_string = ""
     hash.each do |h|
-      temp = h.to_s(16)
-      if temp.length < 16
-        temp = "0" * (16 - temp.length) + temp
-      end
-      hash_string += temp
+      hash_string += h.to_s(16).rjust(16, '0')
     end
     return hash_string
   end
@@ -165,9 +138,9 @@ class Sha512
     # consists of two steps: 
     # 1. padding the message,
     # 2. parsing the message into message blocks
-    parsed_message = Sha512.new.preprocessing(message)
+    preprocessed_massage = Sha512.new.preprocessing(message)
 
     # Hash Computation
-    return Sha512.new.hash_computation(parsed_message, sha512_initial_hash_value)
+    return Sha512.new.hash_computation(preprocessed_massage, sha512_initial_hash_value)
   end
 end

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sha512t
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Frederic Walch
-- Maximilian Bielefeld
 autorequire: 
 bindir: bin
 cert_chain: []