present-cipher 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d550b256ef6e8fa10b22344cf852ebf870cc78e6e56b586dd0c04eb115a2cf
-  data.tar.gz: 3deea46829f0af9b682ba519b015e9966ea2a93f0b1136099bc8f706f9362a21
+  metadata.gz: 36f722bbd51bc59a36df3f047589f45fc0cabec26320e8101da317292615d992
+  data.tar.gz: 2b6d314798df04c1e8ed76c87c7ec829992e52aa4b51c26b015c2e566a607663
 SHA512:
-  metadata.gz: 6d0766eb00c53da4ec27b2589c285d5ce345f790e688f8331151de56ca2d99ad89ec0fc888762e757eb5893f74985cb8a516b802e055a484d3f49da4a098b80e
-  data.tar.gz: b78a7a4f805f175ddfda9274fd81aa9c289adf4131e5a1c6b2770ec6b8634466c303d9e7e36c3cf0b87ebe99d5d7cef4cf8f4ff2d9709d0973fb2ea1e7a0e227
+  metadata.gz: 29819e47113016e1486b164a519d262632384aa049bd8f77c3df2bd480fc3db073df177c4e95fa14640823a1fd2e42f2764dede07bbfbff11d2392ef72e47056
+  data.tar.gz: 025d530a9eb07b8e09b5ecf65dd170b7c0f3312953cdbd58b7ce66c91bf1ae65639ec24523e42f8c731f140f96cb7ec516c88827cea91b1329d52532946c253b

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.0] - 2022-11-29
+
+### Added
+
+- Key and block length validation.
+
 ## [0.1.0] - 2022-11-26
 
 ### Added

data/lib/present/cipher/error.rb

@@ -0,0 +1,12 @@
+module Present
+  class Cipher
+    class Error < StandardError
+    end
+
+    class KeyError < Error
+    end
+
+    class BlockError < Error
+    end
+  end
+end

data/lib/present/cipher/version.rb

@@ -2,6 +2,6 @@
 
 module Present
   class Cipher
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/present/cipher.rb

@@ -1,11 +1,18 @@
 # frozen_string_literal: true
 
+require_relative "cipher/error"
 require_relative "cipher/version"
 
 module Present
   class Cipher
+    KEY_BYTESIZE = 10
+    KEY_BITSIZE = KEY_BYTESIZE * 8
+
+    BLOCK_BYTESIZE = 8
+    BLOCK_BITSIZE = BLOCK_BYTESIZE * 8
+
     S_BOX = [
-      0x0C, 0x05, 0x06, 0x0b, 0x09, 0x00, 0x0a, 0x0d, 0x03, 0x0e, 0x0f, 0x08, 0x04, 0x07, 0x01, 0x02
+      0x0C, 0x05, 0x06, 0x0b, 0x09, 0x00, 0x0a, 0x0d, 0x03, 0x0e, 0x0f, 0x08, 0x04, 0x07, 0x01, 0x02,
     ]
 
     INVERSE_S_BOX = 0.upto(S_BOX.length - 1).map { |n| S_BOX.index(n) }
@@ -20,10 +27,16 @@ module Present
     INVERSE_P_BOX = 0.upto(P_BOX.length - 1).map { |n| P_BOX.index(n) }
 
     def initialize(key)
+      bitsize = key.bytesize * 8
+      raise KeyError, "key length is invalid (expected #{KEY_BITSIZE} bits; got #{bitsize})" if bitsize != KEY_BITSIZE
+
       @key = key
     end
 
     def encrypt(bytes)
+      bitsize = bytes.bytesize * 8
+      raise BlockError, "block length is invalid (expected #{BLOCK_BITSIZE} bits; got #{bitsize})" if bitsize != BLOCK_BITSIZE
+
       bits = bytes.unpack1("Q>")
 
       0.upto(30) do |i|
@@ -38,6 +51,9 @@ module Present
     end
 
     def decrypt(bytes)
+      bitsize = bytes.bytesize * 8
+      raise BlockError, "block length is invalid (expected #{BLOCK_BITSIZE} bits; got #{bitsize})" if bitsize != BLOCK_BITSIZE
+
       bits = bytes.unpack1("Q>")
 
       31.downto(1) do |i|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: present-cipher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Henry Phan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-30 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -25,8 +25,8 @@ files:
 - README.md
 - Rakefile
 - lib/present/cipher.rb
+- lib/present/cipher/error.rb
 - lib/present/cipher/version.rb
-- present-cipher.gemspec
 - sig/present/cipher.rbs
 homepage: https://codeberg.org/htp/present-cipher
 licenses:

data/present-cipher.gemspec

@@ -1,32 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/present/cipher/version"
-
-Gem::Specification.new do |spec|
-  spec.name = "present-cipher"
-  spec.version = Present::Cipher::VERSION
-  spec.authors = ["Henry Phan"]
-  spec.email = ["henry@henryphan.com"]
-
-  spec.summary = "A Ruby implementation of the PRESENT block cipher."
-  spec.homepage = "https://codeberg.org/htp/present-cipher"
-  spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
-
-  spec.metadata["allowed_push_host"] = "https://rubygems.org"
-
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://codeberg.org/htp/present-cipher"
-  spec.metadata["changelog_uri"] = "https://codeberg.org/htp/present-cipher/blob/main/CHANGELOG.md"
-
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?:bin|test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
-    end
-  end
-  spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-end