obtained gcc-4.6.4.tar.bz2 from upstream website;upstream

verified gcc-4.6.4.tar.bz2.sig;
imported gcc-4.6.4 source tree from verified upstream tarball.

downloading a git-generated archive based on the 'upstream' tag
should provide you with a source tree that is binary identical
to the one extracted from the above tarball.

if you have obtained the source via the command 'git clone',
however, do note that line-endings of files in your working
directory might differ from line-endings of the respective
files in the upstream repository.

1 files changed, 176 insertions, 0 deletions

diff --git a/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java b/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java
new file mode 100644
index 000000000..91c3bc6e2
--- /dev/null
+++ b/libjava/classpath/gnu/javax/crypto/keyring/AuthenticatedEntry.java
@@ -0,0 +1,176 @@
+/* AuthenticatedEntry.java --
+   Copyright (C) 2003, 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.keyring;
+
+import gnu.java.security.Registry;
+import gnu.javax.crypto.mac.IMac;
+import gnu.javax.crypto.mac.MacFactory;
+import gnu.javax.crypto.mac.MacOutputStream;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.security.InvalidKeyException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+
+public final class AuthenticatedEntry
+    extends MaskableEnvelopeEntry
+    implements Registry
+{
+  public static final int TYPE = 2;
+
+  public AuthenticatedEntry(String mac, int macLen, Properties properties)
+  {
+    super(TYPE, properties);
+    if (macLen <= 0)
+      throw new IllegalArgumentException("invalid mac length");
+    this.properties.put("mac", mac);
+    this.properties.put("maclen", String.valueOf(macLen));
+    setMasked(false);
+  }
+
+  private AuthenticatedEntry()
+  {
+    super(TYPE);
+    setMasked(true);
+  }
+
+  public static AuthenticatedEntry decode(DataInputStream in)
+      throws IOException
+  {
+    AuthenticatedEntry entry = new AuthenticatedEntry();
+    entry.properties.decode(in);
+    if (! entry.properties.containsKey("mac"))
+      throw new MalformedKeyringException("no mac specified");
+    if (! entry.properties.containsKey("maclen"))
+      throw new MalformedKeyringException("no mac length specified");
+    return entry;
+  }
+
+  /**
+   * Computes the mac over this envelope's data. This method <b>must</b> be
+   * called before this entry in encoded.
+   *
+   * @param key The key to authenticate with.
+   * @throws IOException If encoding fails.
+   * @throws InvalidKeyException If the supplied key is bad.
+   */
+  public void authenticate(byte[] key) throws IOException, InvalidKeyException
+  {
+    if (isMasked())
+      throw new IllegalStateException("entry is masked");
+    IMac m = getMac(key);
+    ByteArrayOutputStream bout = new ByteArrayOutputStream(1024);
+    MacOutputStream macout = new MacOutputStream(bout, m);
+    DataOutputStream out2 = new DataOutputStream(macout);
+    for (Iterator it = entries.iterator(); it.hasNext();)
+      {
+        Entry entry = (Entry) it.next();
+        entry.encode(out2);
+      }
+    bout.write(m.digest());
+    payload = bout.toByteArray();
+  }
+
+  /**
+   * Verifies this entry's payload. This method will unmask this entry, thus it
+   * must be called before accessing its contents.
+   *
+   * @param key The key to use to authenticate.
+   * @throws InvalidKeyException If the given key is improper.
+   */
+  public void verify(byte[] key) throws InvalidKeyException
+  {
+    if (! isMasked() || payload == null)
+      return;
+    IMac m = getMac(key);
+    m.update(payload, 0, payload.length - m.macSize());
+    byte[] macValue = new byte[m.macSize()];
+    System.arraycopy(payload, payload.length - macValue.length, macValue, 0,
+                     macValue.length);
+    if (! Arrays.equals(macValue, m.digest()))
+      throw new IllegalArgumentException("MAC verification failed");
+    try
+      {
+        int len = payload.length - m.macSize();
+        ByteArrayInputStream bais = new ByteArrayInputStream(payload, 0, len);
+        DataInputStream in = new DataInputStream(bais);
+        decodeEnvelope(in);
+      }
+    catch (IOException ioe)
+      {
+        throw new IllegalArgumentException("malformed keyring fragment");
+      }
+    setMasked(false);
+    payload = null;
+  }
+
+  protected void encodePayload() throws IOException
+  {
+    if (payload == null)
+      throw new IllegalStateException("not authenticated");
+  }
+
+  private IMac getMac(byte[] key) throws InvalidKeyException
+  {
+    IMac mac = MacFactory.getInstance(properties.get("mac"));
+    if (mac == null)
+      throw new IllegalArgumentException("no such mac: " + properties.get("mac"));
+    int maclen = 0;
+    if (! properties.containsKey("maclen"))
+      throw new IllegalArgumentException("no MAC length");
+    try
+      {
+        maclen = Integer.parseInt(properties.get("maclen"));
+      }
+    catch (NumberFormatException nfe)
+      {
+        throw new IllegalArgumentException("bad MAC length");
+      }
+    HashMap macAttr = new HashMap();
+    macAttr.put(IMac.MAC_KEY_MATERIAL, key);
+    macAttr.put(IMac.TRUNCATED_SIZE, Integer.valueOf(maclen));
+    mac.init(macAttr);
+    return mac;
+  }
+}