ccrypto-java 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de516075322f46df8dc000fb1160c5719cc993b9ac3619e643eef54dfa4cf7c
-  data.tar.gz: eca79e4bf92f9cefb090e5aaa06401774a19d4d194cff264cf939f2200b2a772
+  metadata.gz: 6c5ed78934fdba66ff0a488debee35a2ea956c51b031a6ed1ffa3bc2bb09d870
+  data.tar.gz: 31506e93209f940df76eb23b1539bf962a1ae63210d90c1665a99c61d250dd20
 SHA512:
-  metadata.gz: 1e2d6bcefb3e2288526ccad521bcdaa01e959c3d4f336f8ce67c239f0f4fe6d958e95a6b601f8abc76a6ab3bf259d3ef2e94557d7d85195c68987609be83c298
-  data.tar.gz: b74f70994b7828b6db115c242cc5e4daed1452b67d1d801620ee4f91e8566a593fdd10c5616eaf0e9911f4482fc65b692cb501473ae5e940710cda125700cb7c
+  metadata.gz: 1f4115f58bb2db17cf07a7b9e203ac0fb992acb2db610b32c630ff7628293b24366e9ac18532367556ea3682f8d000aa21e8106aa9105f49a9fbef1dd5f57959
+  data.tar.gz: 43e671c27f1e129bed89221f0200106ae584b92292d89c92d82a085123d562c06ddc2ca2368ddf87a0032d1c9c43fe8697ac8902038d04dc52da3582c7fce865

data/.java-version

@@ -1 +1 @@
-11
+11.0

data/.release_history.yml

@@ -0,0 +1,4 @@
+---
+ccrypto-java:
+- :version: 0.1.0
+  :timestamp: 1660210263.865093

data/.ruby-version

@@ -0,0 +1 @@
+9.4.2.0

data/Gemfile

@@ -9,5 +9,5 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-#gem "ccrypto", git: "ccrypto", branch: 'main'
+gem "ccrypto", git: "ccrypto", branch: 'main'
 

data/Gemfile.lock

@@ -1,70 +1,82 @@
-PATH
-  remote: .
+GIT
+  remote: ccrypto
+  revision: 4e1c1ce7dea1217b5653558a1473c903e1148e91
+  branch: main
   specs:
-    ccrypto-java (0.1.0)
-      ccrypto
+    ccrypto (0.2.0)
+      activesupport
       teLogger
       toolrack
 
+PATH
+  remote: .
+  specs:
+    ccrypto-java (0.1.8)
+      ccrypto (~> 0.2.0)
+      teLogger (~> 0.2)
+      toolrack (~> 0.23)
+
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.6)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    base58 (0.2.3)
-    ccrypto (0.1.0)
-      activesupport
-      teLogger
-      toolrack
-    concurrent-ruby (1.1.10)
-    devops_assist (0.2.0)
-      git_cli
-      git_cli_prompt
-      gvcs
-      teLogger
-      toolrack
-      tty-prompt
+    base64 (0.2.0)
+    bigdecimal (3.1.5)
+    bigdecimal (3.1.5-java)
+    colorize (1.1.0)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
-    git_cli (0.9.0)
-      gvcs
+    drb (2.2.0)
+      ruby2_keywords
+    git_cli (0.13.9)
       ptools (~> 1.4.0)
-      tlogger
-      toolrack
-    git_cli_prompt (0.2.2)
-      tlogger
-      toolrack
-      tty-prompt
-    gvcs (0.1.0)
-    i18n (1.10.0)
+      teLogger (> 0.2)
+      toolrack (> 0.23)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    minitest (5.16.2)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    ptools (1.4.2)
-    rake (13.0.6)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    ptools (1.4.3)
+    rake (13.1.0)
+    release-gem (0.3.3)
+      colorize (~> 1.1)
+      git_cli (~> 0.13)
+      pastel (~> 0.8)
+      teLogger (~> 0.2)
+      toolrack (~> 0.23)
+      tty-command (~> 0.10)
+      tty-prompt (~> 0.23)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    teLogger (0.1.0)
-    tlogger (0.26.3)
-    toolrack (0.18.6)
-      base58
-      tlogger
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.1)
+    ruby2_keywords (0.0.5)
+    teLogger (0.2.2)
+    toolrack (0.24.1)
     tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
     tty-cursor (0.7.1)
     tty-prompt (0.23.1)
       pastel (~> 0.8)
