aesx 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce5b5a60238ba024621270a96d2814f7907e647bc7f5a745dea8c7226ae56cc
-  data.tar.gz: 167f9d6547c25e4d9f7b85b6444a60201d756121070bba228d244f65bd0d9c79
+  metadata.gz: 4df3e7ebfe10780119148530407dffbc8b4d76ff0e60665405a1096932f4d4f5
+  data.tar.gz: 8579a2f88160d2686bd8b94284986beba974e11a1ba6f2daeef9f755de5001c2
 SHA512:
-  metadata.gz: 297d6f9efa3bf4ead66b6a70219e3cdf2bced2a40c406db6c653665fa74c28bd311faa47435fc595d9a17be7c377927d1c18e9ec6ef9e77190e6443b401cfafa
-  data.tar.gz: d6242cb83ebe9d512fbeb1f621641fed8aea054057879750d1e50ab50a90b3acf6e73cbbed4dd2ad70b3520b8f0cf3c4d6471aef8f48d8a2dad90b57c09ede1b
+  metadata.gz: da63a66ca2fd099dd4473800f17cb2318a7b17fa17651a2ae8a9b438410d24c8255b63046bb1820f3de3ca82a0aecec53c90207a44995d2bbde5ac2d3944dfce
+  data.tar.gz: 980b512d63c2c4f36a33f926e542c449cfcc5f516c4eefa7a85e1bdc67113276f0ca3ef48e1027011621c7f66d74856deacd6fa0f2af1f237e89914aceaa95d2

data/lib/aesx.rb

@@ -8,8 +8,8 @@ require_relative 'compression'
 
 # AESX - AES eXtended encryption library
 #
-# A lightweight encryption library that provides an extended version of 
-# the popular AES gem interface with modern ciphers. The default cipher 
+# A lightweight encryption library that provides an extended version of
+# the popular AES gem interface with modern ciphers. The default cipher
 # is AES-256-GCM.
 #
 # @example Basic usage
@@ -49,7 +49,7 @@ module AESX
     # @return [Array<String>] List of available cipher names
     def cipher_list
       openssl_ciphers = OpenSSL::Cipher.ciphers.map(&:upcase)
-      CIPHER_SPECS.keys & openssl_ciphers    
+      CIPHER_SPECS.keys & openssl_ciphers
     end
 
     # Encrypts plaintext using the specified key and options
@@ -97,7 +97,7 @@ module AESX
     def key(length = nil, format = :plain, cipher: 'AES-256-GCM')
       key_length = length ? length / 8 : CIPHER_SPECS[cipher.upcase][0]
       key = OpenSSL::Random.random_bytes(key_length)
-      format == :base_64 ? Base64.encode64(key).chomp : key
+      format == :base_64 ? Base64.strict_encode64(key).chomp : key
     end
 
     # Generates a random initialization vector of appropriate length for the specified cipher
@@ -109,16 +109,16 @@ module AESX
     def iv(format = :plain, cipher: 'AES-256-GCM')
       iv_length = CIPHER_SPECS[cipher.upcase][1]
       iv = OpenSSL::Random.random_bytes(iv_length)
-      format == :base_64 ? Base64.encode64(iv).chomp : iv
+      format == :base_64 ? Base64.strict_encode64(iv).chomp : iv
     end
-    
+
     # Returns the default compression algorithm
     #
     # @return [Symbol, nil] The symbol representing the default algorithm, or nil if none available
     def default_compression
       AESCompression.default_algorithm
     end
-    
+
     # Returns an array of available compression algorithms
     #
     # @return [Array<Symbol>] Symbols representing available compression algorithms
@@ -148,7 +148,7 @@ module AESX
       # allow laziness
       if opts.key?(:compress)
         opts[:compression] = opts.delete(:compress)
