cd6d4007aa
libjava/ChangeLog: 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * sources.am, Makfile.in: Regenerate. 2008-10-17 Matthias Klose <doko@ubuntu.com> * configure.ac: Fix bashisms. * configure: Regenerate. 2008-10-15 Matthias Klose <doko@ubuntu.com> * configure.ac: Disable build of gjdoc, if configured without --with-antlr-jar or if no antlr.jar found. * configure: Regenerate. 2008-10-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure.ac, * classpath/m4/ac_prog_antlr.m4, * classpath/m4/ac_prog_java.m4, * classpath/tools/Makefile.am: Ported --regen-gjdoc-parser patch and cantlr support from GNU Classpath. 2008-10-06 Andrew Haley <aph@redhat.com> * java/lang/Thread.java (Thread): Always create the ThreadLocalMap when creating a thread. (getThreadLocals) Don't lazily create the ThreadLocalMap. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/java/lang/ThreadLocalMap.java, * java/lang/ThreadLocalMap$Entry.h, * java/lang/ThreadLocalMap.h, * lib/java/lang/ThreadLocalMap.class, * lib/java/lang/ThreadLocalMap$Entry.class: Add the new files for the ThreadLocal patch. 2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/ChangeLog, * classpath/java/lang/InheritableThreadLocal.java, * classpath/java/lang/Thread.java, * classpath/java/lang/ThreadLocal.java: Merge Daniel Frampton's ThreadLocal patch. * gcj/javaprims.h: Updated. * java/lang/Thread.h: Regenerated. * java/lang/Thread.java: Replace WeakIdentityHashMap with ThreadLocalMap. (getThreadLocals()): Likewise. * java/lang/ThreadLocal.h: Regenerated. * java/lang/ThreadLocal.java: (computeNextHash()): New method. (ThreadLocal()): Initialise fastHash. (internalGet()): Updated to match Classpath's get(). (internalSet(Object)): Likewise for set(Object). (internalRemove()): Likewise for remove(). 2008-09-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * classpath/configure, * classpath/configure.ac: Resynchronise with Classpath's configure. * classpath/examples/Makefile.in: Add equivalent support for building as in tools/Makefile.in. * classpath/java/nio/Buffer.java, * classpath/java/nio/ByteBuffer.java, * classpath/java/nio/ByteBufferImpl.java, * classpath/java/nio/CharBuffer.java, * classpath/java/nio/CharBufferImpl.java, * classpath/java/nio/CharSequenceBuffer.java, * classpath/java/nio/CharViewBufferImpl.java, * classpath/java/nio/DirectByteBufferImpl.java, * classpath/java/nio/DoubleBuffer.java, * classpath/java/nio/DoubleBufferImpl.java, * classpath/java/nio/DoubleViewBufferImpl.java, * classpath/java/nio/FloatBuffer.java, * classpath/java/nio/FloatBufferImpl.java, * classpath/java/nio/FloatViewBufferImpl.java, * classpath/java/nio/IntBuffer.java, * classpath/java/nio/IntBufferImpl.java, * classpath/java/nio/IntViewBufferImpl.java, * classpath/java/nio/LongBuffer.java, * classpath/java/nio/LongBufferImpl.java, * classpath/java/nio/LongViewBufferImpl.java, * classpath/java/nio/MappedByteBuffer.java, * classpath/java/nio/MappedByteBufferImpl.java, * classpath/java/nio/ShortBuffer.java, * classpath/java/nio/ShortBufferImpl.java, * classpath/java/nio/ShortViewBufferImpl.java: Replace use of gnu.classpath.Pointer with gnu.gcj.RawData, and fix some formatting issues. * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java, * classpath/tools/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt: Regenerated (later version of antlr). * java/nio/Buffer.h: Regenerated. * java/nio/Buffer.java: Ported changes from Classpath. * java/nio/ByteBuffer.h, * java/nio/CharBuffer.h: Regenerated. * java/nio/DirectByteBufferImpl.java: Ported changes from Classpath. * java/nio/DoubleBuffer.h, * java/nio/FloatBuffer.h, * java/nio/IntBuffer.h, * java/nio/LongBuffer.h, * java/nio/MappedByteBuffer.h, * java/nio/MappedByteBufferImpl.h: Regenerated. * java/nio/MappedByteBufferImpl.java: Ported changes from Classpath. * java/nio/ShortBuffer.h: Regenerated. 2008-09-24 Matthias Klose <doko@ubuntu.com> * configure.ac: Search for antlr.jar, if not configured. * configure: Regenerate. 2008-09-24 Matthias Klose <doko@ubuntu.com> * Makefile.am: Build a gjdoc binary, if enabled. * configure.ac: Add options --disable-gjdoc, --with-antlr-jar=file. * Makefile.in, */Makefile.in, configure: Regenerate. 2008-09-22 Andrew Haley <aph@redhat.com> * java/lang/String.java (toString(char[], int, int)): New method. 2008-09-14 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080914). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --disable-gjdoc to classpath. * sources.am: Regenerated. * HACKING: Mention to build gjdoc in maintainer builds. * gnu/classpath/Configuration.java: Update classpath version. * gcj/javaprims.h: Update. 2008-09-08 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Replace natStringBuffer.cc and natStringBuilder.cc with natAbstractStringBuffer.cc. * Makefile.in: Regenerated. * java/lang/AbstractStringBuffer.java: (append(int)): Made native. (regionMatches(int,String)): Likewise. * java/lang/StringBuffer.h: Regenerated. * java/lang/StringBuffer.java: Remerged with GNU Classpath. * java/lang/StringBuilder.h: Regenerated. * java/lang/StringBuilder.java: Remerged with GNU Classpath. * java/lang/natAbstractStringBuffer.cc: Provide common native methods for StringBuffer and StringBuilder. * java/lang/natStringBuffer.cc, * java/lang/natStringBuilder.cc: Removed. 2008-09-04 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in, * classpath/configure: Regenerated. * gnu/gcj/util/natDebug.cc, * gnu/gcj/xlib/natColormap.cc, * gnu/gcj/xlib/natDisplay.cc, * gnu/gcj/xlib/natDrawable.cc, * gnu/gcj/xlib/natFont.cc, * gnu/gcj/xlib/natWMSizeHints.cc, * gnu/gcj/xlib/natWindow.cc, * gnu/gcj/xlib/natXImage.cc: Add :: prefix to namespaces. * java/io/CharArrayWriter.h, * java/lang/StringBuffer.h: Regenerated using patched gjavah. * java/lang/natStringBuffer.cc: Fix naming of append(jint). * java/sql/Timestamp.h: Regenerated using patched gjavah. * jni.cc: Rename p to functions to match change in GNU Classpath. * scripts/makemake.tcl: Switch gnu.java.math to BC compilation. * sources.am: Regenerated. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated location of Configuration.java. * classpath/lib/gnu/java/locale/LocaleData.class: Regenerated. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.in: Updated with new Java files. * classpath/configure: Regenerated. * classpath/tools/Makefile.am: Add missing use of GJDOC_EX so --disable-gjdoc works. * classpath/tools/Makefile.in: Regenerated. 2008-08-15 Matthias Klose <doko@ubuntu.com> Import GNU Classpath (libgcj-import-20080811). * Regenerate class and header files. * Regenerate auto* files. * configure.ac: Don't pass --with-fastjar to classpath, substitute new dummy value in classpath/gnu/classpath/Configuration.java.in, pass --disable-gjdoc to classpath. * scripts/makemake.tcl: * sources.am: Regenerated. * java/lang/AbstractStringBuffer.java, gnu/java/lang/VMCPStringBuilder.java: New, copied from classpath, use System instead of VMSystem. * java/lang/StringBuffer.java: Merge from classpath. * java/lang/ClassLoader.java: Merge from classpath. * gcj/javaprims.h: Update class definitions, remove _Jv_jobjectRefType, jobjectRefType definitions. libjava/classpath/ChangeLog.gcj: 2008-10-21 Matthias Klose <doko@ubuntu.com> * classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ... * classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here. * Update .class files. 2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Always generate parser in the srcdir. 2008-10-21 Matthias Klose <doko@ubuntu.com> * doc/Makefile.am (MAINTAINERCLEANFILES): Add gjdoc.1. * doc/Makefile.in: Regenerate. 2008-10-20 Matthias Klose <doko@ubuntu.com> * configure.ac: Don't check for working java, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_java.m4: Revert previous change. * m4/ac_prog_javac.m4: Apply it here. * configure: Regenerate. 2008-10-19 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac.m4: Don't check for working javac, if not configured with --enable-java-maintainer-mode. * configure: Regenerate. * Makefile.in, */Makefile.in: Regenerate. 2008-09-30 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for cantlr binary as well. 2008-09-29 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_antlr.m4: Check for antlr binary as well. 2008-09-28 Matthias Klose <doko@ubuntu.com> * PR libgcj/37636. Revert: 2008-02-20 Matthias Klose <doko@ubuntu.com> * tools/Makefile.am ($(TOOLS_ZIP)): Revert part of previous change, Do copy resource files in JAVA_MAINTAINER_MODE only. * tools/Makefile.in: Regenerate. 2008-09-14 Matthias Klose <doko@ubuntu.com> * m4/ac_prog_javac_works.m4, m4/ac_prog_javac.m4, m4/acinclude.m4: Revert local changes. * m4/ac_prog_antlr.m4: Check for an runantlr binary. * tools/Makefile.am, lib/Makefile.am: Revert local changes (JCOMPILER). * tools/Makefile.am: Remove USE_JAVAC_FLAGS, pass ANTLR_JAR in GLIBJ_CLASSPATH. 2008-09-14 Matthias Klose <doko@ubuntu.com> Revert: Daniel Frampton <zyridium at zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-08-15 Matthias Klose <doko@ubuntu.com> * m4/acinclude.m4 (CLASSPATH_JAVAC_MEM_CHECK): Remove unknown args for javac. libjava/classpath/ChangeLog: 2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr.m4: Remove redundant checks. * tools/Makefile.am: Use gjdoc_gendir when calling antlr. 2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Remove superfluous AC_PROG_JAVA call. 2008-10-06 Andrew John Hughes <gnu_andrew@member.fsf.org> * m4/ac_prog_antlr: Check for cantlr as well. * tools/Makefile.am: Only build GJDoc parser when both CREATE_GJDOC and CREATE_GJDOC_PARSER are on. 2008-10-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * configure.ac: Add regen-gjdoc-parser option, and separate antlr tests. * m4/ac_prog_antlr.m4: Turn single test into AC_LIB_ANTLR and AC_PROG_ANTLR. * m4/ac_prog_java.m4: Quote tests. * tools/Makefile.am: Support CREATE_GJDOC_PARSER option. 2008-09-14 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am: Check lib directly as well as glibj.zip for boot classes. * m4/acinclude.m4: Only require the class files to be built to allow the tools and examples to be built, not the installation of glibj.zip. * tools/Makefile.am: Check lib directly as well as glibj.zip for boot classes. 2008-09-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * examples/Makefile.am, * lib/Makefile.am: Add GCJ rules. * m4/ac_prog_javac.m4: Check whether JAVAC is gcj. * m4/ac_prog_javac_works.m4: Add GCJ rules. * m4/acinclude.m4: Don't bother checking for -J if using GCJ. * tools/Makefile.am: Add GCJ rules. 2007-08-23 Daniel Frampton <zyridium@zyridium.net> * AUTHORS: Added. * java/lang/InheritableThreadLocal.java, * java/lang/Thread.java, * java/lang/ThreadLocal.java: Modified to use java.lang.ThreadLocalMap. * java/lang/ThreadLocalMap.java: New cheaper ThreadLocal-specific WeakHashMap. 2008-02-07 Ian Rogers <ian.rogers@manchester.ac.uk> * java/util/zip/ZipEntry.java: Use byte fields instead of integer fields, store the time as well as the DOS time and don't retain a global Calendar instance. (setDOSTime(int)): Set KNOWN_DOSTIME instead of KNOWN_TIME, and unset KNOWN_TIME. (getDOSTime()): Compute DOS time from UNIX time only when needed. (clone()): Provide cloning via the ZipEntry constructor where possible. (setTime(long)): Don't compute DOS time at this point. (getCalendar()): Removed. 2008-09-09 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/getopt/Parser.java: (setHeader(String)): Make synchronized. (setFooter(String)): Likewise. * tools/gnu/classpath/tools/rmic/SourceGiopRmicCompiler.java, (reset()): Make synchronized. (name(Class)): Likewise. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * gnu/java/nio/charset/ByteDecodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. * gnu/java/nio/charset/ByteEncodeLoopHelper: (arrayDecodeLoop): Added new break label, escape to that label. 2008-09-04 Robert Schuster <robertschuster@fsfe.org> * java/text/DecimalFormat.java: (scanFix): Use 'i + 1' when looking at following character. (scanNegativePattern): Dito. 2008-09-02 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/gnu/classpath/tools/javah/ClassWrapper.java: (makeVtable()): Populate methodNameMap. (printMethods(CniPrintStream)): Always use pre-populated methodNameMap for bridge targets. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XImage.java (XImageProducer): remove @Override annotation to allow compilation on javac < 1.6 and ecj < 3.4. 2008-09-01 Mario Torre <neugens@aicas.com> * gnu/java/awt/peer/x/XGraphicsDevice.java (getDisplay): fix to support new Escher API. * gnu/java/awt/peer/x/XImage.java (getSource): method implemented. * gnu/java/awt/peer/x/XImage.java (XImageProducer): implement ImageProducer for getSource. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/BacktrackStack.java, * gnu/java/util/regex/CharIndexed.java, * gnu/java/util/regex/CharIndexedCharArray.java, * gnu/java/util/regex/CharIndexedCharSequence.java, * gnu/java/util/regex/CharIndexedInputStream.java, * gnu/java/util/regex/CharIndexedString.java, * gnu/java/util/regex/CharIndexedStringBuffer.java, * gnu/java/util/regex/RE.java, * gnu/java/util/regex/REException.java, * gnu/java/util/regex/REFilterInputStream.java, * gnu/java/util/regex/REMatch.java, * gnu/java/util/regex/REMatchEnumeration.java, * gnu/java/util/regex/RESyntax.java, * gnu/java/util/regex/REToken.java, * gnu/java/util/regex/RETokenAny.java, * gnu/java/util/regex/RETokenBackRef.java, * gnu/java/util/regex/RETokenChar.java, * gnu/java/util/regex/RETokenEnd.java, * gnu/java/util/regex/RETokenEndOfPreviousMatch.java, * gnu/java/util/regex/RETokenEndSub.java, * gnu/java/util/regex/RETokenIndependent.java, * gnu/java/util/regex/RETokenLookAhead.java, * gnu/java/util/regex/RETokenLookBehind.java, * gnu/java/util/regex/RETokenNamedProperty.java, * gnu/java/util/regex/RETokenOneOf.java, * gnu/java/util/regex/RETokenPOSIX.java, * gnu/java/util/regex/RETokenRange.java, * gnu/java/util/regex/RETokenRepeated.java, * gnu/java/util/regex/RETokenStart.java, * gnu/java/util/regex/RETokenWordBoundary.java, * gnu/java/util/regex/UncheckedRE.java: Fix indentation. 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/java/util/regex/RETokenStart.java: (getMaximumLength()): Add Override annotation. (matchThis(CharIndexed, REMatch)): Likewise. (returnsFixedLengthMatches()): Renamed from returnsFixedLengthmatches and added Override annotation. (findFixedLengthMatches(CharIndexed,REMatch,int)): Add Override annotation. (dump(CPStringBuilder)): Likewise. * gnu/javax/print/ipp/IppRequest.java: (RequestWriter.writeOperationAttributes(AttributeSet)): Throw exception, don't just create and drop it. * javax/management/MBeanServerPermission.java: (MBeanServerPermissionCollection.add(Permission)): Compare against individual Strings not the entire array, and store the result of replace. * javax/swing/text/html/StyleSheet.java: (setBaseFontSize(size)): Store result of trim(). 2008-09-01 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/tools/FileObject.java: (openReader(boolean)): Document new parameter. 2008-03-27 Michael Franz <mvfranz@gmail.com> PR classpath/35690: * javax/tools/FileObject.java: (toUri()): Fix case from toURI. (openReader(boolean)): Add missing boolean argument. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/35487: * gnu/javax/management/Server.java: (beans): Change to ConcurrentHashMap. (defaultDomain): Make final. (outer): Likewise. (LazyListenersHolder): Added to wrap listeners, also now a ConcurrentHashMap, providing lazy initialisation safely. (sequenceNumber): Documented. (getBean(ObjectName)): Remove redundant cast. (addNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Remove map initialisation and use holder. (getObjectInstance(ObjectName)): Remove redundant cast. (registerMBean(Object,ObjectName)): Add bean atomically. (removeNotificationListener(ObjectName,NotificationListener)): Simplified. (removeNotificationListener(ObjectName,NotificationListener, NotificationFilter,Object)): Likewise. (notify(ObjectName,String)): Documented. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Server.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/management/Translator.java: Genericised. 2008-08-26 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/DefaultLoaderRepository.java, * javax/management/JMX.java, * javax/management/MBeanAttributeInfo.java, * javax/management/MBeanConstructorInfo.java, * javax/management/MBeanOperationInfo.java, * javax/management/MBeanServerDelegate.java: Fix warnings due to generics. 2008-08-25 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/management/MBeanPermission.java, * javax/management/MBeanServerDelegate.java, * javax/management/MBeanServerFactory.java, * javax/management/MBeanServerInvocationHandler.java, * javax/management/MBeanServerPermission.java: Fix warnings due to use of non-generic collections. 2008-08-25 Mario Torre <neugens@aicas.com> * gnu/javax/rmi/CORBA/RmiUtilities.java (readValue): check if sender is null to avoid NPE. 2008-08-22 Mario Torre <neugens@aicas.com> * gnu/CORBA/OrbFunctional.java (set_parameters): Fix NullPointerException checking when param is null. 2008-08-23 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (reset()): Reset append position so we don't try and append to the end of the old input. 2008-08-22 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: Also allow versions of GJDoc from 0.8* on, as CVS is 0.8.0-pre. 2008-08-21 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/32028: * m4/acinclude.m4: (CLASSPATH_WITH_GJDOC): Ensure version 0.7.9 is being used. 2008-08-20 Andrew John Hughes <gnu_andrew@member.fsf.org> * tools/Makefile.am: Add taglets subdirectory to list of excluded paths when GJDoc is not compiled. 2008-08-19 David P Grove <groved@us.ibm.com> * scripts/check_jni_methods.sh.in: Fix build issue on AIX by splitting generation of method list. 2008-08-18 Andrew John Hughes <gnu_andrew@member.fsf.org> * native/jni/gstreamer-peer/gst_native_pipeline.c: (get_free_space(int)): Use #else not #elif when there is no condition. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/31895: * java/text/DecimalFormat.java: (setCurrency(Currency)): Update prefixes and suffixes when currency changes. * java/text/DecimalFormatSymbols.java: (DecimalFormatSymbols(Locale)): Set locale earlier so it can be used by setCurrency(Currency). (setCurrency(Currency)): Set the symbol correctly using the locale of the instance. * java/util/Currency.java: Throw error instead of just printing a message. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * javax/activation/ActivationDataFlavor.java: Suppress warnings from public API. (mimeType): Made final. (representationClass): Added generic type and made final. (normalizeMimeTypeParameter(String,String)): Use CPStringBuilder. * javax/activation/CommandInfo.java: (verb): Made final. (className): Made final. * javax/activation/DataHandler.java: (dataSource): Made final. * javax/activation/FileDataSource.java: (file): Made final. * javax/activation/MailcapCommandMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeType.java: (toString()): Use CPStringBuilder. (getBaseType()): Likewise. * javax/activation/MimeTypeParameterList.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/MimeTypeParseException.java: (MimeTypeParseException(String,String)): Use CPStringBuilder. * javax/activation/MimetypesFileTypeMap.java: Use generics on collections and CPStringBuilder instead of StringBuffer. * javax/activation/URLDataSource.java: (url): Made final. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * gnu/javax/activation/viewers/ImageViewer.java, * gnu/javax/activation/viewers/TextEditor.java, * gnu/javax/activation/viewers/TextViewer.java, * javax/activation/ActivationDataFlavor.java, * javax/activation/CommandInfo.java, * javax/activation/CommandMap.java, * javax/activation/CommandObject.java, * javax/activation/DataContentHandler.java, * javax/activation/DataContentHandlerFactory.java, * javax/activation/DataHandler.java, * javax/activation/DataHandlerDataSource.java, * javax/activation/DataSource.java, * javax/activation/DataSourceDataContentHandler.java, * javax/activation/FileDataSource.java, * javax/activation/FileTypeMap.java, * javax/activation/MailcapCommandMap.java, * javax/activation/MimeType.java, * javax/activation/MimeTypeParameterList.java, * javax/activation/MimeTypeParseException.java, * javax/activation/MimetypesFileTypeMap.java, * javax/activation/ObjectDataContentHandler.java, * javax/activation/URLDataSource.java, * javax/activation/UnsupportedDataTypeException.java, * javax/activation/package.html, * resource/META-INF/mailcap.default, * resource/META-INF/mimetypes.default: Import GNU JAF CVS as of 17/08/2008. 2006-04-25 Archit Shah <ashah@redhat.com> * javax/activation/MimeTypeParameterList.java: Insert ';' separator before parameter list. 2005-06-29 Xavier Poinsard <xpoinsard@openpricer.com> * javax/activation/ObjectDataContentHandler.java: Fixed typo. 2005-05-28 Chris Burdess <dog@bluezoo.org> * javax/activation/CommandMap.java, * javax/activation/MailcapCommandMap.java: Updated to JAF 1.1. 2004-06-09 Chris Burdess <dog@bluezoo.org> * javax/activation/MailcapCommandMap.java: Fixed bug whereby x-java prefix was not attempted. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Added Laszlo. 2008-04-20 Andrew John Hughes <gnu_andrew@member.fsf.org> PR classpath/30436: * java/util/Scanner.java: Fix package to be java.util and correct indentation. 2007-07-25 Laszlo Andras Hernadi <e0327023@student.tuwien.ac.at> PR classpath/30436: * java/util/Scanner.java: Initial implementation. 2008-08-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * java/util/regex/Matcher.java: (toMatchResult()): Implemented. 2008-08-13 Joshua Sumali <jsumali@redhat.com> * doc/Makefile.am (gjdoc.pod): Generate gjdoc pod from cp-tools.texinfo instead of invoke.texi. Remove invoke.texi from EXTRA_DIST. * doc/invoke.texi: Removed and merged into ... * doc/cp-tools.texinfo: Here 2008-08-12 Robert Schuster <robertschuster@fsfe.org> * native/jni/java-net/local.c (local_bind): Removed fprintf call, fixed access outside of array bounds. From-SVN: r141271
609 lines
22 KiB
Java
609 lines
22 KiB
Java
/* Whirlpool.java --
|
|
Copyright (C) 2001, 2002, 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.java.security.hash;
|
|
|
|
import gnu.java.lang.CPStringBuilder;
|
|
|
|
import gnu.java.security.Configuration;
|
|
import gnu.java.security.Registry;
|
|
import gnu.java.security.util.Util;
|
|
|
|
import java.util.logging.Logger;
|
|
|
|
/**
|
|
* Whirlpool, a new 512-bit hashing function operating on messages less than
|
|
* 2 ** 256 bits in length. The function structure is designed according to the
|
|
* Wide Trail strategy and permits a wide variety of implementation trade-offs.
|
|
* <p>
|
|
* This implementation is of Whirlpool Version 3, described in [1] last revised
|
|
* on May 24th, 2003.
|
|
* <p>
|
|
* <b>IMPORTANT</b>: This implementation is not thread-safe.
|
|
* <p>
|
|
* References:
|
|
* <ol>
|
|
* <li><a href="http://planeta.terra.com.br/informatica/paulobarreto/WhirlpoolPage.html">
|
|
* The WHIRLPOOL Hashing Function</a>.<br>
|
|
* <a href="mailto:paulo.barreto@terra.com.br">Paulo S.L.M. Barreto</a> and
|
|
* <a href="mailto:vincent.rijmen@iaik.tugraz.at">Vincent Rijmen</a>.</li>
|
|
* </ol>
|
|
*/
|
|
public final class Whirlpool
|
|
extends BaseHash
|
|
{
|
|
private static final Logger log = Logger.getLogger(Whirlpool.class.getName());
|
|
private static final int BLOCK_SIZE = 64; // inner block size in bytes
|
|
|
|
/** The digest of the 0-bit long message. */
|
|
private static final String DIGEST0 =
|
|
"19FA61D75522A4669B44E39C1D2E1726C530232130D407F89AFEE0964997F7A7"
|
|
+ "3E83BE698B288FEBCF88E3E03C4F0757EA8964E59B63D93708B138CC42A66EB3";
|
|
|
|
/** Default number of rounds. */
|
|
private static final int R = 10;
|
|
|
|
/** Whirlpool S-box; p. 19. */
|
|
private static final String S_box = // p. 19 [WHIRLPOOL]
|
|
"\u1823\uc6E8\u87B8\u014F\u36A6\ud2F5\u796F\u9152"
|
|
+ "\u60Bc\u9B8E\uA30c\u7B35\u1dE0\ud7c2\u2E4B\uFE57"
|
|
+ "\u1577\u37E5\u9FF0\u4AdA\u58c9\u290A\uB1A0\u6B85"
|
|
+ "\uBd5d\u10F4\ucB3E\u0567\uE427\u418B\uA77d\u95d8"
|
|
+ "\uFBEE\u7c66\udd17\u479E\ucA2d\uBF07\uAd5A\u8333"
|
|
+ "\u6302\uAA71\uc819\u49d9\uF2E3\u5B88\u9A26\u32B0"
|
|
+ "\uE90F\ud580\uBEcd\u3448\uFF7A\u905F\u2068\u1AAE"
|
|
+ "\uB454\u9322\u64F1\u7312\u4008\uc3Ec\udBA1\u8d3d"
|
|
+ "\u9700\ucF2B\u7682\ud61B\uB5AF\u6A50\u45F3\u30EF"
|
|
+ "\u3F55\uA2EA\u65BA\u2Fc0\udE1c\uFd4d\u9275\u068A"
|
|
+ "\uB2E6\u0E1F\u62d4\uA896\uF9c5\u2559\u8472\u394c"
|
|
+ "\u5E78\u388c\ud1A5\uE261\uB321\u9c1E\u43c7\uFc04"
|
|
+ "\u5199\u6d0d\uFAdF\u7E24\u3BAB\ucE11\u8F4E\uB7EB"
|
|
+ "\u3c81\u94F7\uB913\u2cd3\uE76E\uc403\u5644\u7FA9"
|
|
+ "\u2ABB\uc153\udc0B\u9d6c\u3174\uF646\uAc89\u14E1"
|
|
+ "\u163A\u6909\u70B6\ud0Ed\ucc42\u98A4\u285c\uF886";
|
|
|
|
/** The 64-bit lookup tables; section 7.1 p. 13. */
|
|
private static final long[] T0 = new long[256];
|
|
private static final long[] T1 = new long[256];
|
|
private static final long[] T2 = new long[256];
|
|
private static final long[] T3 = new long[256];
|
|
private static final long[] T4 = new long[256];
|
|
private static final long[] T5 = new long[256];
|
|
private static final long[] T6 = new long[256];
|
|
private static final long[] T7 = new long[256];
|
|
|
|
/** The round constants. */
|
|
private static final long[] rc = new long[R];
|
|
|
|
/** caches the result of the correctness test, once executed. */
|
|
private static Boolean valid;
|
|
|
|
/** The 512-bit context as 8 longs. */
|
|
private long H0, H1, H2, H3, H4, H5, H6, H7;
|
|
|
|
/** Work area for computing the round key schedule. */
|
|
private long k00, k01, k02, k03, k04, k05, k06, k07;
|
|
private long Kr0, Kr1, Kr2, Kr3, Kr4, Kr5, Kr6, Kr7;
|
|
|
|
/** work area for transforming the 512-bit buffer. */
|
|
private long n0, n1, n2, n3, n4, n5, n6, n7;
|
|
private long nn0, nn1, nn2, nn3, nn4, nn5, nn6, nn7;
|
|
|
|
/** work area for holding block cipher's intermediate values. */
|
|
private long w0, w1, w2, w3, w4, w5, w6, w7;
|
|
|
|
static
|
|
{
|
|
long time = System.currentTimeMillis();
|
|
int ROOT = 0x11D; // para. 2.1 [WHIRLPOOL]
|
|
int i, r, j;
|
|
long s1, s2, s4, s5, s8, s9, t;
|
|
char c;
|
|
final byte[] S = new byte[256];
|
|
for (i = 0; i < 256; i++)
|
|
{
|
|
c = S_box.charAt(i >>> 1);
|
|
|
|
s1 = ((i & 1) == 0 ? c >>> 8 : c) & 0xFFL;
|
|
s2 = s1 << 1;
|
|
if (s2 > 0xFFL)
|
|
s2 ^= ROOT;
|
|
|
|
s4 = s2 << 1;
|
|
if (s4 > 0xFFL)
|
|
s4 ^= ROOT;
|
|
|
|
s5 = s4 ^ s1;
|
|
s8 = s4 << 1;
|
|
if (s8 > 0xFFL)
|
|
s8 ^= ROOT;
|
|
|
|
s9 = s8 ^ s1;
|
|
|
|
T0[i] = t = s1 << 56 | s1 << 48 | s4 << 40 | s1 << 32
|
|
| s8 << 24 | s5 << 16 | s2 << 8 | s9;
|
|
T1[i] = t >>> 8 | t << 56;
|
|
T2[i] = t >>> 16 | t << 48;
|
|
T3[i] = t >>> 24 | t << 40;
|
|
T4[i] = t >>> 32 | t << 32;
|
|
T5[i] = t >>> 40 | t << 24;
|
|
T6[i] = t >>> 48 | t << 16;
|
|
T7[i] = t >>> 56 | t << 8;
|
|
}
|
|
for (r = 0, i = 0; r < R; )
|
|
rc[r++] = (T0[i++] & 0xFF00000000000000L)
|
|
^ (T1[i++] & 0x00FF000000000000L)
|
|
^ (T2[i++] & 0x0000FF0000000000L)
|
|
^ (T3[i++] & 0x000000FF00000000L)
|
|
^ (T4[i++] & 0x00000000FF000000L)
|
|
^ (T5[i++] & 0x0000000000FF0000L)
|
|
^ (T6[i++] & 0x000000000000FF00L)
|
|
^ (T7[i++] & 0x00000000000000FFL);
|
|
time = System.currentTimeMillis() - time;
|
|
if (Configuration.DEBUG)
|
|
{
|
|
log.fine("Static data");
|
|
log.fine("T0[]:");
|
|
CPStringBuilder sb;
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T0[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T1[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T1[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T2[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T2[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T3[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T3[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("\nT4[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T4[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T5[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T6[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("T7[]:");
|
|
for (i = 0; i < 64; i++)
|
|
{
|
|
sb = new CPStringBuilder();
|
|
for (j = 0; j < 4; j++)
|
|
sb.append("0x").append(Util.toString(T5[i * 4 + j])).append(", ");
|
|
|
|
log.fine(sb.toString());
|
|
}
|
|
log.fine("rc[]:");
|
|
for (i = 0; i < R; i++)
|
|
log.fine("0x" + Util.toString(rc[i]));
|
|
|
|
log.fine("Total initialization time: " + time + " ms.");
|
|
}
|
|
}
|
|
|
|
/** Trivial 0-arguments constructor. */
|
|
public Whirlpool()
|
|
{
|
|
super(Registry.WHIRLPOOL_HASH, 20, BLOCK_SIZE);
|
|
}
|
|
|
|
/**
|
|
* Private constructor for cloning purposes.
|
|
*
|
|
* @param md the instance to clone.
|
|
*/
|
|
private Whirlpool(Whirlpool md)
|
|
{
|
|
this();
|
|
|
|
this.H0 = md.H0;
|
|
this.H1 = md.H1;
|
|
this.H2 = md.H2;
|
|
this.H3 = md.H3;
|
|
this.H4 = md.H4;
|
|
this.H5 = md.H5;
|
|
this.H6 = md.H6;
|
|
this.H7 = md.H7;
|
|
this.count = md.count;
|
|
this.buffer = (byte[]) md.buffer.clone();
|
|
}
|
|
|
|
public Object clone()
|
|
{
|
|
return (new Whirlpool(this));
|
|
}
|
|
|
|
protected void transform(byte[] in, int offset)
|
|
{
|
|
// apply mu to the input
|
|
n0 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n1 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n2 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n3 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n4 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n5 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n6 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
n7 = (in[offset++] & 0xFFL) << 56
|
|
| (in[offset++] & 0xFFL) << 48
|
|
| (in[offset++] & 0xFFL) << 40
|
|
| (in[offset++] & 0xFFL) << 32
|
|
| (in[offset++] & 0xFFL) << 24
|
|
| (in[offset++] & 0xFFL) << 16
|
|
| (in[offset++] & 0xFFL) << 8
|
|
| (in[offset++] & 0xFFL);
|
|
// transform K into the key schedule Kr; 0 <= r <= R
|
|
k00 = H0;
|
|
k01 = H1;
|
|
k02 = H2;
|
|
k03 = H3;
|
|
k04 = H4;
|
|
k05 = H5;
|
|
k06 = H6;
|
|
k07 = H7;
|
|
nn0 = n0 ^ k00;
|
|
nn1 = n1 ^ k01;
|
|
nn2 = n2 ^ k02;
|
|
nn3 = n3 ^ k03;
|
|
nn4 = n4 ^ k04;
|
|
nn5 = n5 ^ k05;
|
|
nn6 = n6 ^ k06;
|
|
nn7 = n7 ^ k07;
|
|
// intermediate cipher output
|
|
w0 = w1 = w2 = w3 = w4 = w5 = w6 = w7 = 0L;
|
|
for (int r = 0; r < R; r++)
|
|
{
|
|
// 1. compute intermediate round key schedule by applying ro[rc]
|
|
// to the previous round key schedule --rc being the round constant
|
|
Kr0 = T0[(int)((k00 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k07 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k06 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k05 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k04 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k03 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k02 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k01 & 0xFFL)] ^ rc[r];
|
|
Kr1 = T0[(int)((k01 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k00 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k07 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k06 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k05 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k04 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k03 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k02 & 0xFFL)];
|
|
Kr2 = T0[(int)((k02 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k01 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k00 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k07 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k06 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k05 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k04 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k03 & 0xFFL)];
|
|
Kr3 = T0[(int)((k03 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k02 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k01 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k00 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k07 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k06 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k05 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k04 & 0xFFL)];
|
|
Kr4 = T0[(int)((k04 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k03 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k02 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k01 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k00 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k07 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k06 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k05 & 0xFFL)];
|
|
Kr5 = T0[(int)((k05 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k04 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k03 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k02 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k01 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k00 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k07 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k06 & 0xFFL)];
|
|
Kr6 = T0[(int)((k06 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k05 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k04 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k03 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k02 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k01 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k00 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k07 & 0xFFL)];
|
|
Kr7 = T0[(int)((k07 >> 56) & 0xFFL)]
|
|
^ T1[(int)((k06 >> 48) & 0xFFL)]
|
|
^ T2[(int)((k05 >> 40) & 0xFFL)]
|
|
^ T3[(int)((k04 >> 32) & 0xFFL)]
|
|
^ T4[(int)((k03 >> 24) & 0xFFL)]
|
|
^ T5[(int)((k02 >> 16) & 0xFFL)]
|
|
^ T6[(int)((k01 >> 8) & 0xFFL)]
|
|
^ T7[(int)( k00 & 0xFFL)];
|
|
k00 = Kr0;
|
|
k01 = Kr1;
|
|
k02 = Kr2;
|
|
k03 = Kr3;
|
|
k04 = Kr4;
|
|
k05 = Kr5;
|
|
k06 = Kr6;
|
|
k07 = Kr7;
|
|
// 2. incrementally compute the cipher output
|
|
w0 = T0[(int)((nn0 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn7 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn6 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn5 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn4 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn3 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn2 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn1 & 0xFFL)] ^ Kr0;
|
|
w1 = T0[(int)((nn1 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn0 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn7 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn6 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn5 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn4 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn3 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn2 & 0xFFL)] ^ Kr1;
|
|
w2 = T0[(int)((nn2 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn1 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn0 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn7 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn6 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn5 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn4 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn3 & 0xFFL)] ^ Kr2;
|
|
w3 = T0[(int)((nn3 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn2 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn1 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn0 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn7 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn6 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn5 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn4 & 0xFFL)] ^ Kr3;
|
|
w4 = T0[(int)((nn4 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn3 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn2 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn1 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn0 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn7 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn6 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn5 & 0xFFL)] ^ Kr4;
|
|
w5 = T0[(int)((nn5 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn4 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn3 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn2 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn1 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn0 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn7 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn6 & 0xFFL)] ^ Kr5;
|
|
w6 = T0[(int)((nn6 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn5 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn4 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn3 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn2 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn1 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn0 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn7 & 0xFFL)] ^ Kr6;
|
|
w7 = T0[(int)((nn7 >> 56) & 0xFFL)]
|
|
^ T1[(int)((nn6 >> 48) & 0xFFL)]
|
|
^ T2[(int)((nn5 >> 40) & 0xFFL)]
|
|
^ T3[(int)((nn4 >> 32) & 0xFFL)]
|
|
^ T4[(int)((nn3 >> 24) & 0xFFL)]
|
|
^ T5[(int)((nn2 >> 16) & 0xFFL)]
|
|
^ T6[(int)((nn1 >> 8) & 0xFFL)]
|
|
^ T7[(int)( nn0 & 0xFFL)] ^ Kr7;
|
|
nn0 = w0;
|
|
nn1 = w1;
|
|
nn2 = w2;
|
|
nn3 = w3;
|
|
nn4 = w4;
|
|
nn5 = w5;
|
|
nn6 = w6;
|
|
nn7 = w7;
|
|
}
|
|
// apply the Miyaguchi-Preneel hash scheme
|
|
H0 ^= w0 ^ n0;
|
|
H1 ^= w1 ^ n1;
|
|
H2 ^= w2 ^ n2;
|
|
H3 ^= w3 ^ n3;
|
|
H4 ^= w4 ^ n4;
|
|
H5 ^= w5 ^ n5;
|
|
H6 ^= w6 ^ n6;
|
|
H7 ^= w7 ^ n7;
|
|
}
|
|
|
|
protected byte[] padBuffer()
|
|
{
|
|
// [WHIRLPOOL] p. 6:
|
|
// "...padded with a 1-bit, then with as few 0-bits as necessary to
|
|
// obtain a bit string whose length is an odd multiple of 256, and
|
|
// finally with the 256-bit right-justified binary representation of L."
|
|
// in this implementation we use 'count' as the number of bytes hashed
|
|
// so far. hence the minimal number of bytes added to the message proper
|
|
// are 33 (1 for the 1-bit followed by the 0-bits and the encoding of
|
|
// the count framed in a 256-bit block). our formula is then:
|
|
// count + 33 + padding = 0 (mod BLOCK_SIZE)
|
|
int n = (int)((count + 33) % BLOCK_SIZE);
|
|
int padding = n == 0 ? 33 : BLOCK_SIZE - n + 33;
|
|
byte[] result = new byte[padding];
|
|
// padding is always binary 1 followed by binary 0s
|
|
result[0] = (byte) 0x80;
|
|
// save (right justified) the number of bits hashed
|
|
long bits = count * 8;
|
|
int i = padding - 8;
|
|
result[i++] = (byte)(bits >>> 56);
|
|
result[i++] = (byte)(bits >>> 48);
|
|
result[i++] = (byte)(bits >>> 40);
|
|
result[i++] = (byte)(bits >>> 32);
|
|
result[i++] = (byte)(bits >>> 24);
|
|
result[i++] = (byte)(bits >>> 16);
|
|
result[i++] = (byte)(bits >>> 8);
|
|
result[i ] = (byte) bits;
|
|
return result;
|
|
}
|
|
|
|
protected byte[] getResult()
|
|
{
|
|
// apply inverse mu to the context
|
|
return new byte[] {
|
|
(byte)(H0 >>> 56), (byte)(H0 >>> 48), (byte)(H0 >>> 40), (byte)(H0 >>> 32),
|
|
(byte)(H0 >>> 24), (byte)(H0 >>> 16), (byte)(H0 >>> 8), (byte) H0,
|
|
(byte)(H1 >>> 56), (byte)(H1 >>> 48), (byte)(H1 >>> 40), (byte)(H1 >>> 32),
|
|
(byte)(H1 >>> 24), (byte)(H1 >>> 16), (byte)(H1 >>> 8), (byte) H1,
|
|
(byte)(H2 >>> 56), (byte)(H2 >>> 48), (byte)(H2 >>> 40), (byte)(H2 >>> 32),
|
|
(byte)(H2 >>> 24), (byte)(H2 >>> 16), (byte)(H2 >>> 8), (byte) H2,
|
|
(byte)(H3 >>> 56), (byte)(H3 >>> 48), (byte)(H3 >>> 40), (byte)(H3 >>> 32),
|
|
(byte)(H3 >>> 24), (byte)(H3 >>> 16), (byte)(H3 >>> 8), (byte) H3,
|
|
(byte)(H4 >>> 56), (byte)(H4 >>> 48), (byte)(H4 >>> 40), (byte)(H4 >>> 32),
|
|
(byte)(H4 >>> 24), (byte)(H4 >>> 16), (byte)(H4 >>> 8), (byte) H4,
|
|
(byte)(H5 >>> 56), (byte)(H5 >>> 48), (byte)(H5 >>> 40), (byte)(H5 >>> 32),
|
|
(byte)(H5 >>> 24), (byte)(H5 >>> 16), (byte)(H5 >>> 8), (byte) H5,
|
|
(byte)(H6 >>> 56), (byte)(H6 >>> 48), (byte)(H6 >>> 40), (byte)(H6 >>> 32),
|
|
(byte)(H6 >>> 24), (byte)(H6 >>> 16), (byte)(H6 >>> 8), (byte) H6,
|
|
(byte)(H7 >>> 56), (byte)(H7 >>> 48), (byte)(H7 >>> 40), (byte)(H7 >>> 32),
|
|
(byte)(H7 >>> 24), (byte)(H7 >>> 16), (byte)(H7 >>> 8), (byte) H7 };
|
|
|
|
}
|
|
|
|
protected void resetContext()
|
|
{
|
|
H0 = H1 = H2 = H3 = H4 = H5 = H6 = H7 = 0L;
|
|
}
|
|
|
|
public boolean selfTest()
|
|
{
|
|
if (valid == null)
|
|
{
|
|
String d = Util.toString(new Whirlpool().digest());
|
|
valid = Boolean.valueOf(DIGEST0.equals(d));
|
|
}
|
|
return valid.booleanValue();
|
|
}
|
|
}
|