lightning-onion 0.2.9 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75c5bf267e021cff8281e7eed4c4c8f0a4550b4136b0eebaaca2772f585932f6
-  data.tar.gz: ed1c52bdbaad7c69187dfa67013d1699f6d8eb765c8ad4ec7e9b265b6db335a4
+  metadata.gz: 88d9b7022522a5b5b33668e3ae002aec6629053f6bb307a679cf5b1958a5a0bb
+  data.tar.gz: e38b29beacabf8f39a306fe3ffe3b6decae6eec162c0db6bb9ab57153c4fa6dd
 SHA512:
-  metadata.gz: 6f37a649dda827400c6b9d19e86a578dfc7ca9f7532f7df8efad81253ff9518c787c07eee0c9e9d4d492a341e70775de10c4c0efc6496f0eee9cedc3efd06d85
-  data.tar.gz: 31c0dbcf7db22e66c6054fc4c6b68bf07db01fee7e3bef8027d8dd219aaaadf86efbb0b03c0afa956f31c9749272af89a3025a4eeb7012af342845ae6a224958
+  metadata.gz: 56127d29ed60e1f0d279972d69e7fdd37c38818d805765c79255114def8b742b9ec0233026467974dea2f6f350639902367412fa21c593916d1df866e42badc8
+  data.tar.gz: d26a1b3c29ded836aa05874def820cb32ad51597d7378d6ed17ac30c4d4be0f51ed2318b10380eda14786235dbf2bee8f95b5b6f3d934de4d48c072c574aa3ae

data/lib/lightning/onion/chacha20.rb

@@ -3,95 +3,15 @@
 module Lightning
   module Onion
     module ChaCha20
-      def self.constants
-        [0x61707865, 0x3320646e, 0x79622d32, 0x6b206574].pack('N*')
-      end
+      autoload :OpenSSL, 'lightning/onion/chacha20/openssl'
+      autoload :Pure, 'lightning/onion/chacha20/pure'
 
       def self.chacha20_encrypt(key, counter, nonce, plaintext)
-        encrypted_message = +''
-        (plaintext.length / 64).times do |i|
-          key_stream = chacha20_block(key, counter + i, nonce)
-          block = plaintext[(i * 64)...(i + 1) * 64]
-          encrypted_message += xor(block, key_stream)
-        end
-        if plaintext.length % 64 != 0
-          i = plaintext.length / 64
-          key_stream = chacha20_block(key, counter + i, nonce)
-          block = plaintext[(i * 64)...plaintext.length]
-          block = block.ljust(64, "\x00")
-          encrypted_message += xor(block, key_stream)[0...(plaintext.length % 64)]
-        end
-        encrypted_message
-      end
-
-      def self.xor(a, b)
-        a = a.unpack('N*')
-        b = b.unpack('N*')
-        a.zip(b).map { |x, y| (x ^ y) & 0xffffffff }.pack('N*')
-      end
-
-      # key: 32 bytes
-      # counter: integer (4 bytes)
-      # nonce: 12 bytes
-      def self.chacha20_block(key, counter, nonce)
-        # reverse order
-        key = key.unpack('V*').pack('N*')
-        counter = [counter].pack('N*')
-        nonce = nonce.unpack('V*').pack('N*')
-        state = constants + key + counter + nonce
-        working_state = state.unpack('N*')
-        10.times do
-          inner_block(working_state)
+        if ::OpenSSL::Cipher.ciphers.include?("ChaCha20")
+          Lightning::Onion::ChaCha20::OpenSSL.chacha20_encrypt(key, counter, nonce, plaintext)
+        else
+          Lightning::Onion::ChaCha20::Pure.chacha20_encrypt(key, counter, nonce, plaintext)
         end
-        plus_for_string(state, working_state)
-      end
-
-      def self.inner_block(x)
-        # column rounds
-        x[0], x[4], x[8], x[12] = quater_round(x[0], x[4], x[8], x[12])
-        x[1], x[5], x[9], x[13] = quater_round(x[1], x[5], x[9], x[13])
-        x[2], x[6], x[10], x[14] = quater_round(x[2], x[6], x[10], x[14])
-        x[3], x[7], x[11], x[15] = quater_round(x[3], x[7], x[11], x[15])
-        # diagonal rounds
-        x[0], x[5], x[10], x[15] = quater_round(x[0], x[5], x[10], x[15])
-        x[1], x[6], x[11], x[12] = quater_round(x[1], x[6], x[11], x[12])
-        x[2], x[7], x[8], x[13] = quater_round(x[2], x[7], x[8], x[13])
-        x[3], x[4], x[9], x[14] = quater_round(x[3], x[4], x[9], x[14])
-      end
-
-      def self.plus_for_string(a, b)
-        a.unpack('N*').map.with_index do |x, i|
-          plus(x, b[i])
-        end.pack('V*')
-      end
-
-      def self.plus(x, y)
-        (x + y) & 0xffffffff
-      end
-
-      def self.rotate(x, n)
-        y = x << n
-        z = x >> (32 - n)
-        (y | z) & 0xffffffff
-      end
-
-      def self.quater_round(a, b, c, d)
-        a = plus(a, b)
-        d ^= a
-        d = rotate(d, 16)
-
-        c = plus(c, d)
-        b ^= c
-        b = rotate(b, 12)
-
-        a = plus(a, b)
-        d ^= a
-        d = rotate(d, 8)
-
-        c = plus(c, d)
-        b ^= c
-        b = rotate(b, 7)
-        [a, b, c, d]
       end
     end
   end

