jruby-pgp 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: de4c087ff39c48c74f55fadcc25cc1e83b12ad9e
+  data.tar.gz: be35ef02a31e8863787e32ee5d94fde15987367d
+SHA512:
+  metadata.gz: 4b4d0535aa20052ec21b8197581028f83188487544d06c6a08bcc545a68e06584131706eb67e4be4a218812a38daf0bd7a17a0bdee97d32e4a529e7519378f4b
+  data.tar.gz: 3d6005d40df0a4ae37e51a346a1bc5fbf1ca727f7b3a4d7bb0e451de5ef68281c07d9949b8f25ded4e8ee89538f436eb5fbf70dc41cc16304b2705e1780b642d

data/ext/org/sgonyea/pgp/Decryptor.java

@@ -43,6 +43,18 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory;
 
 public class Decryptor {
 
@@ -77,7 +89,15 @@ public class Decryptor {
       if (pgpSecKey == null)
         return null;
 
-      return pgpSecKey.extractPrivateKey((passphrase == null ? null : passphrase.toCharArray()), "BC");
+      PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().
+        setProvider(BouncyCastleProvider.PROVIDER_NAME).
+        build();
+
+      PBESecretKeyDecryptor decryptor = new JcePBESecretKeyDecryptorBuilder(calcProvider).
+        setProvider(BouncyCastleProvider.PROVIDER_NAME).
+        build((passphrase == null ? null : passphrase.toCharArray()));
+
+      return pgpSecKey.extractPrivateKey(decryptor);
   }
 
   /** End Accessor Methods **/
@@ -97,7 +117,7 @@ public class Decryptor {
 
       InputStream decoderStream = PGPUtil.getDecoderStream(encryptedStream);
 
-      PGPObjectFactory pgpF = new PGPObjectFactory(decoderStream);
+      PGPObjectFactory pgpF = new JcaPGPObjectFactory(decoderStream);
       PGPEncryptedDataList encryptedData = null;
       Object encryptedObj = pgpF.nextObject();
       Iterator encryptedDataIterator;
@@ -127,13 +147,14 @@ public class Decryptor {
       if (privateKey == null)
         throw new IllegalArgumentException("secret key for message not found.");
 
-      decryptedDataStream = publicKeyData.getDataStream(privateKey, "BC");
+      PublicKeyDataDecryptorFactory decryptorFactory = new BcPublicKeyDataDecryptorFactory(privateKey);
+      decryptedDataStream = publicKeyData.getDataStream(decryptorFactory);
 
-      pgpFactory = new PGPObjectFactory(decryptedDataStream);
+      pgpFactory = new JcaPGPObjectFactory(decryptedDataStream);
 
       compressedData = (PGPCompressedData) pgpFactory.nextObject();
 
-      pgpFactory = new PGPObjectFactory(compressedData.getDataStream());
+      pgpFactory = new JcaPGPObjectFactory(compressedData.getDataStream());
 
       literallyTheRealFuckingData = (PGPLiteralData) pgpFactory.nextObject();
 

data/ext/org/sgonyea/pgp/PGPExampleUtil.java

@@ -15,11 +15,24 @@ import org.bouncycastle.openpgp.PGPLiteralData;
 import org.bouncycastle.openpgp.PGPPrivateKey;
 import org.bouncycastle.openpgp.PGPPublicKey;
 import org.bouncycastle.openpgp.PGPPublicKeyRing;
-import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
+import org.bouncycastle.openpgp.bc.BcPGPPublicKeyRingCollection;
 import org.bouncycastle.openpgp.PGPSecretKey;
 import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
 import org.bouncycastle.openpgp.PGPUtil;
+import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.jcajce.JcaPGPSecretKeyRingCollection;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
+import org.bouncycastle.openpgp.operator.PGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.PGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
+import org.bouncycastle.openpgp.operator.jcajce.JcaPGPDigestCalculatorProviderBuilder;
+import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.operator.PublicKeyDataDecryptorFactory;
+import org.bouncycastle.openpgp.operator.bc.BcPublicKeyDataDecryptorFactory;
 
 class PGPExampleUtil
 {
@@ -54,7 +67,15 @@ class PGPExampleUtil
             return null;
         }
 
-        return pgpSecKey.extractPrivateKey(pass, "BC");
+        PGPDigestCalculatorProvider calcProvider = new JcaPGPDigestCalculatorProviderBuilder().
+          setProvider(BouncyCastleProvider.PROVIDER_NAME).
+          build();
+
+        PBESecretKeyDecryptor decryptor = new JcePBESecretKeyDecryptorBuilder(calcProvider).
+          setProvider(BouncyCastleProvider.PROVIDER_NAME).
+          build(pass);
+
+        return pgpSecKey.extractPrivateKey(decryptor);
     }
 
     static PGPPublicKey readPublicKey(String fileName) throws IOException, PGPException
@@ -76,7 +97,7 @@ class PGPExampleUtil
      */
     static PGPPublicKey readPublicKey(InputStream input) throws IOException, PGPException
     {
-        PGPPublicKeyRingCollection pgpPub = new PGPPublicKeyRingCollection(
+        BcPGPPublicKeyRingCollection pgpPub = new BcPGPPublicKeyRingCollection(
             PGPUtil.getDecoderStream(input));
 
         //
@@ -123,7 +144,7 @@ class PGPExampleUtil
      */
     static PGPSecretKey readSecretKey(InputStream input) throws IOException, PGPException
     {
-        PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(
+        PGPSecretKeyRingCollection pgpSec = new JcaPGPSecretKeyRingCollection(
             PGPUtil.getDecoderStream(input));
 
         //

data/ext/org/sgonyea/pgp/Verifier.java

@@ -33,6 +33,7 @@ import org.bouncycastle.openpgp.*;
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentSignerBuilder;
 import org.bouncycastle.openpgp.operator.jcajce.JcaPGPContentVerifierBuilderProvider;
 import org.bouncycastle.openpgp.operator.jcajce.JcePBESecretKeyDecryptorBuilder;
+import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
 
 public class Verifier {
 
@@ -56,11 +57,11 @@ public class Verifier {
   {
     InputStream in = PGPUtil.getDecoderStream(inStream);
 
-    PGPObjectFactory            pgpFact = new PGPObjectFactory(in);
+    PGPObjectFactory            pgpFact = new JcaPGPObjectFactory(in);
 
     PGPCompressedData           c1 = (PGPCompressedData)pgpFact.nextObject();
 
-    pgpFact = new PGPObjectFactory(c1.getDataStream());
+    pgpFact = new JcaPGPObjectFactory(c1.getDataStream());
 
     PGPOnePassSignatureList     p1 = (PGPOnePassSignatureList)pgpFact.nextObject();
 

data/lib/pgp.rb

@@ -1,6 +1,6 @@
 require 'java'
-require 'pgp/jars/bcprov-jdk15on-147.jar'
-require 'pgp/jars/bcpg-jdk15on-147.jar'
+require 'pgp/jars/bcprov-jdk15on-153.jar'
+require 'pgp/jars/bcpg-jdk15on-153.jar'
 require 'pgp/jruby-pgp.jar'
 
 require 'pgp/decryptor'

data/lib/pgp/decryptor.rb

@@ -1,6 +1,7 @@
 module PGP
   class Decryptor < org.sgonyea.pgp.Decryptor
     include_package "org.bouncycastle.openpgp"
+    include_package "org.bouncycastle.openpgp.jcajce"
 
     def add_keys(key_string)
       self.private_keys = keyring_from_string(key_string)
@@ -33,7 +34,7 @@ module PGP
 
     def keyring_from_stream(stream)
       yafs = PGPUtil.get_decoder_stream(stream)
-      PGPSecretKeyRingCollection.new(yafs)
+      JcaPGPSecretKeyRingCollection.new(yafs)
     end
 
   end

data/lib/pgp/signer.rb

@@ -1,6 +1,7 @@
 module PGP
   class Signer < org.sgonyea.pgp.Signer
     include_package "org.bouncycastle.openpgp"
+    include_package "org.bouncycastle.openpgp.jcajce"
 
     def add_keys(key_string)
       self.private_keys = keyring_from_string(key_string)
@@ -32,7 +33,7 @@ module PGP
 
     def keyring_from_stream(stream)
       yafs = PGPUtil.get_decoder_stream(stream)
-      PGPSecretKeyRingCollection.new(yafs)
+      JcaPGPSecretKeyRingCollection.new(yafs)
     end
 
   end

data/lib/pgp/version.rb

@@ -1,3 +1,3 @@
 module PGP
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,88 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: jruby-pgp
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Scott Gonyea
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: jruby-openssl
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+  name: jruby-openssl
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+  name: rspec
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          MA==
-    none: false
+        version: '0'
+  name: rake-compiler
   prerelease: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: PGP for JRuby
 email:
 - me@sgonyea.com
@@ -112,8 +95,9 @@ files:
 - lib/pgp/cli/runner.rb
 - lib/pgp/decryptor.rb
 - lib/pgp/encryptor.rb
-- lib/pgp/jars/bcpg-jdk15on-147.jar
-- lib/pgp/jars/bcprov-jdk15on-147.jar
+- lib/pgp/jars/bcpg-jdk15on-153.jar
+- lib/pgp/jars/bcprov-jdk15on-153.jar
+- lib/pgp/jruby-pgp.jar
 - lib/pgp/private_key.rb
 - lib/pgp/ruby_decryptor.rb
 - lib/pgp/signer.rb
@@ -137,9 +121,9 @@ files:
 - spec/support/fixtures/unencrypted_file.txt.asc
 - spec/support/fixtures/wrong_private_key_for_signature.asc
 - spec/support/fixtures/wrong_public_key_for_signature.asc
-- lib/pgp/jruby-pgp.jar
 homepage: https://github.com/sgonyea/jruby-pgp
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -148,21 +132,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.6.4
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: This is a Java+JRuby wrapper around the Bouncy Castle PGP APIs
 test_files:
 - spec/lib/pgp/cli_spec.rb