ccrypto-java 0.1.0 → 0.2.0

data/lib/ccrypto/java/keystore/pkcs12_keystore.rb

@@ -0,0 +1,56 @@
+
+require_relative 'jce_keystore'
+
+module Ccrypto
+  module Java
+    module Keystore
+
+      class PKCS12Keystore
+        include TR::CondUtils
+        include DataConversion
+
+        def self.from_p12(bin, &block)
+
+          raise Ccrypto::Keystore::KeystoreException, "block is required" if not block
+
+          JCEKeystore.from_keystore(bin, "PKCS12") do |k|
+            case k
+            when :logger
+              logger
+            when :jce_provider
+              JCEProvider::DEFProv
+            else
+              block.call(k)
+            end
+          end
+         
+        end # from_p12
+
+        def self.to_p12(&block)
+
+          raise Ccrypto::Keystore::KeystoreException, "Block is required" if not block
+
+          JCEKeystore.to_keystore("PKCS12") do |k|
+            case k
+            when :logger
+              logger
+            when :jce_provider
+              JCEProvider::DEFProv
+            else
+              block.call(k)
+            end
+          end
+ 
+        end # to_p12
+
+
+        private
+        def self.logger
+          Ccrypto::Java.logger(:p12)
+        end
+
+      end # class PKCS12Keystore
+
+    end # module Keystore
+  end # module Java
+end # module Ccrypto

data/lib/ccrypto/java/utils/comparator.rb

@@ -11,10 +11,33 @@ module Ccrypto
         bval1 = to_java_bytes(val1) 
         bval2 = to_java_bytes(val2)
 
-        bval1 == bval2
+        if bval1.length != bval2.length
+          false
+        else
+          res = 0
+          (0...bval1.length).each do |i|
+            res |= bval1[i] ^ bval2[i]
+          end
+
+          res == 0
+        end
+
+        #bval1 == bval2
+        #logger.debug "bval1 : #{bval1.inspect}"
+        #logger.debug "bval2 : #{bval2.inspect}"
+
       end
-      self.singleton_class.alias_method :is_equals?, :is_equal?
+      class << self
+      alias_method :is_equals?, :is_equal?
+      alias_method :equals?, :is_equal?
+      alias_method :equal?, :is_equal?
+      end
+      #self.singleton_class.alias_method :is_equals?, :is_equal?
 
+      private
+      def logger
+        Ccrypto::Java.logger(:comparator)
+      end
     end
   end
 end

data/lib/ccrypto/java/version.rb

@@ -2,6 +2,6 @@
 
 module Ccrypto
   module Java
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/ccrypto/java.rb

@@ -18,11 +18,57 @@ require_relative 'provider'
 
 require_relative 'java/ext/secret_key'
 require_relative 'java/ext/x509_cert'
+require_relative 'java/ext/x509_csr'
+
+require_relative 'java/keystore/keystore'
 
 module Ccrypto
   module Java
+    include TR::CondUtils
+
     class Error < StandardError; end
     # Your code goes here...
+
+    READ_BUF_SIZE = 102400
+    ENV_PROBE_DIGEST_KEY = "CC_PROBE_DIGEST"
+
+    Comparator = ComparatorUtil
+
+    def self.logger(tag = nil, &block)
+      if @_logger.nil?
+        @_logger = TeLogger::Tlogger.new
+      end
+
+     if block
+      if not_empty?(tag)
+        @_logger.with_tag(tag, &block)
+      else
+        @_logger.with_tag(@_logger.tag, &block)
+      end
+    else
+      if is_empty?(tag)
+        @_logger.tag = :CryptoJava
+        @_logger
+      else
+        # no block but tag is given? hmm
+        @_logger.tag = tag
+        @_logger
+      end
+    end
+   end
+
+    def self.if_detail_debug(msg)
+      logger.tdebug(:jdetail_debug, msg) if is_detail_debug_on?
+    end
+
+    def self.on_detail_debug(msg)
+      if_detail_debug(msg)
+    end
+
+    def self.is_detail_debug_on?
+      ENV['CCJAVA_DEBUG'] == "true"
+    end
+
   end
 end
 

data/lib/ccrypto/provider.rb

@@ -2,6 +2,7 @@
 require_relative 'java/engines/ecc_engine'
 require_relative 'java/engines/digest_engine'
 require_relative 'java/engines/x509_engine'
+require_relative 'java/engines/x509_csr_engine'
 
 require_relative 'java/engines/scrypt_engine'
 require_relative 'java/engines/secure_random_engine'
@@ -11,7 +12,11 @@ require_relative 'java/engines/secret_key_engine'
 require_relative 'java/engines/hmac_engine'
 require_relative 'java/engines/hkdf_engine'
 require_relative 'java/engines/pbkdf2_engine'
+require_relative 'java/engines/argon2_engine'
+require_relative 'java/engines/bcrypt_engine'
 
+require_relative 'java/engines/ed25519_engine'
+require_relative 'java/engines/x25519_engine'
 
 require_relative 'java/utils/comparator'
 require_relative 'java/utils/memory_buffer'
@@ -30,15 +35,91 @@ require_relative 'java/engines/pkcs7_engine'
 
 require_relative 'java/engines/rsa_engine'
 
+require_relative 'java/engines/crystal_kyber_engine'
+require_relative 'java/engines/crystal_dilithium_engine'
+
+require_relative 'java/keystore/keystore'
+
+require 'rbconfig'
+
 module  Ccrypto
   module Java
     class Provider
       include TR::CondUtils
 
       def self.provider_name
-        "java-bc"
+        "Java-BC"
+        #nm = []
+        #nm << "Java-BC : "
+        #provider_info.each do |k,v|
+        #  nm << "#{k.to_s.capitalize} : #{v}"
+        #end
+        #nm.join("\n")
+      end
+
+      def self.provider_info
+        info = {}
+        info[:ruby_version] = RbConfig::CONFIG["ruby_version"]
+        info[:host] = RbConfig::CONFIG["host"]
+        info[:openssl_version] = OpenSSL::VERSION
+        info[:bouncycastle_info] = JCEProvider::DEFProv.getInfo
+        info
+      end
+
+      def self.supported_keypair_config(*args, &block)
+        purpose = args.first
+        case purpose
+         when :signing, :sign, :identity
+          [Ccrypto::ECCConfig, Ccrypto::RSAConfig, Ccrypto::ED25519Config, Ccrypto::CrystalDilithiumConfig]
+        when :cipher, :encryption, :enc
+          [Ccrypto::ECCConfig, Ccrypto::RSAConfig, Ccrypto::X25519Config, Ccrypto::CrystalKyberConfig]
+        when :sign_and_encrypt, :sign_and_enc, :sign_and_cipher
+          [Ccrypto::ECCConfig, Ccrypto::RSAConfig]
+        else
+          # all keypair config returned
+          [Ccrypto::ECCConfig, Ccrypto::RSAConfig, Ccrypto::ED25519Config, Ccrypto::CrystalDilithiumConfig, Ccrypto::X25519Config, Ccrypto::CrystalKyberConfig]
+          #raise KeypairEngineException, "Unknown key purpose '#{purpose}'. Supported including: :signing, :cipher or :sign_and_cipher"
+        end
+      end
+
+      def self.supported_secret_key_config(&block)
+        CipherEngine.supported_cipher_list 
+      end
+
+      def self.load_keystore(*args, &block)
+        Keystore.load_keystore(*args, &block) 
+      end
+
+      def self.load_keystore_file(*args, &block)
+        Keystore.load_keystore_file(*args, &block) 
+      end
+
+      def self.convert_keystore(*args, &block)
+        Keystore.convert_keystore(*args, &block) 
+      end
+
+      def self.convert_keystore_file(*args, &block)
+        Keystore.convert_keystore_file(*args, &block) 
       end
 
+      def self.load_x509(*args, &block)
+        cert = args.first
+        certType = args[1] || :der
+
+        case certType
+        when :b64, :base64
+          ccert = from_b64(cert)
+        when :hex
+          ccert = from_hex(cert)
+        else
+          # binary
+          ccert = cert
+        end
+
+        X509Engine.bin_to_cert(ccert)
+      end
+
+
       def self.algo_instance(*args, &block)
         config = args.first
 
@@ -60,13 +141,50 @@ module  Ccrypto
             CipherEngine
           elsif config == Ccrypto::ECCPublicKey
             Ccrypto::Java::ECCPublicKey
+          elsif config == Ccrypto::ECCPrivateKey
+            Ccrypto::Java::ECCPrivateKey
           elsif config == Ccrypto::KeyConfig
             SecretKeyEngine
           elsif config == SecretSharingConfig
             SecretSharingEngine
