pkcs7-cryptographer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4ad91179d8ddcac665a391f85dd03bb066a0fb14d8e09d997d5f363f9d5434
-  data.tar.gz: 24ef42a9ea9c625af0de5dffda7fdd178b48b1a94ec998a82d90d993f90101b3
+  metadata.gz: a02040b2706a005f695860704e338946e5cb68c6dcbf92fc7a2bb9c17b9425b2
+  data.tar.gz: 52a840fb9394002e9400e31a0d4960b0fefcfcab4466ce2535c3afcd2915932a
 SHA512:
-  metadata.gz: 88e9e776e81ceed455d41cb1bff2b7272725512ea0fa8121db0c6180d548639d6742326733f20853344cb08a7d7688509a6f5ced6126aa7a7bcb87e964cdbda4
-  data.tar.gz: 5c067348e4eadbb962c913ad1a8fa65037c03bb1cdabbd9305de7aef8ea4f2c5262a7aa6e15361763dc3d6a4f1791d05d6dbc1627676557a4b3b1becc117cc26
+  metadata.gz: 83d51e4785b3eff57409208a09956c29826e2dde08c75a7b87e340f70b129f2f80614b4c5792e159618354ae97059eff2febd58a01ce08c460758fba0feb9e52
+  data.tar.gz: 139e5b0e31cdfeed9c67468f92a21dc2f9f36bc3f207fe941df54194e199f43b2681e79072b5e1ea67f33696dd5422c4bf34595377845ea579cccb22487f85fe

data/.rubocop.yml

@@ -22,4 +22,7 @@ RSpec/MultipleMemoizedHelpers:
   Enabled: false
 
 RSpec/NestedGroups:
-  Max: 4
+  Max: 6
+
+RSpec/ExampleLength:
+  Max: 10

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pkcs7-cryptographer (1.0.0)
+    pkcs7-cryptographer (1.0.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/pkcs7/cryptographer.rb

@@ -39,12 +39,7 @@ module PKCS7
       certificate = x509_certificate(certificate)
       public_certificate = x509_certificate(public_certificate)
       signed_data = OpenSSL::PKCS7.sign(certificate, key, data)
-
-      encrypted_data = OpenSSL::PKCS7.encrypt(
-        [public_certificate],
-        signed_data.to_pem,
-        OpenSSL::Cipher.new("aes-256-cbc")
-      )
+      encrypted_data = encrypt(public_certificate, signed_data)
 
       encrypted_data.to_pem
     end
@@ -72,11 +67,33 @@ module PKCS7
       public_certificate = x509_certificate(public_certificate)
       encrypted_data = pkcs7(data)
       decrypted_data = encrypted_data.decrypt(key, certificate)
+
       signed_data = OpenSSL::PKCS7.new(decrypted_data)
+      verified = verified_signature?(signed_data, public_certificate, ca_store)
 
-      return false unless signed_data.verify([public_certificate], ca_store)
+      return false unless verified
 
       signed_data.data
     end
+
+    private
+
+    def encrypt(public_certificate, signed_data)
+      OpenSSL::PKCS7.encrypt(
+        [public_certificate],
+        signed_data.to_der,
+        OpenSSL::Cipher.new("aes-256-cbc"),
+        OpenSSL::PKCS7::BINARY
+      )
+    end
+
+    def verified_signature?(signed_data, public_certificate, ca_store)
+      signed_data.verify(
+        [public_certificate],
+        ca_store,
+        nil,
+        OpenSSL::PKCS7::NOINTERN | OpenSSL::PKCS7::NOCHAIN
+      )
+    end
   end
 end

data/lib/pkcs7/cryptographer/initializers.rb

@@ -8,6 +8,11 @@ module PKCS7
     # certificate, key or encrypted message string.
     ###
     module Initializers
+      # PRIVATE METHODS
+      # ------------------------------------------------------------------------
+
+      private
+
       def x509_certificate(certificate)
         wrap_in_class_or_return(certificate, OpenSSL::X509::Certificate)
       end

data/lib/pkcs7/cryptographer/version.rb

@@ -2,6 +2,6 @@
 
 module PKCS7
   class Cryptographer
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pkcs7-cryptographer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Daniel Munera Sanchez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-26 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler