Merged gcj-eclipse branch to trunk.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120621 138bc75d-0d04-0410-961f-82ee72b054a4

40 files changed, 1978 insertions, 0 deletions

diff --git a/libjava/javax/crypto/BadPaddingException.h b/libjava/javax/crypto/BadPaddingException.h
new file mode 100644
index 00000000000..201d4a06ffb
--- /dev/null
+++ b/libjava/javax/crypto/BadPaddingException.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_BadPaddingException__
+#define __javax_crypto_BadPaddingException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class BadPaddingException;
+    }
+  }
+}
+
+class javax::crypto::BadPaddingException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  BadPaddingException();
+  BadPaddingException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -5315033893984728443LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_BadPaddingException__
diff --git a/libjava/javax/crypto/Cipher.h b/libjava/javax/crypto/Cipher.h
new file mode 100644
index 00000000000..b77c4d1d959
--- /dev/null
+++ b/libjava/javax/crypto/Cipher.h
@@ -0,0 +1,106 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_Cipher__
+#define __javax_crypto_Cipher__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class Provider;
+        class SecureRandom;
+      namespace cert
+      {
+          class Certificate;
+      }
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Cipher;
+        class CipherSpi;
+        class ExemptionMechanism;
+    }
+  }
+}
+
+class javax::crypto::Cipher : public ::java::lang::Object
+{
+
+public:
+  static ::javax::crypto::Cipher * getInstance(::java::lang::String *);
+  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::Cipher * getInstance(::java::lang::String *, ::java::security::Provider *);
+public: // actually protected
+  Cipher(::javax::crypto::CipherSpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  virtual ::java::lang::String * getAlgorithm();
+  virtual jint getBlockSize();
+  virtual ::javax::crypto::ExemptionMechanism * getExemptionMechanism();
+  virtual JArray< jbyte > * getIV();
+  virtual ::java::security::AlgorithmParameters * getParameters();
+  virtual ::java::security::Provider * getProvider();
+  virtual JArray< jbyte > * doFinal();
+  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
+  virtual JArray< jbyte > * doFinal(JArray< jbyte > *, jint, jint);
+  virtual jint doFinal(JArray< jbyte > *, jint);
+  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual jint doFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
+  virtual jint doFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
+  virtual jint getOutputSize(jint);
+  virtual void init(jint, ::java::security::cert::Certificate *);
+  virtual void init(jint, ::java::security::Key *);
+  virtual void init(jint, ::java::security::cert::Certificate *, ::java::security::SecureRandom *);
+  virtual void init(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *);
+  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+  virtual void init(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  virtual void init(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual ::java::security::Key * unwrap(JArray< jbyte > *, ::java::lang::String *, jint);
+  virtual JArray< jbyte > * update(JArray< jbyte > *);
+  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
+  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *);
+  virtual jint update(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual jint update(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
+  virtual JArray< jbyte > * wrap(::java::security::Key *);
+private:
+  static ::java::lang::String * SERVICE;
+public:
+  static const jint DECRYPT_MODE = 2;
+  static const jint ENCRYPT_MODE = 1;
+  static const jint PRIVATE_KEY = 2;
+  static const jint PUBLIC_KEY = 1;
+  static const jint SECRET_KEY = 3;
+  static const jint UNWRAP_MODE = 4;
+  static const jint WRAP_MODE = 3;
+private:
+  static const jint INITIAL_STATE = 0;
+  ::javax::crypto::CipherSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipherSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * transformation;
+  jint state;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_Cipher__
diff --git a/libjava/javax/crypto/CipherInputStream.h b/libjava/javax/crypto/CipherInputStream.h
new file mode 100644
index 00000000000..e4c16e17375
--- /dev/null
+++ b/libjava/javax/crypto/CipherInputStream.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_CipherInputStream__
+#define __javax_crypto_CipherInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Cipher;
+        class CipherInputStream;
+    }
+  }
+}
+
+class javax::crypto::CipherInputStream : public ::java::io::FilterInputStream
+{
+
+public:
+  CipherInputStream(::java::io::InputStream *, ::javax::crypto::Cipher *);
+public: // actually protected
+  CipherInputStream(::java::io::InputStream *);
+public:
+  virtual jint available();
+  virtual void close();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+  virtual jint read(JArray< jbyte > *);
+  virtual jlong skip(jlong);
+  virtual jboolean markSupported();
+  virtual void mark(jint);
+  virtual void reset();
+private:
+  void nextBlock();
+  static ::java::util::logging::Logger * logger;
+  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) cipher;
+  JArray< jbyte > * outBuffer;
+  jint outOffset;
+  jboolean isStream;
+  jboolean eof;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_CipherInputStream__
diff --git a/libjava/javax/crypto/CipherOutputStream.h b/libjava/javax/crypto/CipherOutputStream.h
new file mode 100644
index 00000000000..59da0000719
--- /dev/null
+++ b/libjava/javax/crypto/CipherOutputStream.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_CipherOutputStream__
+#define __javax_crypto_CipherOutputStream__
+
+#pragma interface
+
+#include <java/io/FilterOutputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Cipher;
+        class CipherOutputStream;
+    }
+  }
+}
+
+class javax::crypto::CipherOutputStream : public ::java::io::FilterOutputStream
+{
+
+public:
+  CipherOutputStream(::java::io::OutputStream *, ::javax::crypto::Cipher *);
+public: // actually protected
+  CipherOutputStream(::java::io::OutputStream *);
+public:
+  virtual void close();
+  virtual void flush();
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *);
+  virtual void write(JArray< jbyte > *, jint, jint);
+private:
+  ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) cipher;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_CipherOutputStream__
diff --git a/libjava/javax/crypto/CipherSpi.h b/libjava/javax/crypto/CipherSpi.h
new file mode 100644
index 00000000000..dd79290401f
--- /dev/null
+++ b/libjava/javax/crypto/CipherSpi.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_CipherSpi__
+#define __javax_crypto_CipherSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class CipherSpi;
+    }
+  }
+}
+
+class javax::crypto::CipherSpi : public ::java::lang::Object
+{
+
+public:
+  CipherSpi();
+public: // actually protected
+  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint) = 0;
+  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
+  virtual jint engineDoFinal(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
+  virtual jint engineGetBlockSize() = 0;
+  virtual JArray< jbyte > * engineGetIV() = 0;
+  virtual jint engineGetKeySize(::java::security::Key *);
+  virtual jint engineGetOutputSize(jint) = 0;
+  virtual ::java::security::AlgorithmParameters * engineGetParameters() = 0;
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *) = 0;
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *) = 0;
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
+  virtual void engineSetMode(::java::lang::String *) = 0;
+  virtual void engineSetPadding(::java::lang::String *) = 0;
+  virtual ::java::security::Key * engineUnwrap(JArray< jbyte > *, ::java::lang::String *, jint);
+  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint) = 0;
+  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
+  virtual jint engineUpdate(::java::nio::ByteBuffer *, ::java::nio::ByteBuffer *);
+  virtual JArray< jbyte > * engineWrap(::java::security::Key *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_CipherSpi__
diff --git a/libjava/javax/crypto/EncryptedPrivateKeyInfo.h b/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
new file mode 100644
index 00000000000..54818e1b55f
--- /dev/null
+++ b/libjava/javax/crypto/EncryptedPrivateKeyInfo.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_EncryptedPrivateKeyInfo__
+#define __javax_crypto_EncryptedPrivateKeyInfo__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+          class OID;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+      namespace spec
+      {
+          class PKCS8EncodedKeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Cipher;
+        class EncryptedPrivateKeyInfo;
+    }
+  }
+}
+
+class javax::crypto::EncryptedPrivateKeyInfo : public ::java::lang::Object
+{
+
+public:
+  EncryptedPrivateKeyInfo(::java::security::AlgorithmParameters *, JArray< jbyte > *);
+  EncryptedPrivateKeyInfo(JArray< jbyte > *);
+  EncryptedPrivateKeyInfo(::java::lang::String *, JArray< jbyte > *);
+private:
+  static ::gnu::java::security::OID * getOid(::java::lang::String *);
+public:
+  virtual ::java::lang::String * getAlgName();
+  virtual ::java::security::AlgorithmParameters * getAlgParameters();
+  virtual JArray< jbyte > * getEncoded();
+  virtual JArray< jbyte > * getEncryptedData();
+  virtual ::java::security::spec::PKCS8EncodedKeySpec * getKeySpec(::javax::crypto::Cipher *);
+private:
+  void decode();
+  void encode();
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encryptedData;
+  JArray< jbyte > * encoded;
+  ::gnu::java::security::OID * algOid;
+  ::java::lang::String * algName;
+  ::java::security::AlgorithmParameters * params;
+  JArray< jbyte > * encodedParams;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_EncryptedPrivateKeyInfo__
diff --git a/libjava/javax/crypto/ExemptionMechanism.h b/libjava/javax/crypto/ExemptionMechanism.h
new file mode 100644
index 00000000000..65a0454661c
--- /dev/null
+++ b/libjava/javax/crypto/ExemptionMechanism.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_ExemptionMechanism__
+#define __javax_crypto_ExemptionMechanism__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class Provider;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class ExemptionMechanism;
+        class ExemptionMechanismSpi;
+    }
+  }
+}
+
+class javax::crypto::ExemptionMechanism : public ::java::lang::Object
+{
+
+public: // actually protected
+  ExemptionMechanism(::javax::crypto::ExemptionMechanismSpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *);
+  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::ExemptionMechanism * getInstance(::java::lang::String *, ::java::security::Provider *);
+  virtual JArray< jbyte > * genExemptionBlob();
+  virtual jint genExemptionBlob(JArray< jbyte > *);
+  virtual jint genExemptionBlob(JArray< jbyte > *, jint);
+  virtual ::java::lang::String * getName();
+  virtual jint getOutputSize(jint);
+  virtual ::java::security::Provider * getProvider();
+  virtual void init(::java::security::Key *);
+  virtual void init(::java::security::Key *, ::java::security::AlgorithmParameters *);
+  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+  virtual jboolean isCryptoAllowed(::java::security::Key *);
+public: // actually protected
+  virtual void finalize();
+private:
+  static ::java::lang::String * SERVICE;
+  ::javax::crypto::ExemptionMechanismSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) emSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * mechanism;
+  jboolean virgin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_ExemptionMechanism__
diff --git a/libjava/javax/crypto/ExemptionMechanismException.h b/libjava/javax/crypto/ExemptionMechanismException.h
new file mode 100644
index 00000000000..79dd95f2069
--- /dev/null
+++ b/libjava/javax/crypto/ExemptionMechanismException.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_ExemptionMechanismException__
+#define __javax_crypto_ExemptionMechanismException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class ExemptionMechanismException;
+    }
+  }
+}
+
+class javax::crypto::ExemptionMechanismException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  ExemptionMechanismException();
+  ExemptionMechanismException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = 1572699429277957109LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_ExemptionMechanismException__
diff --git a/libjava/javax/crypto/ExemptionMechanismSpi.h b/libjava/javax/crypto/ExemptionMechanismSpi.h
new file mode 100644
index 00000000000..70c738eb654
--- /dev/null
+++ b/libjava/javax/crypto/ExemptionMechanismSpi.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_ExemptionMechanismSpi__
+#define __javax_crypto_ExemptionMechanismSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class ExemptionMechanismSpi;
+    }
+  }
+}
+
+class javax::crypto::ExemptionMechanismSpi : public ::java::lang::Object
+{
+
+public:
+  ExemptionMechanismSpi();
+public: // actually protected
+  virtual JArray< jbyte > * engineGenExemptionBlob() = 0;
+  virtual jint engineGenExemptionBlob(JArray< jbyte > *, jint) = 0;
+  virtual jint engineGetOutputSize(jint) = 0;
+  virtual void engineInit(::java::security::Key *) = 0;
+  virtual void engineInit(::java::security::Key *, ::java::security::AlgorithmParameters *) = 0;
+  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_ExemptionMechanismSpi__
diff --git a/libjava/javax/crypto/IllegalBlockSizeException.h b/libjava/javax/crypto/IllegalBlockSizeException.h
new file mode 100644
index 00000000000..22176b1e504
--- /dev/null
+++ b/libjava/javax/crypto/IllegalBlockSizeException.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_IllegalBlockSizeException__
+#define __javax_crypto_IllegalBlockSizeException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class IllegalBlockSizeException;
+    }
+  }
+}
+
+class javax::crypto::IllegalBlockSizeException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  IllegalBlockSizeException();
+  IllegalBlockSizeException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -1965144811953540392LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_IllegalBlockSizeException__
diff --git a/libjava/javax/crypto/KeyAgreement.h b/libjava/javax/crypto/KeyAgreement.h
new file mode 100644
index 00000000000..5f6b4e7617c
--- /dev/null
+++ b/libjava/javax/crypto/KeyAgreement.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_KeyAgreement__
+#define __javax_crypto_KeyAgreement__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class Provider;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class KeyAgreement;
+        class KeyAgreementSpi;
+        class SecretKey;
+    }
+  }
+}
+
+class javax::crypto::KeyAgreement : public ::java::lang::Object
+{
+
+public: // actually protected
+  KeyAgreement(::javax::crypto::KeyAgreementSpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *);
+  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::KeyAgreement * getInstance(::java::lang::String *, ::java::security::Provider *);
+  virtual ::java::security::Key * doPhase(::java::security::Key *, jboolean);
+  virtual JArray< jbyte > * generateSecret();
+  virtual jint generateSecret(JArray< jbyte > *, jint);
+  virtual ::javax::crypto::SecretKey * generateSecret(::java::lang::String *);
+  virtual ::java::lang::String * getAlgorithm();
+  virtual ::java::security::Provider * getProvider();
+  virtual void init(::java::security::Key *);
+  virtual void init(::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+private:
+  static ::java::lang::String * SERVICE;
+  ::javax::crypto::KeyAgreementSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kaSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * algorithm;
+  jboolean virgin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_KeyAgreement__
diff --git a/libjava/javax/crypto/KeyAgreementSpi.h b/libjava/javax/crypto/KeyAgreementSpi.h
new file mode 100644
index 00000000000..e0ac5eb1a2e
--- /dev/null
+++ b/libjava/javax/crypto/KeyAgreementSpi.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_KeyAgreementSpi__
+#define __javax_crypto_KeyAgreementSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class KeyAgreementSpi;
+        class SecretKey;
+    }
+  }
+}
+
+class javax::crypto::KeyAgreementSpi : public ::java::lang::Object
+{
+
+public:
+  KeyAgreementSpi();
+public: // actually protected
+  virtual ::java::security::Key * engineDoPhase(::java::security::Key *, jboolean) = 0;
+  virtual JArray< jbyte > * engineGenerateSecret() = 0;
+  virtual jint engineGenerateSecret(JArray< jbyte > *, jint) = 0;
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::lang::String *) = 0;
+  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
+  virtual void engineInit(::java::security::Key *, ::java::security::SecureRandom *) = 0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_KeyAgreementSpi__
diff --git a/libjava/javax/crypto/KeyGenerator.h b/libjava/javax/crypto/KeyGenerator.h
new file mode 100644
index 00000000000..ea785044eea
--- /dev/null
+++ b/libjava/javax/crypto/KeyGenerator.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_KeyGenerator__
+#define __javax_crypto_KeyGenerator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class Provider;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class KeyGenerator;
+        class KeyGeneratorSpi;
+        class SecretKey;
+    }
+  }
+}
+
+class javax::crypto::KeyGenerator : public ::java::lang::Object
+{
+
+public: // actually protected
+  KeyGenerator(::javax::crypto::KeyGeneratorSpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *);
+  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::KeyGenerator * getInstance(::java::lang::String *, ::java::security::Provider *);
+  virtual ::javax::crypto::SecretKey * generateKey();
+  virtual ::java::lang::String * getAlgorithm();
+  virtual ::java::security::Provider * getProvider();
+  virtual void init(::java::security::spec::AlgorithmParameterSpec *);
+  virtual void init(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void init(jint);
+  virtual void init(jint, ::java::security::SecureRandom *);
+  virtual void init(::java::security::SecureRandom *);
+private:
+  static ::java::lang::String * SERVICE;
+  ::javax::crypto::KeyGeneratorSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) kgSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * algorithm;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_KeyGenerator__
diff --git a/libjava/javax/crypto/KeyGeneratorSpi.h b/libjava/javax/crypto/KeyGeneratorSpi.h
new file mode 100644
index 00000000000..4fb3574260d
--- /dev/null
+++ b/libjava/javax/crypto/KeyGeneratorSpi.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_KeyGeneratorSpi__
+#define __javax_crypto_KeyGeneratorSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class KeyGeneratorSpi;
+        class SecretKey;
+    }
+  }
+}
+
+class javax::crypto::KeyGeneratorSpi : public ::java::lang::Object
+{
+
+public:
+  KeyGeneratorSpi();
+public: // actually protected
+  virtual ::javax::crypto::SecretKey * engineGenerateKey() = 0;
+  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *) = 0;
+  virtual void engineInit(jint, ::java::security::SecureRandom *) = 0;
+  virtual void engineInit(::java::security::SecureRandom *) = 0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_KeyGeneratorSpi__
diff --git a/libjava/javax/crypto/Mac.h b/libjava/javax/crypto/Mac.h
new file mode 100644
index 00000000000..d9242114635
--- /dev/null
+++ b/libjava/javax/crypto/Mac.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_Mac__
+#define __javax_crypto_Mac__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+    namespace security
+    {
+        class Key;
+        class Provider;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Mac;
+        class MacSpi;
+    }
+  }
+}
+
+class javax::crypto::Mac : public ::java::lang::Object
+{
+
+public: // actually protected
+  Mac(::javax::crypto::MacSpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  static ::javax::crypto::Mac * getInstance(::java::lang::String *);
+  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::Mac * getInstance(::java::lang::String *, ::java::security::Provider *);
+  virtual JArray< jbyte > * doFinal();
+  virtual JArray< jbyte > * doFinal(JArray< jbyte > *);
+  virtual void doFinal(JArray< jbyte > *, jint);
+  virtual ::java::lang::String * getAlgorithm();
+  virtual jint getMacLength();
+  virtual ::java::security::Provider * getProvider();
+  virtual void init(::java::security::Key *);
+  virtual void init(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+  virtual void reset();
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual void update(::java::nio::ByteBuffer *);
+  virtual ::java::lang::Object * clone();
+private:
+  static ::java::lang::String * SERVICE;
+  ::javax::crypto::MacSpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) macSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * algorithm;
+  jboolean virgin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_Mac__
diff --git a/libjava/javax/crypto/MacSpi.h b/libjava/javax/crypto/MacSpi.h
new file mode 100644
index 00000000000..4508d2f00e7
--- /dev/null
+++ b/libjava/javax/crypto/MacSpi.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_MacSpi__
+#define __javax_crypto_MacSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteBuffer;
+    }
+    namespace security
+    {
+        class Key;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class MacSpi;
+    }
+  }
+}
+
+class javax::crypto::MacSpi : public ::java::lang::Object
+{
+
+public:
+  MacSpi();
+  virtual ::java::lang::Object * clone();
+public: // actually protected
+  virtual JArray< jbyte > * engineDoFinal() = 0;
+  virtual jint engineGetMacLength() = 0;
+  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *) = 0;
+  virtual void engineReset() = 0;
+  virtual void engineUpdate(jbyte) = 0;
+  virtual void engineUpdate(JArray< jbyte > *, jint, jint) = 0;
+  virtual void engineUpdate(::java::nio::ByteBuffer *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_MacSpi__
diff --git a/libjava/javax/crypto/NoSuchPaddingException.h b/libjava/javax/crypto/NoSuchPaddingException.h
new file mode 100644
index 00000000000..76d4f3952d4
--- /dev/null
+++ b/libjava/javax/crypto/NoSuchPaddingException.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_NoSuchPaddingException__
+#define __javax_crypto_NoSuchPaddingException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class NoSuchPaddingException;
+    }
+  }
+}
+
+class javax::crypto::NoSuchPaddingException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  NoSuchPaddingException();
+  NoSuchPaddingException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = -4572885201200175466LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_NoSuchPaddingException__
diff --git a/libjava/javax/crypto/NullCipher.h b/libjava/javax/crypto/NullCipher.h
new file mode 100644
index 00000000000..2fc8378f316
--- /dev/null
+++ b/libjava/javax/crypto/NullCipher.h
@@ -0,0 +1,29 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_NullCipher__
+#define __javax_crypto_NullCipher__
+
+#pragma interface
+
+#include <javax/crypto/Cipher.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class NullCipher;
+    }
+  }
+}
+
+class javax::crypto::NullCipher : public ::javax::crypto::Cipher
+{
+
+public:
+  NullCipher();
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_NullCipher__
diff --git a/libjava/javax/crypto/NullCipherImpl.h b/libjava/javax/crypto/NullCipherImpl.h
new file mode 100644
index 00000000000..56cccfe2430
--- /dev/null
+++ b/libjava/javax/crypto/NullCipherImpl.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_NullCipherImpl__
+#define __javax_crypto_NullCipherImpl__
+
+#pragma interface
+
+#include <javax/crypto/CipherSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class NullCipherImpl;
+    }
+  }
+}
+
+class javax::crypto::NullCipherImpl : public ::javax::crypto::CipherSpi
+{
+
+public: // actually package-private
+  NullCipherImpl();
+public: // actually protected
+  void engineSetMode(::java::lang::String *);
+  void engineSetPadding(::java::lang::String *);
+  jint engineGetBlockSize();
+  jint engineGetOutputSize(jint);
+  JArray< jbyte > * engineGetIV();
+  ::java::security::AlgorithmParameters * engineGetParameters();
+  void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
+  jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
+  jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_NullCipherImpl__
diff --git a/libjava/javax/crypto/SealedObject.h b/libjava/javax/crypto/SealedObject.h
new file mode 100644
index 00000000000..630f8ec5f3a
--- /dev/null
+++ b/libjava/javax/crypto/SealedObject.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_SealedObject__
+#define __javax_crypto_SealedObject__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class Cipher;
+        class SealedObject;
+    }
+  }
+}
+
+class javax::crypto::SealedObject : public ::java::lang::Object
+{
+
+public:
+  SealedObject(::java::io::Serializable *, ::javax::crypto::Cipher *);
+public: // actually protected
+  SealedObject(::javax::crypto::SealedObject *);
+public:
+  virtual ::java::lang::String * getAlgorithm();
+  virtual ::java::lang::Object * getObject(::javax::crypto::Cipher *);
+  virtual ::java::lang::Object * getObject(::java::security::Key *);
+  virtual ::java::lang::Object * getObject(::java::security::Key *, ::java::lang::String *);
+private:
+  void readObject(::java::io::ObjectInputStream *);
+  void writeObject(::java::io::ObjectOutputStream *);
+  ::java::lang::Object * unseal();
+public: // actually protected
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) encodedParams;
+private:
+  JArray< jbyte > * encryptedContent;
+  ::java::lang::String * sealAlg;
+  ::java::lang::String * paramsAlg;
+  ::javax::crypto::Cipher * sealCipher;
+  static const jlong serialVersionUID = 4482838265551344752LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_SealedObject__
diff --git a/libjava/javax/crypto/SecretKey.h b/libjava/javax/crypto/SecretKey.h
new file mode 100644
index 00000000000..d76e7286836
--- /dev/null
+++ b/libjava/javax/crypto/SecretKey.h
@@ -0,0 +1,34 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_SecretKey__
+#define __javax_crypto_SecretKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class javax::crypto::SecretKey : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * getAlgorithm() = 0;
+  virtual ::java::lang::String * getFormat() = 0;
+  virtual JArray< jbyte > * getEncoded() = 0;
+  static const jlong serialVersionUID = -4795878709595146952LL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_crypto_SecretKey__
diff --git a/libjava/javax/crypto/SecretKeyFactory.h b/libjava/javax/crypto/SecretKeyFactory.h
new file mode 100644
index 00000000000..2e10b769c63
--- /dev/null
+++ b/libjava/javax/crypto/SecretKeyFactory.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_SecretKeyFactory__
+#define __javax_crypto_SecretKeyFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+        class Provider;
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+        class SecretKeyFactory;
+        class SecretKeyFactorySpi;
+    }
+  }
+}
+
+class javax::crypto::SecretKeyFactory : public ::java::lang::Object
+{
+
+public: // actually protected
+  SecretKeyFactory(::javax::crypto::SecretKeyFactorySpi *, ::java::security::Provider *, ::java::lang::String *);
+public:
+  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *);
+  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::lang::String *);
+  static ::javax::crypto::SecretKeyFactory * getInstance(::java::lang::String *, ::java::security::Provider *);
+  virtual ::javax::crypto::SecretKey * generateSecret(::java::security::spec::KeySpec *);
+  virtual ::java::lang::String * getAlgorithm();
+  virtual ::java::security::spec::KeySpec * getKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
+  virtual ::java::security::Provider * getProvider();
+  virtual ::javax::crypto::SecretKey * translateKey(::javax::crypto::SecretKey *);
+private:
+  static ::java::lang::String * SERVICE;
+  ::javax::crypto::SecretKeyFactorySpi * __attribute__((aligned(__alignof__( ::java::lang::Object)))) skfSpi;
+  ::java::security::Provider * provider;
+  ::java::lang::String * algorithm;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_SecretKeyFactory__
diff --git a/libjava/javax/crypto/SecretKeyFactorySpi.h b/libjava/javax/crypto/SecretKeyFactorySpi.h
new file mode 100644
index 00000000000..91a17d69aa7
--- /dev/null
+++ b/libjava/javax/crypto/SecretKeyFactorySpi.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_SecretKeyFactorySpi__
+#define __javax_crypto_SecretKeyFactorySpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+        class SecretKeyFactorySpi;
+    }
+  }
+}
+
+class javax::crypto::SecretKeyFactorySpi : public ::java::lang::Object
+{
+
+public:
+  SecretKeyFactorySpi();
+public: // actually protected
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *) = 0;
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *) = 0;
+  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *) = 0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_SecretKeyFactorySpi__
diff --git a/libjava/javax/crypto/ShortBufferException.h b/libjava/javax/crypto/ShortBufferException.h
new file mode 100644
index 00000000000..1c3d344e6d8
--- /dev/null
+++ b/libjava/javax/crypto/ShortBufferException.h
@@ -0,0 +1,33 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_ShortBufferException__
+#define __javax_crypto_ShortBufferException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+        class ShortBufferException;
+    }
+  }
+}
+
+class javax::crypto::ShortBufferException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  ShortBufferException();
+  ShortBufferException(::java::lang::String *);
+private:
+  static const jlong serialVersionUID = 8427718640832943747LL;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_ShortBufferException__
diff --git a/libjava/javax/crypto/interfaces/DHKey.h b/libjava/javax/crypto/interfaces/DHKey.h
new file mode 100644
index 00000000000..a425a9263bd
--- /dev/null
+++ b/libjava/javax/crypto/interfaces/DHKey.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_interfaces_DHKey__
+#define __javax_crypto_interfaces_DHKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHKey;
+      }
+      namespace spec
+      {
+          class DHParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::interfaces::DHKey : public ::java::lang::Object
+{
+
+public:
+  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_crypto_interfaces_DHKey__
diff --git a/libjava/javax/crypto/interfaces/DHPrivateKey.h b/libjava/javax/crypto/interfaces/DHPrivateKey.h
new file mode 100644
index 00000000000..500bb2a688a
--- /dev/null
+++ b/libjava/javax/crypto/interfaces/DHPrivateKey.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_interfaces_DHPrivateKey__
+#define __javax_crypto_interfaces_DHPrivateKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHPrivateKey;
+      }
+      namespace spec
+      {
+          class DHParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::interfaces::DHPrivateKey : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::math::BigInteger * getX() = 0;
+  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
+  virtual ::java::lang::String * getAlgorithm() = 0;
+  virtual ::java::lang::String * getFormat() = 0;
+  virtual JArray< jbyte > * getEncoded() = 0;
+  static const jlong serialVersionUID = 2211791113380396553LL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_crypto_interfaces_DHPrivateKey__
diff --git a/libjava/javax/crypto/interfaces/DHPublicKey.h b/libjava/javax/crypto/interfaces/DHPublicKey.h
new file mode 100644
index 00000000000..36ebfc5736a
--- /dev/null
+++ b/libjava/javax/crypto/interfaces/DHPublicKey.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_interfaces_DHPublicKey__
+#define __javax_crypto_interfaces_DHPublicKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHPublicKey;
+      }
+      namespace spec
+      {
+          class DHParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::interfaces::DHPublicKey : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::math::BigInteger * getY() = 0;
+  virtual ::javax::crypto::spec::DHParameterSpec * getParams() = 0;
+  virtual ::java::lang::String * getAlgorithm() = 0;
+  virtual ::java::lang::String * getFormat() = 0;
+  virtual JArray< jbyte > * getEncoded() = 0;
+  static const jlong serialVersionUID = -6628103563352519193LL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_crypto_interfaces_DHPublicKey__
diff --git a/libjava/javax/crypto/interfaces/PBEKey.h b/libjava/javax/crypto/interfaces/PBEKey.h
new file mode 100644
index 00000000000..ff8f1ea4a68
--- /dev/null
+++ b/libjava/javax/crypto/interfaces/PBEKey.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_interfaces_PBEKey__
+#define __javax_crypto_interfaces_PBEKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class PBEKey;
+      }
+    }
+  }
+}
+
+class javax::crypto::interfaces::PBEKey : public ::java::lang::Object
+{
+
+public:
+  virtual jint getIterationCount() = 0;
+  virtual JArray< jchar > * getPassword() = 0;
+  virtual JArray< jbyte > * getSalt() = 0;
+  virtual ::java::lang::String * getAlgorithm() = 0;
+  virtual ::java::lang::String * getFormat() = 0;
+  virtual JArray< jbyte > * getEncoded() = 0;
+  static const jlong serialVersionUID = -1430015993304333921LL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __javax_crypto_interfaces_PBEKey__
diff --git a/libjava/javax/crypto/spec/DESKeySpec.h b/libjava/javax/crypto/spec/DESKeySpec.h
new file mode 100644
index 00000000000..3c860452bb3
--- /dev/null
+++ b/libjava/javax/crypto/spec/DESKeySpec.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DESKeySpec__
+#define __javax_crypto_spec_DESKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DESKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DESKeySpec : public ::java::lang::Object
+{
+
+public:
+  DESKeySpec(JArray< jbyte > *);
+  DESKeySpec(JArray< jbyte > *, jint);
+  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
+  static jboolean isWeak(JArray< jbyte > *, jint);
+private:
+  static jboolean equalsOrComplementEquals(JArray< jbyte > *, jint, JArray< jbyte > *);
+public:
+  virtual JArray< jbyte > * getKey();
+  static const jint DES_KEY_LEN = 8;
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  static JArray< JArray< jbyte > * > * WEAK_KEYS;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DESKeySpec__
diff --git a/libjava/javax/crypto/spec/DESedeKeySpec.h b/libjava/javax/crypto/spec/DESedeKeySpec.h
new file mode 100644
index 00000000000..28e23bb13c0
--- /dev/null
+++ b/libjava/javax/crypto/spec/DESedeKeySpec.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DESedeKeySpec__
+#define __javax_crypto_spec_DESedeKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DESedeKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DESedeKeySpec : public ::java::lang::Object
+{
+
+public:
+  DESedeKeySpec(JArray< jbyte > *);
+  DESedeKeySpec(JArray< jbyte > *, jint);
+  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * getKey();
+  static const jint DES_EDE_KEY_LEN = 24;
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DESedeKeySpec__
diff --git a/libjava/javax/crypto/spec/DHGenParameterSpec.h b/libjava/javax/crypto/spec/DHGenParameterSpec.h
new file mode 100644
index 00000000000..79331116f9b
--- /dev/null
+++ b/libjava/javax/crypto/spec/DHGenParameterSpec.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DHGenParameterSpec__
+#define __javax_crypto_spec_DHGenParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DHGenParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DHGenParameterSpec : public ::java::lang::Object
+{
+
+public:
+  DHGenParameterSpec(jint, jint);
+  virtual jint getExponentSize();
+  virtual jint getPrimeSize();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) primeSize;
+  jint exponentSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DHGenParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHParameterSpec.h b/libjava/javax/crypto/spec/DHParameterSpec.h
new file mode 100644
index 00000000000..7f7dd3fcd7a
--- /dev/null
+++ b/libjava/javax/crypto/spec/DHParameterSpec.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DHParameterSpec__
+#define __javax_crypto_spec_DHParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DHParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DHParameterSpec : public ::java::lang::Object
+{
+
+public:
+  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *);
+  DHParameterSpec(::java::math::BigInteger *, ::java::math::BigInteger *, jint);
+  virtual ::java::math::BigInteger * getG();
+  virtual jint getL();
+  virtual ::java::math::BigInteger * getP();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
+  ::java::math::BigInteger * p;
+  jint l;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DHParameterSpec__
diff --git a/libjava/javax/crypto/spec/DHPrivateKeySpec.h b/libjava/javax/crypto/spec/DHPrivateKeySpec.h
new file mode 100644
index 00000000000..c21a9e2e17e
--- /dev/null
+++ b/libjava/javax/crypto/spec/DHPrivateKeySpec.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DHPrivateKeySpec__
+#define __javax_crypto_spec_DHPrivateKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DHPrivateKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DHPrivateKeySpec : public ::java::lang::Object
+{
+
+public:
+  DHPrivateKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  virtual ::java::math::BigInteger * getG();
+  virtual ::java::math::BigInteger * getP();
+  virtual ::java::math::BigInteger * getX();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
+  ::java::math::BigInteger * p;
+  ::java::math::BigInteger * x;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DHPrivateKeySpec__
diff --git a/libjava/javax/crypto/spec/DHPublicKeySpec.h b/libjava/javax/crypto/spec/DHPublicKeySpec.h
new file mode 100644
index 00000000000..ae1a2bf557c
--- /dev/null
+++ b/libjava/javax/crypto/spec/DHPublicKeySpec.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_DHPublicKeySpec__
+#define __javax_crypto_spec_DHPublicKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DHPublicKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::DHPublicKeySpec : public ::java::lang::Object
+{
+
+public:
+  DHPublicKeySpec(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  virtual ::java::math::BigInteger * getG();
+  virtual ::java::math::BigInteger * getP();
+  virtual ::java::math::BigInteger * getY();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) g;
+  ::java::math::BigInteger * p;
+  ::java::math::BigInteger * y;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_DHPublicKeySpec__
diff --git a/libjava/javax/crypto/spec/IvParameterSpec.h b/libjava/javax/crypto/spec/IvParameterSpec.h
new file mode 100644
index 00000000000..e5799e47fcc
--- /dev/null
+++ b/libjava/javax/crypto/spec/IvParameterSpec.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_IvParameterSpec__
+#define __javax_crypto_spec_IvParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class IvParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::IvParameterSpec : public ::java::lang::Object
+{
+
+public:
+  IvParameterSpec(JArray< jbyte > *);
+  IvParameterSpec(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * getIV();
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_IvParameterSpec__
diff --git a/libjava/javax/crypto/spec/PBEKeySpec.h b/libjava/javax/crypto/spec/PBEKeySpec.h
new file mode 100644
index 00000000000..f987069389d
--- /dev/null
+++ b/libjava/javax/crypto/spec/PBEKeySpec.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_PBEKeySpec__
+#define __javax_crypto_spec_PBEKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class PBEKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::PBEKeySpec : public ::java::lang::Object
+{
+
+public:
+  PBEKeySpec(JArray< jchar > *);
+  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint);
+  PBEKeySpec(JArray< jchar > *, JArray< jbyte > *, jint, jint);
+  virtual void clearPassword();
+  virtual jint getIterationCount();
+  virtual jint getKeyLength();
+  virtual JArray< jchar > * getPassword();
+  virtual JArray< jbyte > * getSalt();
+private:
+  void setPassword(JArray< jchar > *);
+  void setSalt(JArray< jbyte > *);
+  void setIterationCount(jint);
+  void setKeyLength(jint);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
+  jint keyLength;
+  JArray< jchar > * password;
+  JArray< jbyte > * salt;
+  jboolean passwordValid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_PBEKeySpec__
diff --git a/libjava/javax/crypto/spec/PBEParameterSpec.h b/libjava/javax/crypto/spec/PBEParameterSpec.h
new file mode 100644
index 00000000000..eb81ca7dc4c
--- /dev/null
+++ b/libjava/javax/crypto/spec/PBEParameterSpec.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_PBEParameterSpec__
+#define __javax_crypto_spec_PBEParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class PBEParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::PBEParameterSpec : public ::java::lang::Object
+{
+
+public:
+  PBEParameterSpec(JArray< jbyte > *, jint);
+  virtual jint getIterationCount();
+  virtual JArray< jbyte > * getSalt();
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) iterationCount;
+  JArray< jbyte > * salt;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_PBEParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC2ParameterSpec.h b/libjava/javax/crypto/spec/RC2ParameterSpec.h
new file mode 100644
index 00000000000..419dc752b34
--- /dev/null
+++ b/libjava/javax/crypto/spec/RC2ParameterSpec.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_RC2ParameterSpec__
+#define __javax_crypto_spec_RC2ParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class RC2ParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::RC2ParameterSpec : public ::java::lang::Object
+{
+
+public:
+  RC2ParameterSpec(jint);
+  RC2ParameterSpec(jint, JArray< jbyte > *);
+  RC2ParameterSpec(jint, JArray< jbyte > *, jint);
+  virtual jint getEffectiveKeyBits();
+  virtual JArray< jbyte > * getIV();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+private:
+  static const jint RC2_IV_LENGTH = 8;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) effectiveKeyBits;
+  JArray< jbyte > * iv;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_RC2ParameterSpec__
diff --git a/libjava/javax/crypto/spec/RC5ParameterSpec.h b/libjava/javax/crypto/spec/RC5ParameterSpec.h
new file mode 100644
index 00000000000..8ba9232cd65
--- /dev/null
+++ b/libjava/javax/crypto/spec/RC5ParameterSpec.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_RC5ParameterSpec__
+#define __javax_crypto_spec_RC5ParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class RC5ParameterSpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::RC5ParameterSpec : public ::java::lang::Object
+{
+
+public:
+  RC5ParameterSpec(jint, jint, jint);
+  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *);
+  RC5ParameterSpec(jint, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * getIV();
+  virtual jint getRounds();
+  virtual jint getVersion();
+  virtual jint getWordSize();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
+  jint rounds;
+  jint version;
+  jint wordSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_RC5ParameterSpec__
diff --git a/libjava/javax/crypto/spec/SecretKeySpec.h b/libjava/javax/crypto/spec/SecretKeySpec.h
new file mode 100644
index 00000000000..b6a2e04ced3
--- /dev/null
+++ b/libjava/javax/crypto/spec/SecretKeySpec.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __javax_crypto_spec_SecretKeySpec__
+#define __javax_crypto_spec_SecretKeySpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class SecretKeySpec;
+      }
+    }
+  }
+}
+
+class javax::crypto::spec::SecretKeySpec : public ::java::lang::Object
+{
+
+public:
+  SecretKeySpec(JArray< jbyte > *, ::java::lang::String *);
+  SecretKeySpec(JArray< jbyte > *, jint, jint, ::java::lang::String *);
+  virtual ::java::lang::String * getAlgorithm();
+  virtual JArray< jbyte > * getEncoded();
+  virtual ::java::lang::String * getFormat();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+private:
+  static const jlong serialVersionUID = 6577238317307289933LL;
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  ::java::lang::String * algorithm;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __javax_crypto_spec_SecretKeySpec__