+          elsif config == ED25519Config
+            ED25519Engine
+          elsif config == X25519Config
+            X25519Engine
+            
+          elsif config == Ccrypto::X25519KeyBundle
+            X25519KeyBundle
+
+          elsif config == Ccrypto::X509::CertProfile
+            X509Engine
+
+
+          elsif config == Ccrypto::HMACConfig
+            HMACEngine
+
+          elsif config == Ccrypto::PBKDF2Config
+            PBKDF2Engine
+          elsif config == Ccrypto::HKDFConfig
+            HKDFEngine
+
+          elsif config == Ccrypto::CrystalKyberConfig
+            CrystalKyberEngine
+          elsif config == Ccrypto::CrystalKyberPublicKey
+            CrystalKyberPublicKey
+          elsif config == Ccrypto::CrystalKyberPrivateKey
+            CrystalKyberPrivateKey
+
+          elsif config == Ccrypto::CrystalDilithiumConfig
+            CrystalDilithiumEngine
+          elsif config == Ccrypto::CrystalDilithiumPublicKey
+            CrystalDilithiumPublicKey
+          elsif config == Ccrypto::CrystalDilithiumPrivateKey
+            CrystalDilithiumPrivateKey
+
           else
             raise CcryptoProviderException, "Config class '#{config}' is not supported for provider '#{self.provider_name}'"
           end
+        
         else
           case config
           when Ccrypto::ECCConfig
@@ -77,6 +195,8 @@ module  Ccrypto
             DigestEngine.instance(*args, &block)
           when Ccrypto::X509::CertProfile
             X509Engine.new(*args,&block)
+          when Ccrypto::X509::CSRProfile
+            X509CSREngine.new(*args,&block)
           when Ccrypto::ScryptConfig
             ScryptEngine.new(*args,&block)
           when Ccrypto::HKDFConfig
@@ -87,10 +207,26 @@ module  Ccrypto
             CipherEngine.new(*args, &block)
           when Ccrypto::HMACConfig
             HMACEngine.new(*args, &block)
+          when Ccrypto::Argon2Config
+            Argon2Engine.new(*args, &block)
+
+          when Ccrypto::BCryptConfig
+            BCryptEngine.new(*args, &block)
+
           when Ccrypto::SecretSharingConfig
             SecretSharingEngine.new(*args,&block)
           when Ccrypto::PKCS7Config
             PKCS7Engine.new(*args, &block)
+          when Ccrypto::ED25519Config
+            ED25519Engine.new(*args, &block)
+          when Ccrypto::X25519Config
+            X25519Engine.new(*args, &block)
+
+          when Ccrypto::CrystalKyberConfig
+            CrystalKyberEngine.new(*args, &block)
+          when Ccrypto::CrystalDilithiumConfig
+            CrystalDilithiumEngine.new(*args, &block)
+
           else
             raise CcryptoProviderException, "Config instance '#{config}' is not supported for provider '#{self.provider_name}'"
           end
@@ -106,9 +242,9 @@ module  Ccrypto
       def self.util_instance(*args, &block)
         algo = args.first
         case algo
-        when :comparator, :compare
+        when :comparator, :compare, :data_comparator
           ComparatorUtil
-        when :data_conversion, :converter, :data_converter
+        when :data_conversion, :converter, :data_converter, :data_conv
           DataConversionEngine
         when :memory_buffer, :membuf, :buffer, :mem
           ManagedMemoryBuffer

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: ccrypto-java
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2023-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   name: teLogger
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
   name: toolrack
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
   name: ccrypto
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  name: devops_assist
+  name: release-gem
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,31 +74,40 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".java-version"
+- ".release_history.yml"
 - ".rspec"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
 - bin/setup
-- ccrypto-java.gemspec
-- jars/bcmail-jdk15on-165.jar
-- jars/bcpg-jdk15on-165.jar
-- jars/bcpkix-jdk15on-165.jar
-- jars/bcprov-ext-jdk15on-165.jar
-- jars/bcprov-jdk15on-165.jar
-- jars/bctls-jdk15on-165.jar
+- jars/bcjmail-jdk18on-172.jar
+- jars/bcmail-jdk18on-172.jar
+- jars/bcpg-jdk18on-172.1.jar
+- jars/bcpkix-jdk18on-172.jar
+- jars/bcprov-ext-jdk18on-172.jar
+- jars/bcprov-jdk18on-172.jar
+- jars/bctls-jdk18on-172.jar
+- jars/bcutil-jdk18on-172.jar
 - jars/shamir-0.6.1-p.jar
 - lib/ccrypto/java.rb
