jruby-pgp 0.1.1 → 0.1.2

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

@@ -66,8 +66,7 @@ public class Encryptor {
 
     useBinaryFormat();
     useZIPCompression();
-
-    _algorithm = PGPEncryptedData.CAST5;
+    useCAST5Algorithm();
   }
 
   public Encryptor() {
@@ -185,12 +184,19 @@ public class Encryptor {
     return _algorithm;
   }
 
-  /**
-   * @see org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags
-  **/
   public void setAlgorithm(int algorithm) {
     _algorithm = algorithm;
   }
+  public void useIDEAAlgorithm()      { setAlgorithm(PGPEncryptedData.IDEA);      }
+  public void useTripleDESAlgorithm() { setAlgorithm(PGPEncryptedData.TRIPLE_DES);}
+  public void useCAST5Algorithm()     { setAlgorithm(PGPEncryptedData.CAST5);     }
+  public void useBlowfishAlgorithm()  { setAlgorithm(PGPEncryptedData.BLOWFISH);  }
+  public void useSaferAlgorithm()     { setAlgorithm(PGPEncryptedData.SAFER);     }
+  public void useDESAlgorithm()       { setAlgorithm(PGPEncryptedData.DES);       }
+  public void useAES128Algorithm()    { setAlgorithm(PGPEncryptedData.AES_128);   }
+  public void useAES192Algorithm()    { setAlgorithm(PGPEncryptedData.AES_192);   }
+  public void useAES256Algorithm()    { setAlgorithm(PGPEncryptedData.AES_256);   }
+  public void useTwoFishAlgorithm()   { setAlgorithm(PGPEncryptedData.TWOFISH);   }
 
   /** End Accessor Methods **/
 
@@ -227,6 +233,9 @@ public class Encryptor {
       if (fileName == null)
         fileName = PGPLiteralData.CONSOLE;
 
+      if (modificationTime == null)
+        modificationTime = new Date();
+
       PGPEncryptedDataGenerator   pgpDataGenerator        = newPGPDataGenerator();
       PGPLiteralDataGenerator     dataGenerator           = new PGPLiteralDataGenerator();
       PGPCompressedDataGenerator  compressedDataGenerator = new PGPCompressedDataGenerator(getCompression());

data/lib/pgp.rb

@@ -22,4 +22,10 @@ module PGP
   def self.string_to_bais(string)
     ByteArrayInputStream.new string.to_java_bytes
   end
+
+  # This exists for stubbing during tests
+  def self.time_now
+    Time.now
+  end
+
 end

data/lib/pgp/encryptor.rb

@@ -17,24 +17,24 @@ module PGP
       add_keys_from_enumerator(key_enumerator)
     end
 
-    def encrypt(cleartext, filename=nil)
-      name  = filename.to_s if filename
-      bytes = cleartext.to_java_bytes
+    def encrypt(cleartext, filename=nil, mtime=nil)
+      name    = filename.to_s if filename
+      bytes   = cleartext.to_java_bytes
+      mtime ||= PGP.time_now
 
-      _encrypt(bytes, name)
+      _encrypt(bytes, name, mtime)
     end
 
-    # @todo: Create an encryptStream method and pass it the file handle
     def encrypt_file(file_path)
       name  = File.basename(file_path)
       bytes = File.read(file_path).to_java_bytes
 
-      _encrypt(bytes, name)
+      _encrypt(bytes, name, File.mtime(file_path))
     end
 
     protected
-    def _encrypt(bytes, name)
-      encrypted_bytes   = encrypt_bytes(bytes, name)
+    def _encrypt(bytes, name, modification_time=nil)
+      encrypted_bytes   = encrypt_bytes(bytes, name, modification_time)
       encrypted_string  = String.from_java_bytes(encrypted_bytes)
     end
 

data/lib/pgp/version.rb

@@ -1,3 +1,3 @@
 module PGP
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

metadata

@@ -2,7 +2,7 @@
 name: jruby-pgp
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
   - Scott Gonyea
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-19 00:00:00 Z
+date: 2012-11-22 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rake