[pkg-java] r2487 - in trunk/rssowl/debian: . patches
Gerardo Curiel
gerardo-guest at costa.debian.org
Sun Sep 24 19:28:36 UTC 2006
Author: gerardo-guest
Date: 2006-09-24 19:28:36 +0000 (Sun, 24 Sep 2006)
New Revision: 2487
Added:
trunk/rssowl/debian/patches/04_use-jce.patch
Removed:
trunk/rssowl/debian/patches/06_use-jce.patch
Modified:
trunk/rssowl/debian/control
Log:
Modified: trunk/rssowl/debian/control
===================================================================
--- trunk/rssowl/debian/control 2006-09-24 19:19:04 UTC (rev 2486)
+++ trunk/rssowl/debian/control 2006-09-24 19:28:36 UTC (rev 2487)
@@ -9,7 +9,7 @@
Package: rssowl
Architecture: all
-Depends: java-gcj-compat, libgconf-java, libitext-java, eclipse-platform, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java
+Depends: java-gcj-compat, xulrunner, libgconf-java, libitext-java, eclipse-platform, libcommons-logging-java, libjdom1-java, libcommons-httpclient-java, libcommons-codec-java
Description: A RSS / RDF / Atom Newsreader written in Java using SWT
RSSOwl is a application that lets you gather, organize, update,
and store information from any compliant source in a convenient,
Added: trunk/rssowl/debian/patches/04_use-jce.patch
===================================================================
--- trunk/rssowl/debian/patches/04_use-jce.patch (rev 0)
+++ trunk/rssowl/debian/patches/04_use-jce.patch 2006-09-24 19:28:36 UTC (rev 2487)
@@ -0,0 +1,77 @@
+--- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700
++++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700
+@@ -24,7 +24,9 @@
+
+ package net.sourceforge.rssowl.util;
+
+-import net.sourceforge.blowfishj.BlowfishEasy;
++import javax.crypto.*;
++import javax.crypto.spec.*;
++
+ import net.sourceforge.rssowl.controller.GUI;
+ import net.sourceforge.rssowl.util.shop.StringShop;
+
+@@ -56,15 +58,28 @@
+ /** An instance of the CryptoManager */
+ private static CryptoManager instance;
+
+- private BlowfishEasy blowFish;
++ private Cipher bfe;
++ private Cipher bfd;
++
+ private Hashtable crypta;
+
+ /**
+ * Called from the static factory Method
+ */
+ private CryptoManager() {
+- blowFish = new BlowfishEasy(new char[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 });
+- loadData();
++ try
++ {
++ bfe = Cipher.getInstance("Blowfish/ECB/PKCS7");
++ bfd = Cipher.getInstance("Blowfish/ECB/PKCS7");
++ SecretKeySpec skeyspec = new SecretKeySpec (new byte[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 },
++ "Blowfish");
++ bfe.init(Cipher.ENCRYPT_MODE, skeyspec);
++ bfd.init(Cipher.DECRYPT_MODE, skeyspec);
++ loadData();
++ }
++ catch (Exception _)
++ {
++ }
+ }
+
+ /**
+@@ -176,9 +191,12 @@
+ */
+ private void decryptData() {
+ Enumeration keys = crypta.keys();
+- while (keys.hasMoreElements()) {
+- String key = (String) keys.nextElement();
+- crypta.put(key, blowFish.decryptString((String) crypta.get(key)));
++ try {
++ while (keys.hasMoreElements()) {
++ String key = (String) keys.nextElement();
++ crypta.put(key, new String (bfd.doFinal((byte[]) crypta.get(key))));
++ }
++ } catch (Exception _) {
+ }
+ }
+
+@@ -187,9 +205,12 @@
+ */
+ private void encryptData() {
+ Enumeration keys = crypta.keys();
+- while (keys.hasMoreElements()) {
+- String key = (String) keys.nextElement();
+- crypta.put(key, blowFish.encryptString((String) crypta.get(key)));
++ try {
++ while (keys.hasMoreElements()) {
++ String key = (String) keys.nextElement();
++ crypta.put(key, bfe.doFinal(((String) crypta.get(key)).getBytes()));
++ }
++ } catch (Exception _) {
+ }
+ }
+
Property changes on: trunk/rssowl/debian/patches/04_use-jce.patch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/rssowl/debian/patches/06_use-jce.patch
===================================================================
--- trunk/rssowl/debian/patches/06_use-jce.patch 2006-09-24 19:19:04 UTC (rev 2486)
+++ trunk/rssowl/debian/patches/06_use-jce.patch 2006-09-24 19:28:36 UTC (rev 2487)
@@ -1,77 +0,0 @@
---- src/java/net/sourceforge/rssowl/util/CryptoManager.java.orig 2006-04-23 05:30:41.000000000 -0700
-+++ src/java/net/sourceforge/rssowl/util/CryptoManager.java 2006-05-06 09:27:30.000000000 -0700
-@@ -24,7 +24,9 @@
-
- package net.sourceforge.rssowl.util;
-
--import net.sourceforge.blowfishj.BlowfishEasy;
-+import javax.crypto.*;
-+import javax.crypto.spec.*;
-+
- import net.sourceforge.rssowl.controller.GUI;
- import net.sourceforge.rssowl.util.shop.StringShop;
-
-@@ -56,15 +58,28 @@
- /** An instance of the CryptoManager */
- private static CryptoManager instance;
-
-- private BlowfishEasy blowFish;
-+ private Cipher bfe;
-+ private Cipher bfd;
-+
- private Hashtable crypta;
-
- /**
- * Called from the static factory Method
- */
- private CryptoManager() {
-- blowFish = new BlowfishEasy(new char[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 });
-- loadData();
-+ try
-+ {
-+ bfe = Cipher.getInstance("Blowfish/ECB/PKCS7");
-+ bfd = Cipher.getInstance("Blowfish/ECB/PKCS7");
-+ SecretKeySpec skeyspec = new SecretKeySpec (new byte[] { 114, 115, 115, 111, 119, 108, 50, 48, 48, 52, 126 },
-+ "Blowfish");
-+ bfe.init(Cipher.ENCRYPT_MODE, skeyspec);
-+ bfd.init(Cipher.DECRYPT_MODE, skeyspec);
-+ loadData();
-+ }
-+ catch (Exception _)
-+ {
-+ }
- }
-
- /**
-@@ -176,9 +191,12 @@
- */
- private void decryptData() {
- Enumeration keys = crypta.keys();
-- while (keys.hasMoreElements()) {
-- String key = (String) keys.nextElement();
-- crypta.put(key, blowFish.decryptString((String) crypta.get(key)));
-+ try {
-+ while (keys.hasMoreElements()) {
-+ String key = (String) keys.nextElement();
-+ crypta.put(key, new String (bfd.doFinal((byte[]) crypta.get(key))));
-+ }
-+ } catch (Exception _) {
- }
- }
-
-@@ -187,9 +205,12 @@
- */
- private void encryptData() {
- Enumeration keys = crypta.keys();
-- while (keys.hasMoreElements()) {
-- String key = (String) keys.nextElement();
-- crypta.put(key, blowFish.encryptString((String) crypta.get(key)));
-+ try {
-+ while (keys.hasMoreElements()) {
-+ String key = (String) keys.nextElement();
-+ crypta.put(key, bfe.doFinal(((String) crypta.get(key)).getBytes()));
-+ }
-+ } catch (Exception _) {
- }
- }
-
More information about the pkg-java-commits
mailing list