+- lib/ccrypto/java/bc_const_mapping.rb
 - lib/ccrypto/java/data_conversion.rb
+- lib/ccrypto/java/engines/argon2_engine.rb
 - lib/ccrypto/java/engines/asn1_engine.rb
 - lib/ccrypto/java/engines/asn1_object.rb
+- lib/ccrypto/java/engines/bcrypt_engine.rb
 - lib/ccrypto/java/engines/cipher_engine.rb
 - lib/ccrypto/java/engines/compression_engine.rb
+- lib/ccrypto/java/engines/crystal_dilithium_engine.rb
+- lib/ccrypto/java/engines/crystal_kyber_engine.rb
 - lib/ccrypto/java/engines/data_conversion_engine.rb
 - lib/ccrypto/java/engines/decompression_engine.rb
 - lib/ccrypto/java/engines/digest_engine.rb
 - lib/ccrypto/java/engines/ecc_engine.rb
+- lib/ccrypto/java/engines/ed25519_engine.rb
 - lib/ccrypto/java/engines/hkdf_engine.rb
 - lib/ccrypto/java/engines/hmac_engine.rb
 - lib/ccrypto/java/engines/pbkdf2_engine.rb
@@ -108,11 +117,18 @@ files:
 - lib/ccrypto/java/engines/secret_key_engine.rb
 - lib/ccrypto/java/engines/secret_sharing_engine.rb
 - lib/ccrypto/java/engines/secure_random_engine.rb
+- lib/ccrypto/java/engines/x25519_engine.rb
+- lib/ccrypto/java/engines/x509_csr_engine.rb
 - lib/ccrypto/java/engines/x509_engine.rb
 - lib/ccrypto/java/ext/secret_key.rb
 - lib/ccrypto/java/ext/x509_cert.rb
+- lib/ccrypto/java/ext/x509_csr.rb
 - lib/ccrypto/java/jce_provider.rb
-- lib/ccrypto/java/keybundle_store/pkcs12.rb
+- lib/ccrypto/java/keystore/jce_keystore.rb
+- lib/ccrypto/java/keystore/jks_keystore.rb
+- lib/ccrypto/java/keystore/keystore.rb
+- lib/ccrypto/java/keystore/pem_keystore.rb
+- lib/ccrypto/java/keystore/pkcs12_keystore.rb
 - lib/ccrypto/java/utils/comparator.rb
 - lib/ccrypto/java/utils/memory_buffer.rb
 - lib/ccrypto/java/utils/native_helper.rb
@@ -136,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.29
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Cryptographic API for Java runtime based on Bouncycastle library. Provider

data/ccrypto-java.gemspec

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "lib/ccrypto/java/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "ccrypto-java"
-  spec.version       = Ccrypto::Java::VERSION
-  spec.authors       = ["Ian"]
-  spec.email         = ["cameronian0@protonmail.com"]
-
-  spec.summary       = "Cryptographic API for Java runtime based on Bouncycastle library. Provider for Ccrypto library"
-  spec.description   = "Refers to Ccrypto library for more info"
-  spec.homepage      = "https://github.com/cameronian/ccrypto-java"
-  spec.required_ruby_version = ">= 2.4.0"
-
-  #spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
-
-  #spec.metadata["homepage_uri"] = spec.homepage
-  #spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
-  #spec.metadata["changelog_uri"] = "TODO: Put your gem's CHANGELOG.md URL here."
-
-  # 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(File.expand_path(__dir__)) do
-    `git ls-files -z`.split("\x0").reject do |f|
-      (f == __FILE__) || f.match(%r{\A(?:(?: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"]
-
-  spec.add_dependency 'teLogger'
-  spec.add_dependency "toolrack"
-
-  spec.add_dependency 'ccrypto'
-  spec.add_development_dependency 'devops_assist'
-
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
-
-  # For more information and examples about making a new gem, checkout our
-  # guide at: https://bundler.io/guides/creating_gem.html
-end