harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r579223 - in /harmony/enhanced/classlib/trunk: depends/files/bcprov/ depends/files/bcprov/org/ depends/files/bcprov/org/bouncycastle/ depends/files/bcprov/org/bouncycastle/crypto/ depends/files/bcprov/org/bouncycastle/crypto/engines/ make/
Date Tue, 25 Sep 2007 12:42:21 GMT
Author: hindessm
Date: Tue Sep 25 05:42:20 2007
New Revision: 579223

URL: http://svn.apache.org/viewvc?rev=579223&view=rev
Log:
Replacing IDEAEngine.class in bcprov.jar with dummy version.

Added:
    harmony/enhanced/classlib/trunk/depends/files/bcprov/
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.class
  (with props)
    harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java
  (with props)
Modified:
    harmony/enhanced/classlib/trunk/make/build-java.xml
    harmony/enhanced/classlib/trunk/make/depends.properties
    harmony/enhanced/classlib/trunk/make/depends.xml

Added: harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.class
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.class?rev=579223&view=auto
==============================================================================
Binary file - no diff available.

Propchange: harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.class
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java?rev=579223&view=auto
==============================================================================
--- harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java
(added)
+++ harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java
Tue Sep 25 05:42:20 2007
@@ -0,0 +1,55 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package org.bouncycastle.crypto.engines;
+
+import org.bouncycastle.crypto.*;
+import org.bouncycastle.crypto.params.KeyParameter;
+
+public class IDEAEngine implements BlockCipher
+{
+
+    public IDEAEngine()
+    {
+    }
+
+    public void init(boolean forEncryption, CipherParameters params)
+    {
+        throw new IllegalArgumentException("IDEA not supported");
+    }
+
+    public String getAlgorithmName()
+    {
+        return "IDEA";
+    }
+
+    public int getBlockSize()
+    {
+        return 8;
+    }
+
+    public int processBlock(byte[] in, int inOff, byte[] out, int outOff)
+    {
+        throw new IllegalStateException("IDEA not supported");
+    }
+
+    public void reset()
+    {
+    }
+
+    protected static final int BLOCK_SIZE = 8;
+}

Propchange: harmony/enhanced/classlib/trunk/depends/files/bcprov/org/bouncycastle/crypto/engines/IDEAEngine.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/classlib/trunk/make/build-java.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-java.xml?rev=579223&r1=579222&r2=579223&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-java.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-java.xml Tue Sep 25 05:42:20 2007
@@ -227,7 +227,8 @@
         </copy>
 
         <!-- Copy across the extension dependency jars -->
-        <copy todir="${hy.jdk}/jre/lib/ext" flatten="yes" overwrite="true">
+        <copy tofile="${hy.jdk}/jre/lib/ext/bcprov.jar" verbose="true"
+              flatten="yes" overwrite="true">
             <fileset file="${bcprov.jar}" />
         </copy>
 

Modified: harmony/enhanced/classlib/trunk/make/depends.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.properties?rev=579223&r1=579222&r2=579223&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.properties (original)
+++ harmony/enhanced/classlib/trunk/make/depends.properties Tue Sep 25 05:42:20 2007
@@ -34,7 +34,8 @@
 junit.md5=28e7eb9eeefe31a657c68755bfccc541
 
 bcprov.dir=${depends.jars}/bcprov-jdk15-137
-bcprov.jar=${bcprov.dir}/bcprov.jar
+bcprov.orig.jar=${bcprov.dir}/bcprov.jar
+bcprov.jar=${bcprov.dir}/bcprov.noidea.jar
 bcprov.url=http://www.bouncycastle.org/download/bcprov-jdk15-137.jar
 bcprov.md5=7cdb436aaa4b222db7fc02495dfcde51
 

Modified: harmony/enhanced/classlib/trunk/make/depends.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/depends.xml?rev=579223&r1=579222&r2=579223&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/depends.xml (original)
+++ harmony/enhanced/classlib/trunk/make/depends.xml Tue Sep 25 05:42:20 2007
@@ -40,7 +40,7 @@
         <check-one-file src="${xalan.url}" dest="${xalan.jar}" />
         <check-one-file src="${xerces.url}" dest="${xerces.zip}" />
         <check-one-file src="${junit.url}" dest="${junit.jar}" />
-        <check-one-file src="${bcprov.url}" dest="${bcprov.jar}" />
+        <check-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}" />
         <check-one-file src="${icu4j.url}" dest="${icu4j.jar}" />
         <check-one-file src="${mx4j.url}" dest="${mx4j.zip}" />
         <check-one-file src="${jetty.url}" dest="${jetty.jar}" />
@@ -97,7 +97,7 @@
     </target>
 
     <target name="-extract"
-         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces" />
+         depends="-extract-props,-extract-mx4j,-extract-dejavu-fonts,-extract-xerces,-extract-idea-from-bcprov"
/>
 
     <target name="-extract-props">
         <uptodate property="dejavu-fonts.uptodate"
@@ -109,6 +109,13 @@
         <uptodate property="xerces.uptodate"
                   srcfile="${xerces.zip}"
                   targetfile="${xerces.dir}/xercesImpl.jar" />
+        <uptodate property="bcprov.uptodate"
+                  targetfile="${bcprov.jar}">
+            <srcfiles file="${bcprov.orig.jar}" />
+            <srcfiles dir="depends/files/bcprov"
+                      includes="**/IDEAEngine.class" />
+        </uptodate>
+
     </target>
 
     <target name="-extract-dejavu-fonts" unless="dejavu-fonts.uptodate">
@@ -151,6 +158,18 @@
         <delete dir="${xerces.dir}.tmp" />
     </target>
 
+    <target name="-extract-idea-from-bcprov" unless="bcprov.uptodate">
+        <zip destfile="${bcprov.jar}">
+            <zipfileset src="${bcprov.orig.jar}">
+                <exclude name="**/BCKEY.*" />
+                <exclude name="**/IDEAEngine.class" />
+            </zipfileset>
+            <fileset dir="depends/files/bcprov">
+                <include name="**/IDEAEngine.class" />
+            </fileset>
+        </zip>
+    </target>
+
     <!-- 
        *  FIXME : the following awful little hack is because we noticed that for whatever
        *  reason, we can't link with libjpg.a et al on at least to kinds of 64-bit linux
@@ -345,7 +364,7 @@
                            md5="${junit.md5}" />
 
     <mkdir dir="${bcprov.dir}" />
-    <download-one-file src="${bcprov.url}" dest="${bcprov.jar}"
+    <download-one-file src="${bcprov.url}" dest="${bcprov.orig.jar}"
                            md5="${bcprov.md5}" />
 
     <mkdir dir="${icu4j.dir}" />



Mime
View raw message