tanker-core 2.32.0.beta.7 → 3.0.0.alpha.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 042b0f9b9fe8964bf0d3da88e1bffb4646f260304627d6a6813bb429838dc255
-  data.tar.gz: 498a8a4ba6fe003dcc23f255f7263d33d8d9d63f028e53e36872e416a859e5ff
+  metadata.gz: 17ddab41e47eeed670862e0993b156aa1e7fcc171ce56b0ad9dc98fc1cb18e87
+  data.tar.gz: 2155a7f55ba95cbe0809695e4f754d256a41474d6a4f8a801acec625b9de7a2a
 SHA512:
-  metadata.gz: e5e64eac1254d2850fad38e28cbc2837703e589bf876ef9ae25693f0967a1b200800e0b363fd404beb7614e387eced8051c142b3e43fb820302f2c504fbe2124
-  data.tar.gz: 90b6995a2b1c1b22a7e5a68d1011806d60872633314e70ee1f184ea889bb42ff9da2f44fc6219d44d1a519889ca743014ef27a1af8a5808c44e294fb1ac986ea
+  metadata.gz: a0e9b79f3cc6b4f0dbd41af27480c9b6f33fb6f805b2aa4a069fe1c1aec2edce9931d793b2966bab7df5810574e771b71c22607cee5a5a05cad8f3b842cd3141
+  data.tar.gz: 6ca06c88f82f15b30235c74ee8cf241f2c2fe0ccb9502c726675a2a8b7974e9d4d9ab98ee3b365da4c3656b0d0803a88c9f7fe43355dc23751ee1cdb3e8d6920

data/lib/tanker/c_tanker.rb

@@ -10,7 +10,6 @@ require_relative 'c_tanker/c_future'
 require_relative 'c_tanker/c_verification'
 require_relative 'c_tanker/c_verification_method'
 require_relative 'c_tanker/c_log_record'
-require_relative 'c_tanker/c_device_info'
 
 module Tanker
   module CTanker
@@ -38,8 +37,6 @@ module Tanker
     blocking_attach_function :tanker_stop, [:session_pointer], CFuture
     blocking_attach_function :tanker_status, [:session_pointer], :uint32
     blocking_attach_function :tanker_generate_verification_key, [:session_pointer], CFuture
-    blocking_attach_function :tanker_device_id, [:session_pointer], CFuture
-    blocking_attach_function :tanker_get_device_list, [:session_pointer], CFuture
 
     blocking_attach_function :tanker_create_oidc_nonce, [:session_pointer], CFuture
     blocking_attach_function :tanker_set_oidc_test_nonce, [:session_pointer, :string], CFuture
@@ -47,7 +44,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 +65,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
@@ -94,7 +91,6 @@ module Tanker
 
     blocking_attach_function :tanker_free_buffer, [:pointer], :void
     blocking_attach_function :tanker_free_verification_method_list, [:pointer], :void
-    blocking_attach_function :tanker_free_device_list, [:pointer], :void
   end
 
   private_constant :CTanker

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/session.rb

@@ -48,26 +48,6 @@ module Tanker
       method_list
     end
 
-    def device_id
-      CTanker.tanker_device_id(@ctanker).get_string
-    end
-
-    def device_list
-      device_list_ptr = CTanker.tanker_get_device_list(@ctanker).get
-      count = device_list_ptr.get(:uint32, FFI::Pointer.size)
-
-      method_base_addr = device_list_ptr.read_pointer
-      device_info_list = count.times.map do |i|
-        method_ptr = method_base_addr + (i * CTanker::CDeviceInfo.size)
-        CTanker::CDeviceInfo.new(method_ptr)
-      end
-      CTanker.tanker_free_device_list device_list_ptr
-      device_info_list
-    end
-
-    deprecate :device_id, :none, 2022, 1
-    deprecate :device_list, :none, 2022, 1
-
     def stop
       CTanker.tanker_stop(@ctanker).get
     end

data/lib/tanker/core/version.rb

@@ -2,7 +2,7 @@
 
 module Tanker
   class Core
-    VERSION = '2.32.0.beta.7'
+    VERSION = '3.0.0.alpha.1'
 
     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

data/lib/tanker/error.rb

@@ -26,7 +26,7 @@ module Tanker
     TOO_MANY_ATTEMPTS = 9
     EXPIRED_VERIFICATION = 10
     IO_ERROR = 11
-    DEVICE_REVOKED = 12
+    # DEVICE_REVOKED = 12
     CONFLICT = 13
     UPGRADE_REQUIRED = 14
     IDENTITY_ALREADY_ATTACHED = 15
@@ -43,7 +43,6 @@ module Tanker
     class TooManyAttempts < self; end
     class ExpiredVerification < self; end
     class IOError < self; end
-    class DeviceRevoked < self; end
     class Conflict < self; end
     class UpgradeRequired < self; end
     class IdentityAlreadyAttached < self; end
@@ -61,7 +60,6 @@ module Tanker
         TOO_MANY_ATTEMPTS => TooManyAttempts,
         EXPIRED_VERIFICATION => ExpiredVerification,
         IO_ERROR => IOError,
-        DEVICE_REVOKED => DeviceRevoked,
         CONFLICT => Conflict,
         UPGRADE_REQUIRED => UpgradeRequired,
         IDENTITY_ALREADY_ATTACHED => IdentityAlreadyAttached

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanker-core
 version: !ruby/object:Gem::Version
-  version: 2.32.0.beta.7
+  version: 3.0.0.alpha.1
 platform: ruby
 authors:
 - Tanker team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-26 00:00:00.000000000 Z
+date: 2022-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -52,7 +52,6 @@ files:
 - lib/tanker-core.rb
 - lib/tanker/c_tanker.rb
 - lib/tanker/c_tanker/c_datastore.rb
-- lib/tanker/c_tanker/c_device_info.rb
 - lib/tanker/c_tanker/c_future.rb
 - lib/tanker/c_tanker/c_http.rb
 - lib/tanker/c_tanker/c_lib.rb

data/lib/tanker/c_tanker/c_device_info.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'ffi'
-
-module Tanker
-  module CTanker
-    class CDeviceInfo < FFI::Struct
-      layout :device_id, :string,
-             :is_revoked, :bool
-
-      attr_reader :device_id
-
-      def initialize(pointer)
-        super pointer
-        @device_id = self[:device_id]
-        @is_revoked = self[:is_revoked]
-      end
-
-      def revoked?
-        @is_revoked
-      end
-    end
-  end
-end