Changeset 6159

Timestamp:

02/04/08 20:47:59 (5 years ago)

Author:

nori090

Message:

lang/java/jimmy: rc4processをデーさんのやつに変更。勝手にパクってます。。@see http://d.hatena.ne.jp/ultraist/20060808/p2

Location:

lang/java/jimmy/trunk/jimmy/src/main/java/jimmy

Files:

• ARC4Cipher.java (added)
• RC4.java (modified) (2 diffs)

lang/java/jimmy/trunk/jimmy/src/main/java/jimmy/RC4.java

@@ -16 +16 @@
 package jimmy;
 
-import javax.crypto.Cipher;
-import javax.crypto.spec.SecretKeySpec;
 
 /**
@@ -32 +30 @@
     public static byte[] encrypt( byte[] key, byte[] bs )
         throws WinnyProtocolException {
-        return proc( key, bs, true );
+        byte[] newk = ConvertUtil.getCStringByte( key );
+        return new ARC4Cipher(newk).encrypt( bs );
     }
 
     public static byte[] decrypt( byte[] key, byte[] bs )
         throws WinnyProtocolException {
-        return proc( key, bs, false );
-    }
-
-    static byte[] proc( byte[] key, byte[] bs, boolean isEncrypt )
-        throws WinnyProtocolException {
-        try {
-            Cipher c = Cipher.getInstance( "RC4" );
-            /*
-             * ultraist 2006/12/23 01:25 WinnyのRC4はバグってるのかわざとかしらないけど、 キーの長さをstrlen()で求めているから0以降が読まれないんです。
-             * だから、一般的なライブラリだと通信中に複合エラーが出るようになります。
-             */
-            SecretKeySpec keyspec = new SecretKeySpec( ConvertUtil.getCStringByte( key ), "RC4" );
-            c.init( isEncrypt ? Cipher.ENCRYPT_MODE : Cipher.DECRYPT_MODE, keyspec );
-            byte[] ret = c.doFinal( bs );
-            return ret;
-        }
-        catch ( Exception e ) {
-            e.printStackTrace();
-            throw new WinnyProtocolException( e );
-        }
+        byte[] newk = ConvertUtil.getCStringByte( key );
+        return new ARC4Cipher(newk).decrypt( bs );
     }
 }