On Fri, 2006-06-02 at 20:04 +1000, Raif S. Naffah wrote:
> hello Mathew,
>
> On Thursday 01 June 2006 09:52, Matthew Wringe wrote:
> > GNU Crypto currently doesn't implement the ISO 10126-2 padding
> > algorithm, this algorithm is used in xml encryption.
> >
> > The attached patch and java file will add ISO 10126 support to GNU
> > Crypto.
> >
> > Thanks,
>
> thanks for your contribution. 2 comments though:
>
> * in the crypto backend, we prefer the use of the PRNG utility class
> rather than SecureRandom --see gnu.java.security.sig.BaseSignature.
>
> * the layout does not follow the style of GNU Classpath --see any of the
> latest new classes in CVS.
Ok, I have updated the class to use the PRNG utility class, and I have
updated the class to better conform to the GNU Classpath coding style.
If there is anything else I need to change please let me know.
Also, has anyone gotten the eclipse checkstyle plugin
(http://eclipse-cs.sourceforge.net/) to work with the classpath
checkstyle-config.xml file? I keep on getting errors with the treewalker
and the header.
Thanks,
Matt Wringe
>
> cheers;
> rsn
/* ISO10126.java --
Copyright (C) 2006 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
GNU Classpath is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at
your option) any later version.
GNU Classpath is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Classpath; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
Linking this library statically or dynamically with other modules is
making a combined work based on this library. Thus, the terms and
conditions of the GNU General Public License cover the whole
combination.
As a special exception, the copyright holders of this library give you
permission to link this library with independent modules to produce an
executable, regardless of the license terms of these independent
modules, and to copy and distribute the resulting executable under
terms of your choice, provided that you also meet, for each linked
independent module, the terms and conditions of the license of that
module. An independent module is a module which is not derived from
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
package gnu.javax.crypto.pad;
import gnu.java.security.Registry;
import gnu.java.security.util.PRNG;
/**
* The implementation of the ISO 10126-2 padding algorithm.
* The last byte of the padding block is the number of padding bytes, all other
* padding bytes are random.
*/
public final class ISO10126 extends BasePad
{
/** used to generate random numbers for padding bytes. */
PRNG prng;
protected ISO10126()
{
super(Registry.ISO10126_PAD);
prng = PRNG.getInstance();
}
public void setup()
{
// Nothing to do here.
}
public byte[] pad(byte[] in, int offset, int length)
{
int padLength = blockSize - (length % blockSize);
byte[] pad = new byte[padLength];
/** generate random numbers for the padding bytes except for the last byte. */
prng.nextBytes(pad, 0, padLength -1);
/** The last byte contains the number of padding bytes. */
pad[pad.length - 1] = (byte) (padLength - 1);
return pad;
}
public int unpad(byte[] in, int offset, int length) throws WrongPaddingException
{
/** The last byte contains the number of padding bytes. */
int padLength = in[offset + length - 1] & 0xFF;
if (padLength > length)
{
throw new WrongPaddingException();
}
return padLength + 1;
}
}
Index: gnu/java/security/Registry.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/java/security/Registry.java,v
retrieving revision 1.5
diff -u -r1.5 Registry.java
--- gnu/java/security/Registry.java 22 Mar 2006 22:49:24 -0000 1.5
+++ gnu/java/security/Registry.java 31 May 2006 23:08:35 -0000
@@ -176,6 +176,9 @@
/** TLSv1 padding scheme. */
String TLS1_PAD = "tls1";
+
+ /** ISO 10126-2 padding scheme. */
+ String ISO10126_PAD = "iso10126";
// Pseudo-random number generators..........................................
Index: gnu/javax/crypto/pad/PadFactory.java
===================================================================
RCS file: /sources/classpath/classpath/gnu/javax/crypto/pad/PadFactory.java,v
retrieving revision 1.2
diff -u -r1.2 PadFactory.java
--- gnu/javax/crypto/pad/PadFactory.java 22 Mar 2006 22:49:24 -0000 1.2
+++ gnu/javax/crypto/pad/PadFactory.java 31 May 2006 23:08:35 -0000
@@ -38,6 +38,7 @@
package gnu.javax.crypto.pad;
+import gnu.javax.crypto.pad.ISO10126;
import gnu.java.security.Registry;
import java.util.Collections;
@@ -104,6 +105,10 @@
{
result = new TLS1();
}
+ else if (pad.equals(ISO10126_PAD))
+ {
+ result = new ISO10126();
+ }
if (result != null && !result.selfTest())
{
@@ -128,6 +133,7 @@
hs.add(EME_PKCS1_V1_5_PAD);
hs.add(SSL3_PAD);
hs.add(TLS1_PAD);
+ hs.add(ISO10126_PAD);
return Collections.unmodifiableSet(hs);
}