-      end      
+      end
       @options = {
         format: :base_64,        # Default output format for encryption
         cipher: "AES-256-GCM",   # GCM mode
@@ -198,7 +198,7 @@ module AESX
 
       # Get compression option from opts or fallback to options
       compression = opts.key?(:compression) ? opts[:compression] : @options[:compression]
-      
+
       # If compression is a symbol or truthy value (but not true), use it as the algorithm
       if compression.is_a?(Symbol) || (compression && compression != true)
         # Check if specified algorithm is available
@@ -218,13 +218,13 @@ module AESX
       fmt = opts[:format] || @options[:format]
       case fmt
       when :base_64
-        iv_b64 = Base64.encode64(iv).chomp
-        ciphertext_b64 = Base64.encode64(ciphertext).chomp
-        auth_tag_b64 = auth_tag ? Base64.encode64(auth_tag).chomp : nil
-        
+        iv_b64 = Base64.strict_encode64(iv).chomp
+        ciphertext_b64 = Base64.strict_encode64(ciphertext).chomp
+        auth_tag_b64 = auth_tag ? Base64.strict_encode64(auth_tag).chomp : nil
+
         # Add compression flag
         comp_flag = compression_algorithm ? AESCompression::ALGORITHM_IDS[compression_algorithm].to_s : "0"
-        
+
         if auth_tag_b64
           result = "#{iv_b64}$#{ciphertext_b64}$#{auth_tag_b64}$#{comp_flag}"
         else
@@ -236,10 +236,10 @@ module AESX
         # auth_tag length is 0-16, variable in CCM
         auth_tag_size = auth_tag ? auth_tag.bytesize : 0
         packed_lengths = ((iv.bytesize - 7) << 5) | (auth_tag_size & 0x1F)
-        
+
         # Add a second byte for compression algorithm
         compression_byte = AESCompression::ALGORITHM_IDS[compression_algorithm] || 0
-        
+
         if auth_tag
           pack_format = "CC a#{iv.bytesize} a* a#{auth_tag.bytesize}"
           [packed_lengths, compression_byte, iv, ciphertext, auth_tag].pack(pack_format)
@@ -277,7 +277,9 @@ module AESX
         # unless it's Base64 encoded?
         parts = encrypted_data.split('$')
         if parts.size.between?(3, 4)
-          all_base64 = parts.all? { |str| str.nil? || str.empty? || str =~ /^[A-Za-z0-9+\/=]*$/ }
+          all_base64 = parts.all? do |str|
+            str.nil? || str.empty? || str.gsub(/\s+/, '') =~ /\A[A-Za-z0-9+\/=]*\z/
+          end
           if all_base64
             opts[:format] = :base_64
           end
@@ -291,11 +293,11 @@ module AESX
         ciphertext_b64 = parts[1]
         auth_tag_b64 = parts[2] if parts.size >= 3 && !parts[2].nil? && !parts[2].empty?
         compression_code = parts[3] if parts.size >= 4
-        
-        iv = Base64.decode64(iv_b64)
-        ciphertext = Base64.decode64(ciphertext_b64)
-        auth_tag = auth_tag_b64 ? Base64.decode64(auth_tag_b64) : nil
-        
+
+        iv = Base64.decode64(iv_b64.gsub(/\s+/, ''))
+        ciphertext = Base64.decode64(ciphertext_b64.gsub(/\s+/, ''))
+        auth_tag = auth_tag_b64 ? Base64.decode64(auth_tag_b64.gsub(/\s+/, '')) : nil
+
         # Determine compression algorithm from the code
         if compression_code && compression_code != "0"
           algorithm_id = compression_code.to_i
@@ -304,17 +306,17 @@ module AESX
       when :binary
         # Extract the first byte which contains IV and auth tag lengths
         lengths = encrypted_data.unpack1('C')
-        
+
         # Extract the second byte which contains compression info
         compression_byte = encrypted_data.unpack('CC')[1]
-        
+
         # Calculate IV length and auth tag length
         iv_len = ((lengths >> 5) & 0x07) + 7
         tag_len = lengths & 0x1F
-        
+
         # Extract IV, ciphertext, and auth tag
         iv = encrypted_data[2, iv_len] # 2 bytes of header now
-        
+
         if tag_len > 0
           auth_tag = encrypted_data[-tag_len, tag_len]
           # Ciphertext starts after header and IV, ends before auth tag
@@ -323,7 +325,7 @@ module AESX
           auth_tag = nil
           ciphertext = encrypted_data[(2 + iv_len)..]
         end
-        
+
         # Get compression algorithm
         compression_algorithm = AESCompression::ID_TO_ALGORITHM[compression_byte] if compression_byte != 0
       else
@@ -340,7 +342,7 @@ module AESX
       @cipher.padding = opts[:padding] || @options[:padding]
 
       decrypted_data = @cipher.update(ciphertext) + @cipher.final
-      
+
       # Apply decompression if data was compressed
       if compression_algorithm
         begin
@@ -374,7 +376,7 @@ module AESX
     def normalize_key(key, cipher = 'AES-256-GCM', iterations: 10000)
       key_length = CIPHER_SPECS[cipher.upcase][0]
       return key if key.bytesize == key_length
-            
+
       if key.match?(/\A[0-9a-fA-F]+\z/) # is it a hex string?
         key = key.unpack('a2' * key_length).map { |x| x.hex }.pack('c' * key_length)
       else
@@ -383,7 +385,7 @@ module AESX
         # Use PBKDF2 for key derivation
         key = OpenSSL::PKCS5.pbkdf2_hmac(key,salt,iterations,key_length,OpenSSL::Digest::SHA256.new)
       end
-      
+
       key
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: aesx
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Tom lahti
 bindir: bin
 cert_chain: []
-date: 2025-03-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.8
 specification_version: 4
 summary: AES gem, but with GCM/CTR ciphers, compression, and more
 test_files: []