data/lib/lightning/onion/chacha20/openssl.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Lightning
+  module Onion
+    module ChaCha20
+      class OpenSSL
+        def self.chacha20_encrypt(key, counter, nonce, plaintext)
+          cipher = ::OpenSSL::Cipher.new("ChaCha20")
+          cipher.encrypt
+          cipher.iv = [counter].pack('V*') + nonce
+          cipher.key = key
+          cipher.update(plaintext) + cipher.final
+        end
+      end
+    end
+  end
+end

data/lib/lightning/onion/chacha20/pure.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+module Lightning
+  module Onion
+    module ChaCha20
+      class Pure
+
+        def self.chacha20_encrypt(key, counter, nonce, plaintext)
+          encrypted_message = +''
+          (plaintext.length / 64).times do |i|
+            key_stream = chacha20_block(key, counter + i, nonce)
+            block = plaintext[(i * 64)...(i + 1) * 64]
+            encrypted_message += xor(block, key_stream)
+          end
+          if plaintext.length % 64 != 0
+            i = plaintext.length / 64
+            key_stream = chacha20_block(key, counter + i, nonce)
+            block = plaintext[(i * 64)...plaintext.length]
+            block = block.ljust(64, "\x00")
+            encrypted_message += xor(block, key_stream)[0...(plaintext.length % 64)]
+          end
+          encrypted_message
+        end
+
+        private
+
+        def self.constants
+          [0x61707865, 0x3320646e, 0x79622d32, 0x6b206574].pack('N*')
+        end
+
+        def self.xor(a, b)
+          a = a.unpack('N*')
+          b = b.unpack('N*')
+          a.zip(b).map { |x, y| (x ^ y) & 0xffffffff }.pack('N*')
+        end
+
+        # key: 32 bytes
+        # counter: integer (4 bytes)
+        # nonce: 12 bytes
+        def self.chacha20_block(key, counter, nonce)
+          # reverse order
+          key = key.unpack('V*').pack('N*')
+          counter = [counter].pack('N*')
+          nonce = nonce.unpack('V*').pack('N*')
+          state = constants + key + counter + nonce
+          working_state = state.unpack('N*')
+          10.times do
+            inner_block(working_state)
+          end
+          plus_for_string(state, working_state)
+        end
+
+        def self.inner_block(x)
+          # column rounds
+          x[0], x[4], x[8], x[12] = quater_round(x[0], x[4], x[8], x[12])
+          x[1], x[5], x[9], x[13] = quater_round(x[1], x[5], x[9], x[13])
+          x[2], x[6], x[10], x[14] = quater_round(x[2], x[6], x[10], x[14])
+          x[3], x[7], x[11], x[15] = quater_round(x[3], x[7], x[11], x[15])
+          # diagonal rounds
+          x[0], x[5], x[10], x[15] = quater_round(x[0], x[5], x[10], x[15])
+          x[1], x[6], x[11], x[12] = quater_round(x[1], x[6], x[11], x[12])
+          x[2], x[7], x[8], x[13] = quater_round(x[2], x[7], x[8], x[13])
+          x[3], x[4], x[9], x[14] = quater_round(x[3], x[4], x[9], x[14])
+        end
+
+        def self.plus_for_string(a, b)
+          a.unpack('N*').map.with_index do |x, i|
+            plus(x, b[i])
+          end.pack('V*')
+        end
+
+        def self.plus(x, y)
+          (x + y) & 0xffffffff
+        end
+
+        def self.rotate(x, n)
+          y = x << n
+          z = x >> (32 - n)
+          (y | z) & 0xffffffff
+        end
+
+        def self.quater_round(a, b, c, d)
+          a = plus(a, b)
+          d ^= a
+          d = rotate(d, 16)
+
+          c = plus(c, d)
+          b ^= c
+          b = rotate(b, 12)
+
+          a = plus(a, b)
+          d ^= a
+          d = rotate(d, 8)
+
+          c = plus(c, d)
+          b ^= c
+          b = rotate(b, 7)
+          [a, b, c, d]
+        end
+      end
+    end
+  end
+end

data/lib/lightning/onion/version.rb

@@ -2,6 +2,6 @@
 
 module Lightning
   module Onion
-    VERSION = '0.2.9'
+    VERSION = '0.2.10'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lightning-onion
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.10
 platform: ruby
 authors:
 - Hajime Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-12 00:00:00.000000000 Z
+date: 2019-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: algebrick
@@ -115,6 +115,8 @@ files:
 - bin/setup
 - lib/lightning/onion.rb
 - lib/lightning/onion/chacha20.rb
+- lib/lightning/onion/chacha20/openssl.rb
+- lib/lightning/onion/chacha20/pure.rb
 - lib/lightning/onion/error_packet.rb
 - lib/lightning/onion/failure_messages.rb
 - lib/lightning/onion/failure_messages/amount_below_minimum.rb