@@ -73,22 +85,25 @@ GEM
       tty-cursor (~> 0.7)
       tty-screen (~> 0.8)
       wisper (~> 2.0)
-    tty-screen (0.8.1)
-    tzinfo (2.0.4)
+    tty-screen (0.8.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     wisper (2.0.1)
-    zeitwerk (2.6.0)
 
 PLATFORMS
+  arm64-darwin-23
   universal-java-1.8
   universal-java-11
+  universal-java-17
+  universal-java-19
   x86_64-linux
 
 DEPENDENCIES
+  ccrypto!
   ccrypto-java!
-  devops_assist
   rake (~> 13.0)
+  release-gem
   rspec (~> 3.0)
 
 BUNDLED WITH
-   2.3.6
+   2.5.1

data/Rakefile

@@ -3,8 +3,9 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-require 'devops_assist'
+#require 'devops_assist'
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
+require 'release/gem'

data/bin/console

@@ -4,6 +4,20 @@
 require "bundler/setup"
 require "ccrypto/java"
 
+path = File.join(File.dirname(__FILE__),"..","jars","*.jar")
+puts "Loading BC library from #{File.dirname(path)}"
+Dir.glob(path).each do |l|
+  require File.expand_path(l)
+end
+
+BCPROV = org.bouncycastle.jce.provider.BouncyCastleProvider.new 
+if not java.security.Security.get_providers.to_a.include?(BCPROV)
+  java.security.Security.add_provider(BCPROV)
+  puts "Provider #{BCPROV.name} #{BCPROV.version} loaded and added"
+else
+  puts "Provider #{BCPROV.name} #{BCPROV.version} loaded"
+end
+
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 

data/lib/ccrypto/java/bc_const_mapping.rb

@@ -0,0 +1,42 @@
+
+
+module Ccrypto
+  module Java
+
+    # 
+    # Map constants defined in Ccrypto::X509::CertProfile
+    module BCConstMapping
+     
+      KeyUsageMapping = {
+        digitalSignature: org.bouncycastle.asn1.x509::KeyUsage::digitalSignature,
+        nonRepudiation: org.bouncycastle.asn1.x509::KeyUsage::nonRepudiation,
+        keyEncipherment: org.bouncycastle.asn1.x509::KeyUsage::keyEncipherment,
+        dataEncipherment: org.bouncycastle.asn1.x509::KeyUsage::dataEncipherment,
+        keyAgreement: org.bouncycastle.asn1.x509::KeyUsage::keyAgreement,
+        keyCertSign: org.bouncycastle.asn1.x509::KeyUsage::keyCertSign,
+        crlSign: org.bouncycastle.asn1.x509::KeyUsage::cRLSign,
+        encipherOnly: org.bouncycastle.asn1.x509::KeyUsage::encipherOnly,
+        decipherOnly: org.bouncycastle.asn1.x509::KeyUsage::decipherOnly
+      }
+
+      ExtKeyUsageMapping = {
+          allPurpose: org.bouncycastle.asn1.x509.KeyPurposeId::anyExtendedKeyUsage,
+          serverAuth: org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_serverAuth,
+          clientAuth: org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_clientAuth,
+          codeSigning: org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_codeSigning,
+          emailProtection: org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_emailProtection,
+          timeStamping: org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_timeStamping,
+          OCSPSigning:  org.bouncycastle.asn1.x509.KeyPurposeId::id_kp_OCSPSigning,
+          #ipSecIKE: "IPSec Initial Key Exchange",
+          #msCodeInd: "Microsoft Code Ind",
+          #msCodeCom: "Microsoft Code Com",
+          #msCtlsign: "Microsoft CTL Sign",
+          #msEFS: "Microsoft EFS",
+          #dvcs: "DVCS purposes"
+      }
+
+      
+
+    end
+  end
+end

data/lib/ccrypto/java/data_conversion.rb

@@ -1,4 +1,5 @@
 
+require 'tempfile'
 
 module Ccrypto
   module Java
@@ -15,13 +16,17 @@ module Ccrypto
       # end from_hex
 
       def to_b64(bin)
-        String.from_java_bytes(java.util.Base64.encoder.encode(bin))
+        String.from_java_bytes(java.util.Base64.encoder.encode(to_java_bytes(bin)))
       end
       # end to_b64
       #
 
       def to_b64_mime(bin)
-        String.from_java_bytes(java.util.Base64.mime_encoder.encode(bin))
+        String.from_java_bytes(java.util.Base64.mime_encoder.encode(to_java_bytes(bin)))
+      end
+
+      def from_b64_mime(str)
+        java.util.Base64.mime_decoder.decode(str)
       end
 
       def from_b64(str)
@@ -46,9 +51,12 @@ module Ccrypto
       end
 
       def to_java_bytes(val, encoding = nil)
+        #logger.debug "Given #{val} to convert to java bytes"
         case val
         when String
           val.to_java_bytes
+        when Array
+          val.join.to_java_bytes
         when java.lang.String
           if not_empty?(encoding)
             val.getBytes(encoding)
@@ -57,6 +65,15 @@ module Ccrypto
           end
         when Ccrypto::Java::ManagedMemoryBuffer
           val.bytes
+        when ::Tempfile
+          val.rewind
+          baos = java.io.ByteArrayOutputStream.new
+          while not val.eof?
+            baos.write(val.read(Java::READ_BUF_SIZE).to_java_bytes)
+          end
+          res = baos.toByteArray
+          logger.debug "Tempfile has #{res.length} bytes"
+          res
         else
           if val.respond_to?(:encoded)
             val.encoded
@@ -66,6 +83,10 @@ module Ccrypto
         end
       end
 
+      def logger
+        Ccrypto::Java.logger(:data_conv)
+      end
+
       # 
       # Add the methods to class level
       #

data/lib/ccrypto/java/engines/argon2_engine.rb

@@ -0,0 +1,95 @@
+
+require_relative '../data_conversion'
+
+module Ccrypto
+  module Java
+    
+    class Argon2Engine
+      include DataConversion
+      include TR::CondUtils
+      
+      def initialize(conf, &block)
+        
+        raise KDFEngineException, "Argon2 config is expected" if not conf.is_a?(Ccrypto::Argon2Config)
+        raise KDFEngineException, "Output bit length (outBitLength) value is not given or not a positive value (Given #{conf.outBitLength})" if is_empty?(conf.outBitLength) or conf.outBitLength <= 0
+
+        #logger.warn "Memory cost is less then 1GB (recommended value)" if conf.cost < 1024*1024*1024
+
+        @config = conf
+      end
+
+      def derive(input, outFormat = :binary)
+       
+        gen = org.bouncycastle.crypto.generators.Argon2BytesGenerator.new
+        builder = org.bouncycastle.crypto.params.Argon2Parameters::Builder.new
+
+        logger.debug "outBitLength : #{@config.outBitLength} / #{@config.outBitLength/8} bytes"
+        outBuf = ::Java::byte[@config.outBitLength/8].new
+
+        logger.debug "Iteration : #{@config.iter}"
+        builder.withIterations(@config.iter)
+
+        logger.debug "Cost : #{2**@config.cost}"
+        #builder.withMemoryAsKB(@config.cost)  # unit here is Kilobyte. Config standardize to byte length
+        builder.withMemoryPowOfTwo(@config.cost)  
+
+        logger.debug "Parallel : #{@config.parallel}"
+        builder.withParallelism(@config.parallel)
+
+        logger.debug "Salt : #{to_hex(@config.salt)}"
+        builder.withSalt(to_java_bytes(@config.salt))
+
+        #logger.debug "Secret : #{to_b64(to_java_bytes(@config.secret))}"
+        if not (@config.secret.nil? or @config.secret.empty?)
+          logger.debug "Secret given #{to_hex(@config.secret)}" 
+          builder.withSecret(to_java_bytes(@config.secret)) 
+        else
+          logger.debug "Empty secret value" 
+        end
+
+        case @config.variant
+        when :argon2d
+          logger.debug "Variant : argon2d"
+          builder.withVersion(0)
+        when :argon2i
+          logger.debug "Variant : argon2i"
+          builder.withVersion(1)
+        when :argon2id
+          logger.debug "Variant : argon2id"
+          builder.withVersion(2)
+        when :argon2_version_10
+          logger.debug "Variant : argon2_version_10"
+          # 0x10
+          builder.withVersion(16)
+        when :argon2_version_13
+          logger.debug "Variant : argon2_version_13"
+          # 0x13
+          builder.withVersion(19)
+        else
+          raise KDFEngineException, "Unknown variant '#{@config.variant}'"
+        end
+
+        gen.init(builder.build())
+
+        gen.generateBytes(to_java_bytes(input), outBuf)
+
+        case outFormat
+        when :hex
+          to_hex(outBuf)
+        when :b64
+          to_b64(outBuf)
+        else
+          outBuf
+        end
+
+      end
+
+      private
+      def logger
+        Ccrypto::Java.logger(:argon2_eng)
+      end
+
+    end
+
+  end
+end

data/lib/ccrypto/java/engines/asn1_engine.rb

@@ -47,7 +47,8 @@ module Ccrypto
           ASN1Object.new(type, val)
 
         when :int
-          ASN1Object.new(type,org.bouncycastle.asn1.DERInteger.new(val))
+          #ASN1Object.new(type,org.bouncycastle.asn1.DERInteger.new(val))
+          ASN1Object.new(type,org.bouncycastle.asn1.ASN1Integer.new(val))
           #Java::OrgBouncycastleAsn1::DERInteger.new(val)
 
         when :bin

data/lib/ccrypto/java/engines/bcrypt_engine.rb

@@ -0,0 +1,56 @@
+
+require_relative '../data_conversion'
+
+module Ccrypto
+  module Java
+    
+    class BCryptEngine
+      include TR::CondUtils
+      include DataConversion
+
+      def initialize(*args, &block)
+        @config = args.first
+
+        raise KDFEngineException, "Ccrypto::BCryptConfig is expected. Given #{@config}" if not @config.is_a?(Ccrypto::BCryptConfig)
+
+        @config.salt = SecureRandom.random_bytes(16) if is_empty?(@config.salt)
+      end
+
+      def derive(input, output = :binary)
+        
+        begin
+
+          binput = to_java_bytes(input)
+
+          #logger.debug "bcrypt input : #{binput.inspect}"
+          logger.debug "bcrypt salt : #{to_hex(@config.salt)}"
+          logger.debug "bcrypt cost : #{@config.cost}"
+
+          res = org.bouncycastle.crypto.generators.BCrypt.generate(binput, to_java_bytes(@config.salt), @config.cost)
+
+          case output
+          when :b64
+            to_b64(res)
+          when :hex
+            to_hex(res)
+          else
+            res
+          end
+
+        rescue Exception => ex
+          raise KDFEngineException, ex
+        end
+        
+      end
+
+
+      private
+      def logger
+        Ccrypto::Java.logger(:bcrypt)
+      end
+
+      
+    end
+
+  end
+end