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.

24 files changed, 1287 insertions, 0 deletions

diff --git a/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h b/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h
new file mode 100644
index 000000000..833bd3cb1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/AuthenticatedEntry.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_AuthenticatedEntry__
+#define __gnu_javax_crypto_keyring_AuthenticatedEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class AuthenticatedEntry;
+            class Properties;
+        }
+        namespace mac
+        {
+            class IMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::AuthenticatedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
+{
+
+public:
+  AuthenticatedEntry(::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  AuthenticatedEntry();
+public:
+  static ::gnu::javax::crypto::keyring::AuthenticatedEntry * decode(::java::io::DataInputStream *);
+  void authenticate(JArray< jbyte > *);
+  void verify(JArray< jbyte > *);
+public: // actually protected
+  void encodePayload();
+private:
+  ::gnu::javax::crypto::mac::IMac * getMac(JArray< jbyte > *);
+public:
+  static const jint TYPE = 2;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_AuthenticatedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/BaseKeyring.h b/libjava/gnu/javax/crypto/keyring/BaseKeyring.h
new file mode 100644
index 000000000..6d5806ea7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/BaseKeyring.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_BaseKeyring__
+#define __gnu_javax_crypto_keyring_BaseKeyring__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class BaseKeyring;
+            class CompressedEntry;
+            class Entry;
+            class PasswordAuthenticatedEntry;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::BaseKeyring : public ::java::lang::Object
+{
+
+public:
+  BaseKeyring();
+  virtual void load(::java::util::Map *);
+  virtual void store(::java::util::Map *);
+  virtual void reset();
+  virtual jint size();
+  virtual ::java::util::Enumeration * aliases();
+  virtual jboolean containsAlias(::java::lang::String *);
+  virtual ::java::util::List * get(::java::lang::String *);
+  virtual void add(::gnu::javax::crypto::keyring::Entry *);
+  virtual void remove(::java::lang::String *);
+public: // actually protected
+  virtual ::java::lang::String * fixAlias(::java::lang::String *);
+  virtual void load(::java::io::InputStream *, JArray< jchar > *) = 0;
+  virtual void store(::java::io::OutputStream *, JArray< jchar > *) = 0;
+  ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keyring;
+  ::gnu::javax::crypto::keyring::CompressedEntry * keyring2;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_BaseKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h b/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h
new file mode 100644
index 000000000..2235f18ed
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/BinaryDataEntry.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_BinaryDataEntry__
+#define __gnu_javax_crypto_keyring_BinaryDataEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class BinaryDataEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::BinaryDataEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
+{
+
+public:
+  BinaryDataEntry(::java::lang::String *, JArray< jbyte > *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  BinaryDataEntry();
+public:
+  static ::gnu::javax::crypto::keyring::BinaryDataEntry * decode(::java::io::DataInputStream *);
+  virtual ::java::lang::String * getContentType();
+  virtual JArray< jbyte > * getData();
+public: // actually protected
+  virtual void encodePayload();
+public:
+  static const jint TYPE = 9;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_BinaryDataEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CertPathEntry.h b/libjava/gnu/javax/crypto/keyring/CertPathEntry.h
new file mode 100644
index 000000000..67501a94f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/CertPathEntry.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_CertPathEntry__
+#define __gnu_javax_crypto_keyring_CertPathEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class CertPathEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::CertPathEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
+{
+
+public:
+  CertPathEntry(JArray< ::java::security::cert::Certificate * > *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  CertPathEntry();
+public:
+  static ::gnu::javax::crypto::keyring::CertPathEntry * decode(::java::io::DataInputStream *);
+  JArray< ::java::security::cert::Certificate * > * getCertPath();
+public: // actually protected
+  void encodePayload();
+public:
+  static const jint TYPE = 8;
+private:
+  JArray< ::java::security::cert::Certificate * > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) path;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_CertPathEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CertificateEntry.h b/libjava/gnu/javax/crypto/keyring/CertificateEntry.h
new file mode 100644
index 000000000..48a4ecddf
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/CertificateEntry.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_CertificateEntry__
+#define __gnu_javax_crypto_keyring_CertificateEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class CertificateEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::CertificateEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
+{
+
+public:
+  CertificateEntry(::java::security::cert::Certificate *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  CertificateEntry();
+public:
+  static ::gnu::javax::crypto::keyring::CertificateEntry * decode(::java::io::DataInputStream *);
+  ::java::security::cert::Certificate * getCertificate();
+public: // actually protected
+  void encodePayload();
+public:
+  static const jint TYPE = 5;
+private:
+  ::java::security::cert::Certificate * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) certificate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_CertificateEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/CompressedEntry.h b/libjava/gnu/javax/crypto/keyring/CompressedEntry.h
new file mode 100644
index 000000000..e674b970b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/CompressedEntry.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_CompressedEntry__
+#define __gnu_javax_crypto_keyring_CompressedEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/EnvelopeEntry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class CompressedEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::CompressedEntry : public ::gnu::javax::crypto::keyring::EnvelopeEntry
+{
+
+public:
+  CompressedEntry(::gnu::javax::crypto::keyring::Properties *);
+private:
+  CompressedEntry();
+public:
+  static ::gnu::javax::crypto::keyring::CompressedEntry * decode(::java::io::DataInputStream *);
+public: // actually protected
+  virtual void encodePayload();
+public:
+  static const jint TYPE = 4;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_CompressedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h b/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h
new file mode 100644
index 000000000..e45fe221e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/EncryptedEntry.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_EncryptedEntry__
+#define __gnu_javax_crypto_keyring_EncryptedEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class EncryptedEntry;
+            class Properties;
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::EncryptedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
+{
+
+public:
+  EncryptedEntry(::java::lang::String *, ::java::lang::String *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  EncryptedEntry();
+public:
+  static ::gnu::javax::crypto::keyring::EncryptedEntry * decode(::java::io::DataInputStream *);
+  virtual void decrypt(JArray< jbyte > *, JArray< jbyte > *);
+  virtual void encrypt(JArray< jbyte > *, JArray< jbyte > *);
+  virtual void encodePayload();
+private:
+  ::gnu::javax::crypto::mode::IMode * getMode(JArray< jbyte > *, JArray< jbyte > *, jint);
+public:
+  static const jint TYPE = 0;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_EncryptedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/Entry.h b/libjava/gnu/javax/crypto/keyring/Entry.h
new file mode 100644
index 000000000..3efab548a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/Entry.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_Entry__
+#define __gnu_javax_crypto_keyring_Entry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::Entry : public ::java::lang::Object
+{
+
+public: // actually protected
+  Entry(jint, ::gnu::javax::crypto::keyring::Properties *);
+  Entry(jint);
+public:
+  virtual ::gnu::javax::crypto::keyring::Properties * getProperties();
+  virtual JArray< jbyte > * getPayload();
+  virtual void encode(::java::io::DataOutputStream *);
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  virtual void defaultDecode(::java::io::DataInputStream *);
+  virtual void encodePayload() = 0;
+private:
+  static ::java::util::logging::Logger * log;
+  static JArray< ::java::lang::String * > * TYPES;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) type;
+  ::gnu::javax::crypto::keyring::Properties * properties;
+  JArray< jbyte > * payload;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_Entry__
diff --git a/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h b/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h
new file mode 100644
index 000000000..29bbb061f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/EnvelopeEntry.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_EnvelopeEntry__
+#define __gnu_javax_crypto_keyring_EnvelopeEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/Entry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class EnvelopeEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::EnvelopeEntry : public ::gnu::javax::crypto::keyring::Entry
+{
+
+public:
+  EnvelopeEntry(jint, ::gnu::javax::crypto::keyring::Properties *);
+public: // actually protected
+  EnvelopeEntry(jint);
+public:
+  virtual void add(::gnu::javax::crypto::keyring::Entry *);
+  virtual jboolean containsAlias(::java::lang::String *);
+  virtual jboolean containsEntry(::gnu::javax::crypto::keyring::Entry *);
+  virtual ::java::util::List * getEntries();
+  virtual ::java::util::List * get(::java::lang::String *);
+  virtual ::java::lang::String * getAliasList();
+  virtual jboolean remove(::gnu::javax::crypto::keyring::Entry *);
+  virtual jboolean remove(::java::lang::String *);
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  virtual void encodePayload();
+  virtual void setContainingEnvelope(::gnu::javax::crypto::keyring::EnvelopeEntry *);
+  virtual void decodeEnvelope(::java::io::DataInputStream *);
+private:
+  void makeAliasList();
+  static ::java::util::logging::Logger * log;
+public: // actually protected
+  ::gnu::javax::crypto::keyring::EnvelopeEntry * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::Entry)))) containingEnvelope;
+  ::java::util::List * entries;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_EnvelopeEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h b/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h
new file mode 100644
index 000000000..bb3317d5e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/GnuPrivateKeyring.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_GnuPrivateKeyring__
+#define __gnu_javax_crypto_keyring_GnuPrivateKeyring__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/BaseKeyring.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class GnuPrivateKeyring;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class PublicKey;
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::GnuPrivateKeyring : public ::gnu::javax::crypto::keyring::BaseKeyring
+{
+
+public:
+  GnuPrivateKeyring(::java::lang::String *, jint, ::java::lang::String *, ::java::lang::String *, jint);
+  GnuPrivateKeyring();
+  virtual jboolean containsPrivateKey(::java::lang::String *);
+  virtual ::java::security::Key * getPrivateKey(::java::lang::String *, JArray< jchar > *);
+  virtual void putPrivateKey(::java::lang::String *, ::java::security::Key *, JArray< jchar > *);
+  virtual jboolean containsPublicKey(::java::lang::String *);
+  virtual ::java::security::PublicKey * getPublicKey(::java::lang::String *);
+  virtual void putPublicKey(::java::lang::String *, ::java::security::PublicKey *);
+  virtual jboolean containsCertPath(::java::lang::String *);
+  virtual JArray< ::java::security::cert::Certificate * > * getCertPath(::java::lang::String *);
+  virtual void putCertPath(::java::lang::String *, JArray< ::java::security::cert::Certificate * > *);
+public: // actually protected
+  virtual void load(::java::io::InputStream *, JArray< jchar > *);
+  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
+private:
+  static ::java::util::logging::Logger * log;
+public:
+  static const jint USAGE = 3;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::BaseKeyring)))) mac;
+  jint maclen;
+  ::java::lang::String * cipher;
+  ::java::lang::String * mode;
+  jint keylen;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_GnuPrivateKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h b/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h
new file mode 100644
index 000000000..47abbac37
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/GnuPublicKeyring.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_GnuPublicKeyring__
+#define __gnu_javax_crypto_keyring_GnuPublicKeyring__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/BaseKeyring.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class GnuPublicKeyring;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::GnuPublicKeyring : public ::gnu::javax::crypto::keyring::BaseKeyring
+{
+
+public:
+  GnuPublicKeyring(::java::lang::String *, jint);
+  GnuPublicKeyring();
+  virtual jboolean containsCertificate(::java::lang::String *);
+  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *);
+  virtual void putCertificate(::java::lang::String *, ::java::security::cert::Certificate *);
+public: // actually protected
+  virtual void load(::java::io::InputStream *, JArray< jchar > *);
+  virtual void store(::java::io::OutputStream *, JArray< jchar > *);
+private:
+  static ::java::util::logging::Logger * log;
+public:
+  static const jint USAGE = 4;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_GnuPublicKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IKeyring.h b/libjava/gnu/javax/crypto/keyring/IKeyring.h
new file mode 100644
index 000000000..a1827b310
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/IKeyring.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_IKeyring__
+#define __gnu_javax_crypto_keyring_IKeyring__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class IKeyring;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::IKeyring : public ::java::lang::Object
+{
+
+public:
+  virtual void load(::java::util::Map *) = 0;
+  virtual void store(::java::util::Map *) = 0;
+  virtual void reset() = 0;
+  virtual jint size() = 0;
+  virtual ::java::util::Enumeration * aliases() = 0;
+  virtual jboolean containsAlias(::java::lang::String *) = 0;
+  virtual ::java::util::List * get(::java::lang::String *) = 0;
+  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
+  virtual void remove(::java::lang::String *) = 0;
+  static ::java::lang::String * KEYRING_DATA_IN;
+  static ::java::lang::String * KEYRING_DATA_OUT;
+  static ::java::lang::String * KEYRING_PASSWORD;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_keyring_IKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h b/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h
new file mode 100644
index 000000000..9f9cb25f6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/IPrivateKeyring.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_IPrivateKeyring__
+#define __gnu_javax_crypto_keyring_IPrivateKeyring__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class IPrivateKeyring;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class PublicKey;
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::IPrivateKeyring : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean containsPrivateKey(::java::lang::String *) = 0;
+  virtual ::java::security::Key * getPrivateKey(::java::lang::String *, JArray< jchar > *) = 0;
+  virtual void putPrivateKey(::java::lang::String *, ::java::security::Key *, JArray< jchar > *) = 0;
+  virtual jboolean containsPublicKey(::java::lang::String *) = 0;
+  virtual ::java::security::PublicKey * getPublicKey(::java::lang::String *) = 0;
+  virtual void putPublicKey(::java::lang::String *, ::java::security::PublicKey *) = 0;
+  virtual jboolean containsCertPath(::java::lang::String *) = 0;
+  virtual JArray< ::java::security::cert::Certificate * > * getCertPath(::java::lang::String *) = 0;
+  virtual void putCertPath(::java::lang::String *, JArray< ::java::security::cert::Certificate * > *) = 0;
+  virtual void load(::java::util::Map *) = 0;
+  virtual void store(::java::util::Map *) = 0;
+  virtual void reset() = 0;
+  virtual jint size() = 0;
+  virtual ::java::util::Enumeration * aliases() = 0;
+  virtual jboolean containsAlias(::java::lang::String *) = 0;
+  virtual ::java::util::List * get(::java::lang::String *) = 0;
+  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
+  virtual void remove(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_keyring_IPrivateKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h b/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h
new file mode 100644
index 000000000..06029e277
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/IPublicKeyring.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_IPublicKeyring__
+#define __gnu_javax_crypto_keyring_IPublicKeyring__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class IPublicKeyring;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::IPublicKeyring : public ::java::lang::Object
+{
+
+public:
+  virtual jboolean containsCertificate(::java::lang::String *) = 0;
+  virtual ::java::security::cert::Certificate * getCertificate(::java::lang::String *) = 0;
+  virtual void putCertificate(::java::lang::String *, ::java::security::cert::Certificate *) = 0;
+  virtual void load(::java::util::Map *) = 0;
+  virtual void store(::java::util::Map *) = 0;
+  virtual void reset() = 0;
+  virtual jint size() = 0;
+  virtual ::java::util::Enumeration * aliases() = 0;
+  virtual jboolean containsAlias(::java::lang::String *) = 0;
+  virtual ::java::util::List * get(::java::lang::String *) = 0;
+  virtual void add(::gnu::javax::crypto::keyring::Entry *) = 0;
+  virtual void remove(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_keyring_IPublicKeyring__
diff --git a/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h b/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h
new file mode 100644
index 000000000..569911b5c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/MalformedKeyringException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_MalformedKeyringException__
+#define __gnu_javax_crypto_keyring_MalformedKeyringException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class MalformedKeyringException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::MalformedKeyringException : public ::java::io::IOException
+{
+
+public:
+  MalformedKeyringException();
+  MalformedKeyringException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_MalformedKeyringException__
diff --git a/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h b/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h
new file mode 100644
index 000000000..1d07ee240
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
+#define __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/EnvelopeEntry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Entry;
+            class MaskableEnvelopeEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::MaskableEnvelopeEntry : public ::gnu::javax::crypto::keyring::EnvelopeEntry
+{
+
+public:
+  MaskableEnvelopeEntry(jint, ::gnu::javax::crypto::keyring::Properties *);
+public: // actually protected
+  MaskableEnvelopeEntry(jint);
+  virtual void setMasked(jboolean);
+public:
+  virtual jboolean isMasked();
+  virtual void add(::gnu::javax::crypto::keyring::Entry *);
+  virtual jboolean containsEntry(::gnu::javax::crypto::keyring::Entry *);
+  virtual ::java::util::List * getEntries();
+  virtual ::java::util::List * get(::java::lang::String *);
+  virtual jboolean remove(::gnu::javax::crypto::keyring::Entry *);
+  virtual jboolean remove(::java::lang::String *);
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  jboolean __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::EnvelopeEntry)))) masked;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_MaskableEnvelopeEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h b/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h
new file mode 100644
index 000000000..a6f3e4f0f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/MeteredInputStream.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_MeteredInputStream__
+#define __gnu_javax_crypto_keyring_MeteredInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class MeteredInputStream;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::MeteredInputStream : public ::java::io::FilterInputStream
+{
+
+public: // actually package-private
+  MeteredInputStream(::java::io::InputStream *, jint);
+public:
+  jboolean limitReached();
+  jint available();
+  void close();
+  void mark(jint);
+  jboolean markSupported();
+  jint read();
+  jint read(JArray< jbyte > *);
+  jint read(JArray< jbyte > *, jint, jint);
+  void reset();
+  jlong skip(jlong);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) count;
+  jint limit;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_MeteredInputStream__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h
new file mode 100644
index 000000000..b4a539aed
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PasswordAuthenticatedEntry.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
+#define __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class PasswordAuthenticatedEntry;
+            class Properties;
+        }
+        namespace mac
+        {
+            class IMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PasswordAuthenticatedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
+{
+
+public:
+  PasswordAuthenticatedEntry(::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  PasswordAuthenticatedEntry();
+public:
+  static ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * decode(::java::io::DataInputStream *, JArray< jchar > *);
+  static ::gnu::javax::crypto::keyring::PasswordAuthenticatedEntry * decode(::java::io::DataInputStream *);
+  void verify(JArray< jchar > *);
+  void authenticate(JArray< jchar > *);
+  void encode(::java::io::DataOutputStream *, JArray< jchar > *);
+public: // actually protected
+  void encodePayload(::java::io::DataOutputStream *);
+private:
+  ::gnu::javax::crypto::mac::IMac * getMac(JArray< jchar > *);
+  static ::java::util::logging::Logger * log;
+public:
+  static const jint TYPE = 3;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_PasswordAuthenticatedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h
new file mode 100644
index 000000000..b05b31af7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PasswordEncryptedEntry.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
+#define __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/MaskableEnvelopeEntry.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class PasswordEncryptedEntry;
+            class Properties;
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PasswordEncryptedEntry : public ::gnu::javax::crypto::keyring::MaskableEnvelopeEntry
+{
+
+public:
+  PasswordEncryptedEntry(::java::lang::String *, ::java::lang::String *, jint, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  PasswordEncryptedEntry();
+public:
+  static ::gnu::javax::crypto::keyring::PasswordEncryptedEntry * decode(::java::io::DataInputStream *, JArray< jchar > *);
+  static ::gnu::javax::crypto::keyring::PasswordEncryptedEntry * decode(::java::io::DataInputStream *);
+  virtual void decrypt(JArray< jchar > *);
+  virtual void encrypt(JArray< jchar > *);
+  virtual void encode(::java::io::DataOutputStream *, JArray< jchar > *);
+public: // actually protected
+  virtual void encodePayload();
+private:
+  ::gnu::javax::crypto::mode::IMode * getMode(JArray< jchar > *, jint);
+  static ::java::util::logging::Logger * log;
+public:
+  static const jint TYPE = 1;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_PasswordEncryptedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h b/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h
new file mode 100644
index 000000000..6b81878eb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PasswordProtectedEntry.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PasswordProtectedEntry__
+#define __gnu_javax_crypto_keyring_PasswordProtectedEntry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class PasswordProtectedEntry;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PasswordProtectedEntry : public ::java::lang::Object
+{
+
+public:
+  virtual void encode(::java::io::DataOutputStream *, JArray< jchar > *) = 0;
+  static ::java::lang::Integer * ITERATION_COUNT;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_keyring_PasswordProtectedEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h b/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h
new file mode 100644
index 000000000..16d9d0072
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PrimitiveEntry.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PrimitiveEntry__
+#define __gnu_javax_crypto_keyring_PrimitiveEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/Entry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class PrimitiveEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PrimitiveEntry : public ::gnu::javax::crypto::keyring::Entry
+{
+
+public: // actually protected
+  PrimitiveEntry(jint, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+  PrimitiveEntry(jint);
+public:
+  virtual ::java::lang::String * getAlias();
+  virtual ::java::util::Date * getCreationDate();
+  virtual jboolean equals(::java::lang::Object *);
+public: // actually protected
+  virtual void makeCreationDate();
+  ::java::util::Date * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::Entry)))) creationDate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_PrimitiveEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h b/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h
new file mode 100644
index 000000000..33f2f5333
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PrivateKeyEntry.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PrivateKeyEntry__
+#define __gnu_javax_crypto_keyring_PrivateKeyEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class PrivateKeyEntry;
+            class Properties;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PrivateKeyEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
+{
+
+public:
+  PrivateKeyEntry(::java::security::Key *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  PrivateKeyEntry();
+public:
+  static ::gnu::javax::crypto::keyring::PrivateKeyEntry * decode(::java::io::DataInputStream *);
+  ::java::security::Key * getKey();
+public: // actually protected
+  void encodePayload();
+public:
+  ::java::lang::String * toString();
+  static const jint TYPE = 7;
+private:
+  ::java::security::Key * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) key;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_PrivateKeyEntry__
diff --git a/libjava/gnu/javax/crypto/keyring/Properties.h b/libjava/gnu/javax/crypto/keyring/Properties.h
new file mode 100644
index 000000000..65d10a8d1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/Properties.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_Properties__
+#define __gnu_javax_crypto_keyring_Properties__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Properties;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::Properties : public ::java::lang::Object
+{
+
+public:
+  Properties();
+  virtual void clear();
+  virtual ::java::lang::Object * clone();
+  virtual jboolean containsKey(::java::lang::String *);
+  virtual jboolean containsValue(::java::lang::String *);
+  virtual ::java::lang::String * put(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * get(::java::lang::String *);
+  virtual ::java::lang::String * remove(::java::lang::String *);
+  virtual void decode(::java::io::DataInputStream *);
+  virtual void encode(::java::io::DataOutputStream *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::lang::String * canonicalize(::java::lang::String *);
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) props;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_Properties__
diff --git a/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h b/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h
new file mode 100644
index 000000000..88d4744f6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/keyring/PublicKeyEntry.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_keyring_PublicKeyEntry__
+#define __gnu_javax_crypto_keyring_PublicKeyEntry__
+
+#pragma interface
+
+#include <gnu/javax/crypto/keyring/PrimitiveEntry.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace keyring
+        {
+            class Properties;
+            class PublicKeyEntry;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::keyring::PublicKeyEntry : public ::gnu::javax::crypto::keyring::PrimitiveEntry
+{
+
+public:
+  PublicKeyEntry(::java::security::PublicKey *, ::java::util::Date *, ::gnu::javax::crypto::keyring::Properties *);
+private:
+  PublicKeyEntry();
+public:
+  static ::gnu::javax::crypto::keyring::PublicKeyEntry * decode(::java::io::DataInputStream *);
+  ::java::security::PublicKey * getKey();
+public: // actually protected
+  void encodePayload();
+public:
+  static const jint TYPE = 6;
+private:
+  ::java::security::PublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::keyring::PrimitiveEntry)))) key;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_keyring_PublicKeyEntry__