tanker-core 2.32.0.alpha.3 → 2.32.0.alpha.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35807b63789da11922bba195e97ad38426d94d2ae88c4d7d86738f9aa81d29b3
-  data.tar.gz: a71c96a6f18fdfbf5a6006e06268f841aeee930431786b0e5e7822333d429d2f
+  metadata.gz: 4e726e4d86e8f10f63f84de044cc21f237f4e60f4ade11a68bd2747dddff355e
+  data.tar.gz: fbd6d3f4ec2bb7b0b1c3b89047fb6b8aa288c6ce87b99e9176c0bc20ba29309c
 SHA512:
-  metadata.gz: 268e586fd6b4753efe053d4d7d837a920fe20e3914f4e83c47b84d414f49e971ea0b874d8c608dd9495827b769847fc8fd05b9a02d21f01dd5bacc677dcc2e49
-  data.tar.gz: e08552e46eb8c589e281f5fb77d85c585cfaaccd67baf037972f2cb9c0714dc4b2fe237b507ac64d8716d03ca6477c64f442430510864800ec761859af3e3a4d
+  metadata.gz: e402996baf9d60f1560949b357f9ecf4f64c5993940e4e1f787d6eaec34ab30cc82d3f609095f3129c47f7c2df08ee2ce6d981ef8cec2d4781fabf8e5f461369
+  data.tar.gz: 78ac03a3fe9bd102e93d15d1b75e4dc1a663b782d6ecfb7baa00db879dc609c118e58f10751a804e1f66989c1ee53cf0da059eba47987fa19141413e72d0af4f

data/lib/tanker/c_tanker.rb

@@ -47,7 +47,7 @@ module Tanker
     blocking_attach_function :tanker_attach_provisional_identity, [:session_pointer, :string], CFuture
     blocking_attach_function :tanker_verify_provisional_identity, [:session_pointer, CVerification], CFuture
 
-    blocking_attach_function :tanker_encrypted_size, [:uint64], :uint64
+    blocking_attach_function :tanker_encrypted_size, [:uint64, :uint32], :uint64
     blocking_attach_function :tanker_decrypted_size, [:pointer, :uint64], CFuture
     blocking_attach_function :tanker_get_resource_id, [:pointer, :uint64], CFuture
 
@@ -68,7 +68,7 @@ module Tanker
 
     blocking_attach_function :tanker_encryption_session_open, [:session_pointer, Tanker::EncryptionOptions], CFuture
     blocking_attach_function :tanker_encryption_session_close, [:enc_sess_pointer], CFuture
-    blocking_attach_function :tanker_encryption_session_encrypted_size, [:uint64], :uint64
+    blocking_attach_function :tanker_encryption_session_encrypted_size, [:enc_sess_pointer, :uint64], :uint64
     blocking_attach_function :tanker_encryption_session_get_resource_id, [:enc_sess_pointer], CFuture
     blocking_attach_function :tanker_encryption_session_encrypt, [:enc_sess_pointer, :pointer,
                                                                   :pointer, :uint64], CFuture

data/lib/tanker/core/encryption.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'tanker/c_tanker'
+require 'tanker/encryption_options'
 require_relative 'encryption_session'
 
 module Tanker
@@ -80,17 +81,19 @@ module Tanker
 
     private
 
-    def encrypt_common(data, encryption_options = nil)
-      unless !encryption_options || encryption_options.is_a?(EncryptionOptions)
+    def encrypt_common(data, encryption_options)
+      unless encryption_options.nil? || encryption_options.is_a?(EncryptionOptions)
         raise TypeError, "expected encryption_options to be a EncryptionOptions, but got a #{encryption_options.class}"
       end
 
       inbuf = FFI::MemoryPointer.from_string(data)
 
-      encrypted_size = CTanker.tanker_encrypted_size data.bytesize
+      options = encryption_options || EncryptionOptions.new
+
+      encrypted_size = CTanker.tanker_encrypted_size(data.bytesize, options[:padding_step])
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
-      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, encryption_options).get
+      CTanker.tanker_encrypt(@ctanker, outbuf, inbuf, data.bytesize, options).get
 
       outbuf.read_string encrypted_size
     end

data/lib/tanker/core/encryption_session.rb

@@ -33,7 +33,7 @@ module Tanker
     def encrypt_common(data)
       inbuf = FFI::MemoryPointer.from_string(data)
 
-      encrypted_size = CTanker.tanker_encryption_session_encrypted_size data.bytesize
+      encrypted_size = CTanker.tanker_encryption_session_encrypted_size(@csession, data.bytesize)
       outbuf = FFI::MemoryPointer.new(:char, encrypted_size)
 
       CTanker.tanker_encryption_session_encrypt(@csession, outbuf, inbuf, data.bytesize).get

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.32.0.alpha.3'
+    VERSION = '2.32.0.alpha.5'
 
     def self.native_version
       CTanker.tanker_version_string

data/lib/tanker/encryption_options.rb

@@ -6,7 +6,8 @@ require 'tanker/c_tanker/c_string'
 module Tanker
   # Options that can be given when encrypting data
   class EncryptionOptions < FFI::Struct
-    def initialize(share_with_users: [], share_with_groups: [], share_with_self: true)
+    def initialize(share_with_users: [], share_with_groups: [], share_with_self: true,
+                   padding_step: Padding::AUTO)
       super()
 
       @users_objs = share_with_users.map { |id| CTanker.new_cstring id }
@@ -17,12 +18,13 @@ module Tanker
       groups = FFI::MemoryPointer.new(:pointer, share_with_groups.length)
       groups.write_array_of_pointer(@groups_objs)
 
-      self[:version] = 3
+      self[:version] = 4
       self[:recipient_public_identities] = users
       self[:nb_recipient_public_identities] = share_with_users.length
       self[:recipient_group_ids] = groups
       self[:nb_recipient_group_ids] = share_with_groups.length
       self[:share_with_self] = share_with_self
+      self[:padding_step] = padding_step.native_value
     end
 
     layout :version, :uint8,
@@ -30,6 +32,33 @@ module Tanker
            :nb_recipient_public_identities, :uint32,
            :recipient_group_ids, :pointer,
            :nb_recipient_group_ids, :uint32,
-           :share_with_self, :bool
+           :share_with_self, :bool,
+           :padding_step, :uint32
+  end
+
+  class Padding
+    private_class_method :new
+    attr_reader :native_value
+
+    def initialize(native_value)
+      super()
+      @native_value = native_value
+    end
+
+    AUTO = new 0
+    OFF = new 1
+
+    def self.step(value)
+      unless value.is_a?(Integer)
+        raise TypeError,
+              "expected step to be an Integer >= 2, but got a #{value.class}"
+      end
+      unless value >= 2
+        raise ArgumentError,
+              "expected step to be an Integer >= 2, but got #{value}"
+      end
+
+      new(value)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.32.0.alpha.3
+  version: 2.32.0.alpha.5
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-15 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi