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.

442 files changed, 21338 insertions, 0 deletions

diff --git a/libjava/gnu/javax/crypto/RSACipherImpl.h b/libjava/gnu/javax/crypto/RSACipherImpl.h
new file mode 100644
index 000000000..9f6775987
--- /dev/null
+++ b/libjava/gnu/javax/crypto/RSACipherImpl.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_RSACipherImpl__
+#define __gnu_javax_crypto_RSACipherImpl__
+
+#pragma interface
+
+#include <javax/crypto/CipherSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace classpath
+    {
+      namespace debug
+      {
+          class SystemLogger;
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+          class RSACipherImpl;
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace interfaces
+      {
+          class RSAPrivateKey;
+          class RSAPublicKey;
+      }
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::RSACipherImpl : public ::javax::crypto::CipherSpi
+{
+
+public:
+  RSACipherImpl();
+public: // actually protected
+  virtual void engineSetMode(::java::lang::String *);
+  virtual void engineSetPadding(::java::lang::String *);
+  virtual jint engineGetBlockSize();
+  virtual jint engineGetOutputSize(jint);
+  virtual jint engineGetKeySize(::java::security::Key *);
+  virtual JArray< jbyte > * engineGetIV();
+  virtual ::java::security::AlgorithmParameters * engineGetParameters();
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
+  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
+  virtual jint engineDoFinal(JArray< jbyte > *, jint);
+  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+private:
+  JArray< jbyte > * rsaDecrypt(::java::math::BigInteger *);
+  static ::gnu::classpath::debug::SystemLogger * logger;
+  static JArray< jbyte > * EMPTY;
+  jint __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) opmode;
+  ::java::security::interfaces::RSAPrivateKey * decipherKey;
+  ::java::security::interfaces::RSAPublicKey * blindingKey;
+  ::java::security::interfaces::RSAPublicKey * encipherKey;
+  ::java::security::SecureRandom * random;
+  JArray< jbyte > * dataBuffer;
+  jint pos;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_RSACipherImpl__
diff --git a/libjava/gnu/javax/crypto/assembly/Assembly.h b/libjava/gnu/javax/crypto/assembly/Assembly.h
new file mode 100644
index 000000000..81c2fece1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Assembly.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Assembly__
+#define __gnu_javax_crypto_assembly_Assembly__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Assembly;
+            class Direction;
+            class Operation;
+            class Transformer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Assembly : public ::java::lang::Object
+{
+
+public:
+  Assembly();
+  virtual void addPreTransformer(::gnu::javax::crypto::assembly::Transformer *);
+  virtual void addPostTransformer(::gnu::javax::crypto::assembly::Transformer *);
+  virtual void init(::java::util::Map *);
+  virtual void reset();
+  virtual JArray< jbyte > * update(jbyte);
+  virtual JArray< jbyte > * update(JArray< jbyte > *);
+  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * lastUpdate();
+  virtual JArray< jbyte > * lastUpdate(jbyte);
+  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *);
+  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *, jint, jint);
+private:
+  void wireTransformer(::gnu::javax::crypto::assembly::Transformer *, ::gnu::javax::crypto::assembly::Operation *);
+public:
+  static ::java::lang::String * DIRECTION;
+private:
+  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) wired;
+  ::gnu::javax::crypto::assembly::Transformer * head;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Assembly__
diff --git a/libjava/gnu/javax/crypto/assembly/Cascade.h b/libjava/gnu/javax/crypto/assembly/Cascade.h
new file mode 100644
index 000000000..88f82383c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Cascade.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Cascade__
+#define __gnu_javax_crypto_assembly_Cascade__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Cascade;
+            class Direction;
+            class Stage;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Cascade : public ::java::lang::Object
+{
+
+public:
+  Cascade();
+private:
+  static jint lcm(jint, jint);
+public:
+  virtual ::java::lang::Object * append(::gnu::javax::crypto::assembly::Stage *);
+  virtual ::java::lang::Object * prepend(::gnu::javax::crypto::assembly::Stage *);
+  virtual ::java::lang::Object * insert(jint, ::gnu::javax::crypto::assembly::Stage *);
+  virtual jint size();
+  virtual ::java::util::Iterator * stages();
+  virtual ::java::util::Set * blockSizes();
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize();
+  virtual void reset();
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual jboolean selfTest();
+  static ::java::lang::String * DIRECTION;
+public: // actually protected
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) stages__;
+  ::java::util::LinkedList * stageKeys;
+  ::gnu::javax::crypto::assembly::Direction * wired;
+  jint blockSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Cascade__
diff --git a/libjava/gnu/javax/crypto/assembly/CascadeStage.h b/libjava/gnu/javax/crypto/assembly/CascadeStage.h
new file mode 100644
index 000000000..b36ee47c9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/CascadeStage.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_CascadeStage__
+#define __gnu_javax_crypto_assembly_CascadeStage__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Stage.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Cascade;
+            class CascadeStage;
+            class Direction;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::CascadeStage : public ::gnu::javax::crypto::assembly::Stage
+{
+
+public: // actually package-private
+  CascadeStage(::gnu::javax::crypto::assembly::Cascade *, ::gnu::javax::crypto::assembly::Direction *);
+public:
+  virtual ::java::util::Set * blockSizes();
+public: // actually package-private
+  virtual void initDelegate(::java::util::Map *);
+public:
+  virtual jint currentBlockSize();
+public: // actually package-private
+  virtual void resetDelegate();
+  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+public:
+  virtual jboolean selfTest();
+private:
+  ::gnu::javax::crypto::assembly::Cascade * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Stage)))) delegate;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_CascadeStage__
diff --git a/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h b/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h
new file mode 100644
index 000000000..780d2582f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/CascadeTransformer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_CascadeTransformer__
+#define __gnu_javax_crypto_assembly_CascadeTransformer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Transformer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Cascade;
+            class CascadeTransformer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::CascadeTransformer : public ::gnu::javax::crypto::assembly::Transformer
+{
+
+public: // actually package-private
+  CascadeTransformer(::gnu::javax::crypto::assembly::Cascade *);
+  virtual void initDelegate(::java::util::Map *);
+  virtual jint delegateBlockSize();
+  virtual void resetDelegate();
+  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * lastUpdateDelegate();
+private:
+  JArray< jbyte > * updateInternal(JArray< jbyte > *, jint, jint);
+  ::gnu::javax::crypto::assembly::Cascade * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) delegate;
+  jint blockSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_CascadeTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h b/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h
new file mode 100644
index 000000000..7021c177e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/DeflateTransformer.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_DeflateTransformer__
+#define __gnu_javax_crypto_assembly_DeflateTransformer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Transformer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class DeflateTransformer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::DeflateTransformer : public ::gnu::javax::crypto::assembly::Transformer
+{
+
+public: // actually package-private
+  DeflateTransformer();
+  virtual void initDelegate(::java::util::Map *);
+  virtual jint delegateBlockSize();
+  virtual void resetDelegate();
+  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * lastUpdateDelegate();
+private:
+  void compress();
+  void decompress(JArray< jbyte > *, jint, jint);
+  ::java::util::zip::Deflater * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) compressor;
+  ::java::util::zip::Inflater * decompressor;
+  jint outputBlockSize;
+  JArray< jbyte > * zlibBuffer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_DeflateTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/Direction.h b/libjava/gnu/javax/crypto/assembly/Direction.h
new file mode 100644
index 000000000..207a55f0d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Direction.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Direction__
+#define __gnu_javax_crypto_assembly_Direction__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Direction;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Direction : public ::java::lang::Object
+{
+
+  Direction(jint);
+public:
+  static ::gnu::javax::crypto::assembly::Direction * reverse(::gnu::javax::crypto::assembly::Direction *);
+  ::java::lang::String * toString();
+  static ::gnu::javax::crypto::assembly::Direction * FORWARD;
+  static ::gnu::javax::crypto::assembly::Direction * REVERSED;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Direction__
diff --git a/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h b/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h
new file mode 100644
index 000000000..bf6ccc90c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/LoopbackTransformer.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_LoopbackTransformer__
+#define __gnu_javax_crypto_assembly_LoopbackTransformer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Transformer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class LoopbackTransformer;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::LoopbackTransformer : public ::gnu::javax::crypto::assembly::Transformer
+{
+
+public: // actually package-private
+  LoopbackTransformer();
+public:
+  void init(::java::util::Map *);
+  void reset();
+  JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * lastUpdate();
+public: // actually package-private
+  void initDelegate(::java::util::Map *);
+  jint delegateBlockSize();
+  void resetDelegate();
+  JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * lastUpdateDelegate();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_LoopbackTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/ModeStage.h b/libjava/gnu/javax/crypto/assembly/ModeStage.h
new file mode 100644
index 000000000..760df956c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/ModeStage.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_ModeStage__
+#define __gnu_javax_crypto_assembly_ModeStage__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Stage.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Direction;
+            class ModeStage;
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::ModeStage : public ::gnu::javax::crypto::assembly::Stage
+{
+
+public: // actually package-private
+  ModeStage(::gnu::javax::crypto::mode::IMode *, ::gnu::javax::crypto::assembly::Direction *);
+public:
+  virtual ::java::util::Set * blockSizes();
+public: // actually package-private
+  virtual void initDelegate(::java::util::Map *);
+public:
+  virtual jint currentBlockSize();
+public: // actually package-private
+  virtual void resetDelegate();
+  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+public:
+  virtual jboolean selfTest();
+private:
+  ::gnu::javax::crypto::mode::IMode * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Stage)))) delegate;
+  ::java::util::Set * cachedBlockSizes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_ModeStage__
diff --git a/libjava/gnu/javax/crypto/assembly/Operation.h b/libjava/gnu/javax/crypto/assembly/Operation.h
new file mode 100644
index 000000000..792a1bad5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Operation.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Operation__
+#define __gnu_javax_crypto_assembly_Operation__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Operation;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Operation : public ::java::lang::Object
+{
+
+  Operation(jint);
+public:
+  ::java::lang::String * toString();
+  static ::gnu::javax::crypto::assembly::Operation * PRE_PROCESSING;
+  static ::gnu::javax::crypto::assembly::Operation * POST_PROCESSING;
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Operation__
diff --git a/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h b/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h
new file mode 100644
index 000000000..6a16b608e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/PaddingTransformer.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_PaddingTransformer__
+#define __gnu_javax_crypto_assembly_PaddingTransformer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/assembly/Transformer.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class PaddingTransformer;
+        }
+        namespace pad
+        {
+            class IPad;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::PaddingTransformer : public ::gnu::javax::crypto::assembly::Transformer
+{
+
+public: // actually package-private
+  PaddingTransformer(::gnu::javax::crypto::pad::IPad *);
+  virtual void initDelegate(::java::util::Map *);
+  virtual jint delegateBlockSize();
+  virtual void resetDelegate();
+  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * lastUpdateDelegate();
+private:
+  ::gnu::javax::crypto::pad::IPad * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::assembly::Transformer)))) delegate;
+  jint outputBlockSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_PaddingTransformer__
diff --git a/libjava/gnu/javax/crypto/assembly/Stage.h b/libjava/gnu/javax/crypto/assembly/Stage.h
new file mode 100644
index 000000000..799ef5e69
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Stage.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Stage__
+#define __gnu_javax_crypto_assembly_Stage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Cascade;
+            class Direction;
+            class Stage;
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Stage : public ::java::lang::Object
+{
+
+public: // actually protected
+  Stage(::gnu::javax::crypto::assembly::Direction *);
+public:
+  static ::gnu::javax::crypto::assembly::Stage * getInstance(::gnu::javax::crypto::mode::IMode *, ::gnu::javax::crypto::assembly::Direction *);
+  static ::gnu::javax::crypto::assembly::Stage * getInstance(::gnu::javax::crypto::assembly::Cascade *, ::gnu::javax::crypto::assembly::Direction *);
+  virtual ::java::util::Set * blockSizes() = 0;
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize() = 0;
+  virtual void reset();
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual jboolean selfTest() = 0;
+public: // actually package-private
+  virtual void initDelegate(::java::util::Map *) = 0;
+  virtual void resetDelegate() = 0;
+  virtual void updateDelegate(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+public:
+  static ::java::lang::String * DIRECTION;
+public: // actually protected
+  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) forward;
+  ::gnu::javax::crypto::assembly::Direction * wired;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Stage__
diff --git a/libjava/gnu/javax/crypto/assembly/Transformer.h b/libjava/gnu/javax/crypto/assembly/Transformer.h
new file mode 100644
index 000000000..1860d3d30
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/Transformer.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_Transformer__
+#define __gnu_javax_crypto_assembly_Transformer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Cascade;
+            class Direction;
+            class Operation;
+            class Transformer;
+        }
+        namespace pad
+        {
+            class IPad;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::Transformer : public ::java::lang::Object
+{
+
+public: // actually protected
+  Transformer();
+public:
+  static ::gnu::javax::crypto::assembly::Transformer * getCascadeTransformer(::gnu::javax::crypto::assembly::Cascade *);
+  static ::gnu::javax::crypto::assembly::Transformer * getPaddingTransformer(::gnu::javax::crypto::pad::IPad *);
+  static ::gnu::javax::crypto::assembly::Transformer * getDeflateTransformer();
+  virtual void setMode(::gnu::javax::crypto::assembly::Operation *);
+  virtual jboolean isPreProcessing();
+  virtual jboolean isPostProcessing();
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize();
+  virtual void reset();
+  virtual JArray< jbyte > * update(jbyte);
+  virtual JArray< jbyte > * update(JArray< jbyte > *);
+  virtual JArray< jbyte > * update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * lastUpdate();
+  virtual JArray< jbyte > * lastUpdate(jbyte);
+  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *);
+  virtual JArray< jbyte > * lastUpdate(JArray< jbyte > *, jint, jint);
+private:
+  JArray< jbyte > * forwardUpdate(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * inverseUpdate(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * preTransform(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * postTransform(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * lastForwardUpdate();
+  JArray< jbyte > * lastInverseUpdate();
+  JArray< jbyte > * preLastTransform();
+  JArray< jbyte > * postLastTransform();
+public: // actually package-private
+  virtual void initDelegate(::java::util::Map *) = 0;
+  virtual jint delegateBlockSize() = 0;
+  virtual void resetDelegate() = 0;
+  virtual JArray< jbyte > * updateDelegate(JArray< jbyte > *, jint, jint) = 0;
+  virtual JArray< jbyte > * lastUpdateDelegate() = 0;
+public:
+  static ::java::lang::String * DIRECTION;
+public: // actually protected
+  ::gnu::javax::crypto::assembly::Direction * __attribute__((aligned(__alignof__( ::java::lang::Object)))) wired;
+  ::gnu::javax::crypto::assembly::Operation * mode;
+  ::gnu::javax::crypto::assembly::Transformer * tail;
+  ::java::io::ByteArrayOutputStream * inBuffer;
+  ::java::io::ByteArrayOutputStream * outBuffer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_Transformer__
diff --git a/libjava/gnu/javax/crypto/assembly/TransformerException.h b/libjava/gnu/javax/crypto/assembly/TransformerException.h
new file mode 100644
index 000000000..cb9e92a4f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/assembly/TransformerException.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_assembly_TransformerException__
+#define __gnu_javax_crypto_assembly_TransformerException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class TransformerException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::assembly::TransformerException : public ::java::lang::Exception
+{
+
+public:
+  TransformerException();
+  TransformerException(::java::lang::String *);
+  TransformerException(::java::lang::Throwable *);
+  TransformerException(::java::lang::String *, ::java::lang::Throwable *);
+  virtual ::java::lang::Throwable * getCause();
+  virtual void printStackTrace();
+  virtual void printStackTrace(::java::io::PrintStream *);
+  virtual void printStackTrace(::java::io::PrintWriter *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::lang::Exception)))) _exception;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_assembly_TransformerException__
diff --git a/libjava/gnu/javax/crypto/cipher/Anubis.h b/libjava/gnu/javax/crypto/cipher/Anubis.h
new file mode 100644
index 000000000..b9a40b847
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Anubis.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Anubis__
+#define __gnu_javax_crypto_cipher_Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Anubis;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Anubis : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Anubis();
+private:
+  static void anubis(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *);
+public:
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+private:
+  static ::java::util::logging::Logger * log;
+  static const jint DEFAULT_BLOCK_SIZE = 16;
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static ::java::lang::String * Sd;
+  static JArray< jbyte > * S;
+  static JArray< jint > * T0;
+  static JArray< jint > * T1;
+  static JArray< jint > * T2;
+  static JArray< jint > * T3;
+  static JArray< jint > * T4;
+  static JArray< jint > * T5;
+  static JArray< jint > * rc;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Anubis__
diff --git a/libjava/gnu/javax/crypto/cipher/BaseCipher.h b/libjava/gnu/javax/crypto/cipher/BaseCipher.h
new file mode 100644
index 000000000..bb6437df6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/BaseCipher.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_BaseCipher__
+#define __gnu_javax_crypto_cipher_BaseCipher__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class BaseCipher;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::BaseCipher : public ::java::lang::Object
+{
+
+public: // actually protected
+  BaseCipher(::java::lang::String *, jint, jint);
+public:
+  virtual ::java::lang::Object * clone() = 0;
+  virtual ::java::lang::String * name();
+  virtual jint defaultBlockSize();
+  virtual jint defaultKeySize();
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize();
+  virtual void reset();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual jboolean selfTest();
+private:
+  jboolean testSymmetry(jint, jint);
+public: // actually protected
+  virtual jboolean testKat(JArray< jbyte > *, JArray< jbyte > *);
+  virtual jboolean testKat(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+public:
+  virtual ::java::util::Iterator * blockSizes() = 0;
+  virtual ::java::util::Iterator * keySizes() = 0;
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint) = 0;
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
+private:
+  static ::java::util::logging::Logger * log;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+  jint defaultBlockSize__;
+  jint defaultKeySize__;
+  jint currentBlockSize__;
+  ::java::lang::Object * currentKey;
+  ::java::lang::Object * lock;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_BaseCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h b/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h
new file mode 100644
index 000000000..738cb3732
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Blowfish$Block.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Blowfish$Block__
+#define __gnu_javax_crypto_cipher_Blowfish$Block__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Blowfish;
+            class Blowfish$Block;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Blowfish$Block : public ::java::lang::Object
+{
+
+  Blowfish$Block(::gnu::javax::crypto::cipher::Blowfish *);
+public: // actually package-private
+  Blowfish$Block(::gnu::javax::crypto::cipher::Blowfish *, ::gnu::javax::crypto::cipher::Blowfish$Block *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) left;
+  jint right;
+  ::gnu::javax::crypto::cipher::Blowfish * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Blowfish$Block__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h b/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h
new file mode 100644
index 000000000..74c9087ea
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Blowfish$Context.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Blowfish$Context__
+#define __gnu_javax_crypto_cipher_Blowfish$Context__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Blowfish;
+            class Blowfish$Context;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Blowfish$Context : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Blowfish$Context(::gnu::javax::crypto::cipher::Blowfish *);
+private:
+  Blowfish$Context(::gnu::javax::crypto::cipher::Blowfish *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) p;
+  JArray< jint > * s0;
+  JArray< jint > * s1;
+  JArray< jint > * s2;
+  JArray< jint > * s3;
+  ::gnu::javax::crypto::cipher::Blowfish * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Blowfish$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/Blowfish.h b/libjava/gnu/javax/crypto/cipher/Blowfish.h
new file mode 100644
index 000000000..dac15df6c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Blowfish.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Blowfish__
+#define __gnu_javax_crypto_cipher_Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Blowfish;
+            class Blowfish$Block;
+            class Blowfish$Context;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Blowfish : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Blowfish();
+  virtual ::java::lang::Object * clone();
+  virtual ::java::util::Iterator * keySizes();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+private:
+  void blowfishEncrypt(::gnu::javax::crypto::cipher::Blowfish$Block *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
+  void blowfishDecrypt(::gnu::javax::crypto::cipher::Blowfish$Block *, ::gnu::javax::crypto::cipher::Blowfish$Context *);
+public:
+  virtual jboolean selfTest();
+private:
+  static const jint DEFAULT_BLOCK_SIZE = 8;
+  static const jint DEFAULT_KEY_SIZE = 8;
+  static const jint MAX_KEY_LENGTH = 56;
+  static JArray< jint > * P;
+public: // actually package-private
+  static JArray< jint > * KS0;
+private:
+  static JArray< jint > * KS1;
+  static JArray< jint > * KS2;
+  static JArray< jint > * KS3;
+  static ::java::lang::Boolean * valid;
+  static JArray< jbyte > * TV_KEY;
+  static JArray< jbyte > * TV_CT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Blowfish__
diff --git a/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h b/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h
new file mode 100644
index 000000000..7f1ecc056
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Cast5$Cast5Key.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Cast5$Cast5Key__
+#define __gnu_javax_crypto_cipher_Cast5$Cast5Key__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Cast5;
+            class Cast5$Cast5Key;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Cast5$Cast5Key : public ::java::lang::Object
+{
+
+  Cast5$Cast5Key(::gnu::javax::crypto::cipher::Cast5 *);
+public: // actually package-private
+  Cast5$Cast5Key(::gnu::javax::crypto::cipher::Cast5 *, ::gnu::javax::crypto::cipher::Cast5$Cast5Key *);
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) rounds;
+  jint Km0;
+  jint Km1;
+  jint Km2;
+  jint Km3;
+  jint Km4;
+  jint Km5;
+  jint Km6;
+  jint Km7;
+  jint Km8;
+  jint Km9;
+  jint Km10;
+  jint Km11;
+  jint Km12;
+  jint Km13;
+  jint Km14;
+  jint Km15;
+  jint Kr0;
+  jint Kr1;
+  jint Kr2;
+  jint Kr3;
+  jint Kr4;
+  jint Kr5;
+  jint Kr6;
+  jint Kr7;
+  jint Kr8;
+  jint Kr9;
+  jint Kr10;
+  jint Kr11;
+  jint Kr12;
+  jint Kr13;
+  jint Kr14;
+  jint Kr15;
+  ::gnu::javax::crypto::cipher::Cast5 * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Cast5$Cast5Key__
diff --git a/libjava/gnu/javax/crypto/cipher/Cast5.h b/libjava/gnu/javax/crypto/cipher/Cast5.h
new file mode 100644
index 000000000..40cebee7c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Cast5.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Cast5__
+#define __gnu_javax_crypto_cipher_Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Cast5;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Cast5 : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Cast5();
+private:
+  static JArray< jint > * unscramble(jint);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual jboolean selfTest();
+private:
+  jint f1(jint, jint, jint);
+  jint f2(jint, jint, jint);
+  jint f3(jint, jint, jint);
+  static const jint DEFAULT_BLOCK_SIZE = 8;
+  static const jint DEFAULT_KEY_SIZE = 5;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_PT;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+  static JArray< jint > * S1;
+  static JArray< jint > * S2;
+  static JArray< jint > * S3;
+  static JArray< jint > * S4;
+  static JArray< jint > * S5;
+  static JArray< jint > * S6;
+  static JArray< jint > * S7;
+  static JArray< jint > * S8;
+  static const jint _12_ROUNDS = 12;
+  static const jint _16_ROUNDS = 16;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Cast5__
diff --git a/libjava/gnu/javax/crypto/cipher/CipherFactory.h b/libjava/gnu/javax/crypto/cipher/CipherFactory.h
new file mode 100644
index 000000000..97f49ea79
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/CipherFactory.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_CipherFactory__
+#define __gnu_javax_crypto_cipher_CipherFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class CipherFactory;
+            class IBlockCipher;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::CipherFactory : public ::java::lang::Object
+{
+
+  CipherFactory();
+public:
+  static ::gnu::javax::crypto::cipher::IBlockCipher * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_CipherFactory__
diff --git a/libjava/gnu/javax/crypto/cipher/DES$Context.h b/libjava/gnu/javax/crypto/cipher/DES$Context.h
new file mode 100644
index 000000000..f25456f4d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/DES$Context.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_DES$Context__
+#define __gnu_javax_crypto_cipher_DES$Context__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class DES;
+            class DES$Context;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::DES$Context : public ::java::lang::Object
+{
+
+public: // actually package-private
+  DES$Context(::gnu::javax::crypto::cipher::DES *);
+  JArray< jbyte > * getEncryptionKeyBytes();
+  JArray< jbyte > * getDecryptionKeyBytes();
+  JArray< jbyte > * toByteArray(JArray< jint > *);
+private:
+  static const jint EXPANDED_KEY_SIZE = 32;
+public: // actually package-private
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) ek;
+  JArray< jint > * dk;
+  ::gnu::javax::crypto::cipher::DES * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_DES$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/DES.h b/libjava/gnu/javax/crypto/cipher/DES.h
new file mode 100644
index 000000000..a5830d835
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/DES.h
@@ -0,0 +1,70 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_DES__
+#define __gnu_javax_crypto_cipher_DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class DES;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::DES : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  DES();
+  static void adjustParity(JArray< jbyte > *, jint);
+  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
+  static jboolean isWeak(JArray< jbyte > *);
+  static jboolean isSemiWeak(JArray< jbyte > *);
+  static jboolean isPossibleWeak(JArray< jbyte > *);
+private:
+  static void desFunc(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< jint > *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  static const jint BLOCK_SIZE = 8;
+  static const jint KEY_SIZE = 8;
+private:
+  static JArray< jint > * SP1;
+  static JArray< jint > * SP2;
+  static JArray< jint > * SP3;
+  static JArray< jint > * SP4;
+  static JArray< jint > * SP5;
+  static JArray< jint > * SP6;
+  static JArray< jint > * SP7;
+  static JArray< jint > * SP8;
+  static JArray< jbyte > * PARITY;
+  static JArray< jbyte > * ROTARS;
+  static JArray< jbyte > * PC1;
+  static JArray< jbyte > * PC2;
+public:
+  static JArray< JArray< jbyte > * > * WEAK_KEYS;
+  static JArray< JArray< jbyte > * > * SEMIWEAK_KEYS;
+  static JArray< JArray< jbyte > * > * POSSIBLE_WEAK_KEYS;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_DES__
diff --git a/libjava/gnu/javax/crypto/cipher/IBlockCipher.h b/libjava/gnu/javax/crypto/cipher/IBlockCipher.h
new file mode 100644
index 000000000..662389b26
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/IBlockCipher.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_IBlockCipher__
+#define __gnu_javax_crypto_cipher_IBlockCipher__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::IBlockCipher : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * name() = 0;
+  virtual jint defaultBlockSize() = 0;
+  virtual jint defaultKeySize() = 0;
+  virtual ::java::util::Iterator * blockSizes() = 0;
+  virtual ::java::util::Iterator * keySizes() = 0;
+  virtual ::java::lang::Object * clone() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual jint currentBlockSize() = 0;
+  virtual void reset() = 0;
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual jboolean selfTest() = 0;
+  static ::java::lang::String * CIPHER_BLOCK_SIZE;
+  static ::java::lang::String * KEY_MATERIAL;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_cipher_IBlockCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h b/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h
new file mode 100644
index 000000000..35e686dda
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/IBlockCipherSpi.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_IBlockCipherSpi__
+#define __gnu_javax_crypto_cipher_IBlockCipherSpi__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipherSpi;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::IBlockCipherSpi : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::util::Iterator * blockSizes() = 0;
+  virtual ::java::util::Iterator * keySizes() = 0;
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint) = 0;
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint) = 0;
+  virtual jboolean selfTest() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_cipher_IBlockCipherSpi__
diff --git a/libjava/gnu/javax/crypto/cipher/Khazad.h b/libjava/gnu/javax/crypto/cipher/Khazad.h
new file mode 100644
index 000000000..734bab28e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Khazad.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Khazad__
+#define __gnu_javax_crypto_cipher_Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Khazad;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Khazad : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Khazad();
+private:
+  static void khazad(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *);
+public:
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+private:
+  static ::java::util::logging::Logger * log;
+  static const jint DEFAULT_BLOCK_SIZE = 8;
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static const jint R = 8;
+  static ::java::lang::String * Sd;
+  static JArray< jbyte > * S;
+  static JArray< jint > * T0;
+  static JArray< jint > * T1;
+  static JArray< jint > * T2;
+  static JArray< jint > * T3;
+  static JArray< jint > * T4;
+  static JArray< jint > * T5;
+  static JArray< jint > * T6;
+  static JArray< jint > * T7;
+  static JArray< JArray< jint > * > * rc;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Khazad__
diff --git a/libjava/gnu/javax/crypto/cipher/NullCipher.h b/libjava/gnu/javax/crypto/cipher/NullCipher.h
new file mode 100644
index 000000000..5199488c5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/NullCipher.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_NullCipher__
+#define __gnu_javax_crypto_cipher_NullCipher__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class NullCipher;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::NullCipher : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  NullCipher();
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_NullCipher__
diff --git a/libjava/gnu/javax/crypto/cipher/Rijndael.h b/libjava/gnu/javax/crypto/cipher/Rijndael.h
new file mode 100644
index 000000000..2511bfe66
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Rijndael.h
@@ -0,0 +1,76 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Rijndael__
+#define __gnu_javax_crypto_cipher_Rijndael__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Rijndael;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Rijndael : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Rijndael();
+  static jint getRounds(jint, jint);
+private:
+  static void rijndaelEncrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  static void rijndaelDecrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  static void aesEncrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *);
+  static void aesDecrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *);
+public:
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+private:
+  static ::java::util::logging::Logger * log;
+  static const jint DEFAULT_BLOCK_SIZE = 16;
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static ::java::lang::String * SS;
+  static JArray< jbyte > * S;
+  static JArray< jbyte > * Si;
+  static JArray< jint > * T1;
+  static JArray< jint > * T2;
+  static JArray< jint > * T3;
+  static JArray< jint > * T4;
+  static JArray< jint > * T5;
+  static JArray< jint > * T6;
+  static JArray< jint > * T7;
+  static JArray< jint > * T8;
+  static JArray< jint > * U1;
+  static JArray< jint > * U2;
+  static JArray< jint > * U3;
+  static JArray< jint > * U4;
+  static JArray< jbyte > * rcon;
+  static JArray< JArray< JArray< jint > * > * > * shifts;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Rijndael__
diff --git a/libjava/gnu/javax/crypto/cipher/Serpent$Key.h b/libjava/gnu/javax/crypto/cipher/Serpent$Key.h
new file mode 100644
index 000000000..ee098e01a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Serpent$Key.h
@@ -0,0 +1,175 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Serpent$Key__
+#define __gnu_javax_crypto_cipher_Serpent$Key__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Serpent;
+            class Serpent$Key;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Serpent$Key : public ::java::lang::Object
+{
+
+public: // actually package-private
+  Serpent$Key(::gnu::javax::crypto::cipher::Serpent *);
+private:
+  Serpent$Key(::gnu::javax::crypto::cipher::Serpent *, ::gnu::javax::crypto::cipher::Serpent$Key *);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) k0;
+  jint k1;
+  jint k2;
+  jint k3;
+  jint k4;
+  jint k5;
+  jint k6;
+  jint k7;
+  jint k8;
+  jint k9;
+  jint k10;
+  jint k11;
+  jint k12;
+  jint k13;
+  jint k14;
+  jint k15;
+  jint k16;
+  jint k17;
+  jint k18;
+  jint k19;
+  jint k20;
+  jint k21;
+  jint k22;
+  jint k23;
+  jint k24;
+  jint k25;
+  jint k26;
+  jint k27;
+  jint k28;
+  jint k29;
+  jint k30;
+  jint k31;
+  jint k32;
+  jint k33;
+  jint k34;
+  jint k35;
+  jint k36;
+  jint k37;
+  jint k38;
+  jint k39;
+  jint k40;
+  jint k41;
+  jint k42;
+  jint k43;
+  jint k44;
+  jint k45;
+  jint k46;
+  jint k47;
+  jint k48;
+  jint k49;
+  jint k50;
+  jint k51;
+  jint k52;
+  jint k53;
+  jint k54;
+  jint k55;
+  jint k56;
+  jint k57;
+  jint k58;
+  jint k59;
+  jint k60;
+  jint k61;
+  jint k62;
+  jint k63;
+  jint k64;
+  jint k65;
+  jint k66;
+  jint k67;
+  jint k68;
+  jint k69;
+  jint k70;
+  jint k71;
+  jint k72;
+  jint k73;
+  jint k74;
+  jint k75;
+  jint k76;
+  jint k77;
+  jint k78;
+  jint k79;
+  jint k80;
+  jint k81;
+  jint k82;
+  jint k83;
+  jint k84;
+  jint k85;
+  jint k86;
+  jint k87;
+  jint k88;
+  jint k89;
+  jint k90;
+  jint k91;
+  jint k92;
+  jint k93;
+  jint k94;
+  jint k95;
+  jint k96;
+  jint k97;
+  jint k98;
+  jint k99;
+  jint k100;
+  jint k101;
+  jint k102;
+  jint k103;
+  jint k104;
+  jint k105;
+  jint k106;
+  jint k107;
+  jint k108;
+  jint k109;
+  jint k110;
+  jint k111;
+  jint k112;
+  jint k113;
+  jint k114;
+  jint k115;
+  jint k116;
+  jint k117;
+  jint k118;
+  jint k119;
+  jint k120;
+  jint k121;
+  jint k122;
+  jint k123;
+  jint k124;
+  jint k125;
+  jint k126;
+  jint k127;
+  jint k128;
+  jint k129;
+  jint k130;
+  jint k131;
+  ::gnu::javax::crypto::cipher::Serpent * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Serpent$Key__
diff --git a/libjava/gnu/javax/crypto/cipher/Serpent.h b/libjava/gnu/javax/crypto/cipher/Serpent.h
new file mode 100644
index 000000000..20b9a5bf7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Serpent.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Serpent__
+#define __gnu_javax_crypto_cipher_Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Serpent;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Serpent : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Serpent();
+  virtual ::java::lang::Object * clone();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual jboolean selfTest();
+private:
+  void sbox0();
+  void sbox1();
+  void sbox2();
+  void sbox3();
+  void sbox4();
+  void sbox5();
+  void sbox6();
+  void sbox7();
+  void sbox7noLT();
+  void sboxI7noLT();
+  void sboxI6();
+  void sboxI5();
+  void sboxI4();
+  void sboxI3();
+  void sboxI2();
+  void sboxI1();
+  void sboxI0();
+  void sboxI7();
+  void sbox0(jint, jint, jint, jint);
+  void sbox1(jint, jint, jint, jint);
+  void sbox2(jint, jint, jint, jint);
+  void sbox3(jint, jint, jint, jint);
+  void sbox4(jint, jint, jint, jint);
+  void sbox5(jint, jint, jint, jint);
+  void sbox6(jint, jint, jint, jint);
+  void sbox7(jint, jint, jint, jint);
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static const jint DEFAULT_BLOCK_SIZE = 16;
+  static const jint ROUNDS = 32;
+  static const jint PHI = -1640531527;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::cipher::BaseCipher)))) x0;
+  jint x1;
+  jint x2;
+  jint x3;
+  jint x4;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Serpent__
diff --git a/libjava/gnu/javax/crypto/cipher/Square.h b/libjava/gnu/javax/crypto/cipher/Square.h
new file mode 100644
index 000000000..cae545c19
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Square.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Square__
+#define __gnu_javax_crypto_cipher_Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Square;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Square : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  Square();
+private:
+  static void square(JArray< jbyte > *, jint, JArray< jbyte > *, jint, JArray< JArray< jint > * > *, JArray< jint > *, JArray< jbyte > *);
+  static void transform(JArray< jint > *, JArray< jint > *);
+  static jint rot32L(jint, jint);
+  static jint rot32R(jint, jint);
+  static jint mul(jint, jint);
+public:
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+private:
+  static const jint DEFAULT_BLOCK_SIZE = 16;
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static const jint ROUNDS = 8;
+  static const jint ROOT = 501;
+  static JArray< jint > * OFFSET;
+  static ::java::lang::String * Sdata;
+  static JArray< jbyte > * Se;
+  static JArray< jbyte > * Sd;
+  static JArray< jint > * Te;
+  static JArray< jint > * Td;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Square__
diff --git a/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h b/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h
new file mode 100644
index 000000000..f26021502
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/TripleDES$Context.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_TripleDES$Context__
+#define __gnu_javax_crypto_cipher_TripleDES$Context__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class DES$Context;
+            class TripleDES;
+            class TripleDES$Context;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::TripleDES$Context : public ::java::lang::Object
+{
+
+  TripleDES$Context(::gnu::javax::crypto::cipher::TripleDES *);
+public: // actually package-private
+  TripleDES$Context(::gnu::javax::crypto::cipher::TripleDES *, ::gnu::javax::crypto::cipher::TripleDES$Context *);
+  ::gnu::javax::crypto::cipher::DES$Context * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k1;
+  ::gnu::javax::crypto::cipher::DES$Context * k2;
+  ::gnu::javax::crypto::cipher::DES$Context * k3;
+  ::gnu::javax::crypto::cipher::TripleDES * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_TripleDES$Context__
diff --git a/libjava/gnu/javax/crypto/cipher/TripleDES.h b/libjava/gnu/javax/crypto/cipher/TripleDES.h
new file mode 100644
index 000000000..cbe5a6c5f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/TripleDES.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_TripleDES__
+#define __gnu_javax_crypto_cipher_TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class DES;
+            class TripleDES;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::TripleDES : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+public:
+  TripleDES();
+  static void adjustParity(JArray< jbyte > *, jint);
+  static void adjustParity(jint, JArray< jbyte > *, jint);
+  static jboolean isParityAdjusted(JArray< jbyte > *, jint);
+  static jboolean isParityAdjusted(jint, JArray< jbyte > *, jint);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  virtual void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  virtual void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  static const jint BLOCK_SIZE = 8;
+  static const jint KEY_SIZE = 24;
+private:
+  ::gnu::javax::crypto::cipher::DES * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::cipher::BaseCipher)))) des;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_TripleDES__
diff --git a/libjava/gnu/javax/crypto/cipher/Twofish.h b/libjava/gnu/javax/crypto/cipher/Twofish.h
new file mode 100644
index 000000000..5c2d7cb95
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/Twofish.h
@@ -0,0 +1,101 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_Twofish__
+#define __gnu_javax_crypto_cipher_Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/cipher/BaseCipher.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Twofish;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::Twofish : public ::gnu::javax::crypto::cipher::BaseCipher
+{
+
+  static jint LFSR1(jint);
+  static jint LFSR2(jint);
+  static jint Mx_X(jint);
+  static jint Mx_Y(jint);
+public:
+  Twofish();
+private:
+  static jint b0(jint);
+  static jint b1(jint);
+  static jint b2(jint);
+  static jint b3(jint);
+  static jint RS_MDS_Encode(jint, jint);
+  static jint RS_rem(jint);
+  static jint F32(jint, jint, JArray< jint > *);
+  static jint Fe32(JArray< jint > *, jint, jint);
+  static jint _b(jint, jint);
+public:
+  ::java::lang::Object * clone();
+  ::java::util::Iterator * blockSizes();
+  ::java::util::Iterator * keySizes();
+  ::java::lang::Object * makeKey(JArray< jbyte > *, jint);
+  void encrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  void decrypt(JArray< jbyte > *, jint, JArray< jbyte > *, jint, ::java::lang::Object *, jint);
+  jboolean selfTest();
+private:
+  static ::java::util::logging::Logger * log;
+  static const jint DEFAULT_BLOCK_SIZE = 16;
+  static const jint DEFAULT_KEY_SIZE = 16;
+  static const jint MAX_ROUNDS = 16;
+  static const jint ROUNDS = 16;
+  static const jint INPUT_WHITEN = 0;
+  static const jint OUTPUT_WHITEN = 4;
+  static const jint ROUND_SUBKEYS = 8;
+  static const jint SK_STEP = 33686018;
+  static const jint SK_BUMP = 16843009;
+  static const jint SK_ROTL = 9;
+  static JArray< ::java::lang::String * > * Pm;
+  static JArray< JArray< jbyte > * > * P;
+  static const jint P_00 = 1;
+  static const jint P_01 = 0;
+  static const jint P_02 = 0;
+  static const jint P_03 = 1;
+  static const jint P_04 = 1;
+  static const jint P_10 = 0;
+  static const jint P_11 = 0;
+  static const jint P_12 = 1;
+  static const jint P_13 = 1;
+  static const jint P_14 = 0;
+  static const jint P_20 = 1;
+  static const jint P_21 = 1;
+  static const jint P_22 = 0;
+  static const jint P_23 = 0;
+  static const jint P_24 = 0;
+  static const jint P_30 = 0;
+  static const jint P_31 = 1;
+  static const jint P_32 = 1;
+  static const jint P_33 = 0;
+  static const jint P_34 = 1;
+  static const jint GF256_FDBK_2 = 180;
+  static const jint GF256_FDBK_4 = 90;
+  static JArray< JArray< jint > * > * MDS;
+  static const jint RS_GF_FDBK = 333;
+  static JArray< jbyte > * KAT_KEY;
+  static JArray< jbyte > * KAT_CT;
+  static ::java::lang::Boolean * valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_Twofish__
diff --git a/libjava/gnu/javax/crypto/cipher/WeakKeyException.h b/libjava/gnu/javax/crypto/cipher/WeakKeyException.h
new file mode 100644
index 000000000..42d12100f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/cipher/WeakKeyException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_cipher_WeakKeyException__
+#define __gnu_javax_crypto_cipher_WeakKeyException__
+
+#pragma interface
+
+#include <java/security/InvalidKeyException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class WeakKeyException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::cipher::WeakKeyException : public ::java::security::InvalidKeyException
+{
+
+public:
+  WeakKeyException();
+  WeakKeyException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_cipher_WeakKeyException__
diff --git a/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h b/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h
new file mode 100644
index 000000000..3cd0578de
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/DiffieHellmanImpl.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_DiffieHellmanImpl__
+#define __gnu_javax_crypto_jce_DiffieHellmanImpl__
+
+#pragma interface
+
+#include <javax/crypto/KeyAgreementSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class DiffieHellmanImpl;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+      namespace interfaces
+      {
+          class DHPrivateKey;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::DiffieHellmanImpl : public ::javax::crypto::KeyAgreementSpi
+{
+
+public:
+  DiffieHellmanImpl();
+public: // actually protected
+  ::java::security::Key * engineDoPhase(::java::security::Key *, jboolean);
+  JArray< jbyte > * engineGenerateSecret();
+  jint engineGenerateSecret(JArray< jbyte > *, jint);
+  ::javax::crypto::SecretKey * engineGenerateSecret(::java::lang::String *);
+  void engineInit(::java::security::Key *, ::java::security::SecureRandom *);
+  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+private:
+  void reset();
+  void checkState();
+  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::javax::crypto::KeyAgreementSpi)))) key;
+  JArray< jbyte > * result;
+  jboolean last_phase_done;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_DiffieHellmanImpl__
diff --git a/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h b/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h
new file mode 100644
index 000000000..bfd4f2d37
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/GnuCrypto$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_GnuCrypto$1__
+#define __gnu_javax_crypto_jce_GnuCrypto$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class GnuCrypto;
+            class GnuCrypto$1;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::GnuCrypto$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  GnuCrypto$1(::gnu::javax::crypto::jce::GnuCrypto *);
+public:
+  virtual ::java::lang::Object * run();
+public: // actually package-private
+  ::gnu::javax::crypto::jce::GnuCrypto * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_GnuCrypto$1__
diff --git a/libjava/gnu/javax/crypto/jce/GnuCrypto.h b/libjava/gnu/javax/crypto/jce/GnuCrypto.h
new file mode 100644
index 000000000..fa9cb5774
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/GnuCrypto.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_GnuCrypto__
+#define __gnu_javax_crypto_jce_GnuCrypto__
+
+#pragma interface
+
+#include <java/security/Provider.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class GnuCrypto;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::GnuCrypto : public ::java::security::Provider
+{
+
+public:
+  GnuCrypto();
+  static ::java::util::Set * getCipherNames();
+  static ::java::util::Set * getMacNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_GnuCrypto__
diff --git a/libjava/gnu/javax/crypto/jce/GnuSasl$1.h b/libjava/gnu/javax/crypto/jce/GnuSasl$1.h
new file mode 100644
index 000000000..149e7b227
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/GnuSasl$1.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_GnuSasl$1__
+#define __gnu_javax_crypto_jce_GnuSasl$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class GnuSasl;
+            class GnuSasl$1;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::GnuSasl$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  GnuSasl$1(::gnu::javax::crypto::jce::GnuSasl *);
+public:
+  virtual ::java::lang::Object * run();
+public: // actually package-private
+  ::gnu::javax::crypto::jce::GnuSasl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_GnuSasl$1__
diff --git a/libjava/gnu/javax/crypto/jce/GnuSasl.h b/libjava/gnu/javax/crypto/jce/GnuSasl.h
new file mode 100644
index 000000000..bf624a12a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/GnuSasl.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_GnuSasl__
+#define __gnu_javax_crypto_jce_GnuSasl__
+
+#pragma interface
+
+#include <java/security/Provider.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class GnuSasl;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::GnuSasl : public ::java::security::Provider
+{
+
+public:
+  GnuSasl();
+  static ::java::util::Set * getSaslClientMechanismNames();
+  static ::java::util::Set * getSaslServerMechanismNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_GnuSasl__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h
new file mode 100644
index 000000000..30227d8f3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacHaval.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacHaval;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacHaval : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacHaval();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacHaval__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h
new file mode 100644
index 000000000..4d18fa3cf
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD2.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacMD2;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD2 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacMD2();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD2__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h
new file mode 100644
index 000000000..b55a29dd0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD4.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacMD4;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD4 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacMD4();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD4__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h
new file mode 100644
index 000000000..2e8599cbc
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacMD5.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacMD5;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacMD5 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacMD5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacMD5__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h
new file mode 100644
index 000000000..5bfcdf369
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD128.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacRipeMD128;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacRipeMD128 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacRipeMD128();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD128__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h
new file mode 100644
index 000000000..9e058d6d4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacRipeMD160.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacRipeMD160;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacRipeMD160 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacRipeMD160();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacRipeMD160__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h
new file mode 100644
index 000000000..70529e146
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA1.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacSHA1;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA1 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacSHA1();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA1__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h
new file mode 100644
index 000000000..002272c84
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA256.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacSHA256;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA256 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacSHA256();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA256__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h
new file mode 100644
index 000000000..6df181d1c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA384.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacSHA384;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA384 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacSHA384();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA384__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h
new file mode 100644
index 000000000..e035c279f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacSHA512.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacSHA512;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacSHA512 : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacSHA512();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacSHA512__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h
new file mode 100644
index 000000000..bb08d2a96
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacTiger.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacTiger;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacTiger : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacTiger();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacTiger__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h
new file mode 100644
index 000000000..4ad9b2e64
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory$HMacWhirlpool.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory$HMacWhirlpool;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory$HMacWhirlpool : public ::gnu::javax::crypto::jce::PBKDF2SecretKeyFactory
+{
+
+public:
+  PBKDF2SecretKeyFactory$HMacWhirlpool();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory$HMacWhirlpool__
diff --git a/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h
new file mode 100644
index 000000000..97ef99b6b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/PBKDF2SecretKeyFactory.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
+#define __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
+
+#pragma interface
+
+#include <javax/crypto/SecretKeyFactorySpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+            class PBKDF2SecretKeyFactory;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::PBKDF2SecretKeyFactory : public ::javax::crypto::SecretKeyFactorySpi
+{
+
+public: // actually protected
+  PBKDF2SecretKeyFactory(::java::lang::String *);
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
+  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::javax::crypto::SecretKeyFactorySpi)))) macName;
+private:
+  static const jint DEFAULT_ITERATION_COUNT = 1000;
+  static const jint DEFAULT_KEY_LEN = 32;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_PBKDF2SecretKeyFactory__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h
new file mode 100644
index 000000000..524f2f9b4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AES128KeyWrapSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
+#define __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AES128KeyWrapSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AES128KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
+{
+
+public:
+  AES128KeyWrapSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AES128KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h
new file mode 100644
index 000000000..b19897b29
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AES192KeyWrapSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
+#define __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AES192KeyWrapSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AES192KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
+{
+
+public:
+  AES192KeyWrapSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AES192KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h
new file mode 100644
index 000000000..f87700587
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AES256KeyWrapSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
+#define __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AES256KeyWrapSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AES256KeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::AESKeyWrapSpi
+{
+
+public:
+  AES256KeyWrapSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AES256KeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h
new file mode 100644
index 000000000..d20e50642
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AESKeyWrapSpi.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
+#define __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AESKeyWrapSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AESKeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter
+{
+
+public: // actually protected
+  AESKeyWrapSpi(::java::lang::String *, jint, ::java::lang::String *);
+  virtual jint getOutputSizeForWrap(jint);
+  virtual jint getOutputSizeForUnwrap(jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AESKeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h
new file mode 100644
index 000000000..dd73ecca8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AESSpi.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AESSpi__
+#define __gnu_javax_crypto_jce_cipher_AESSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AESSpi;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  AESSpi();
+public: // actually protected
+  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 *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h b/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h
new file mode 100644
index 000000000..677f8e9b5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/ARCFourSpi.h
@@ -0,0 +1,80 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_ARCFourSpi__
+#define __gnu_javax_crypto_jce_cipher_ARCFourSpi__
+
+#pragma interface
+
+#include <javax/crypto/CipherSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class ARCFourSpi;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::ARCFourSpi : public ::javax::crypto::CipherSpi
+{
+
+public:
+  ARCFourSpi();
+public: // actually protected
+  virtual jint engineGetBlockSize();
+  virtual void engineSetMode(::java::lang::String *);
+  virtual void engineSetPadding(::java::lang::String *);
+  virtual JArray< jbyte > * engineGetIV();
+  virtual jint engineGetOutputSize(jint);
+  virtual ::java::security::AlgorithmParameters * engineGetParameters();
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
+  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
+  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+private:
+  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) keystream;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_ARCFourSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h b/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h
new file mode 100644
index 000000000..c7de48028
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/AnubisSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_AnubisSpi__
+#define __gnu_javax_crypto_jce_cipher_AnubisSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class AnubisSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::AnubisSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  AnubisSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_AnubisSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h b/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h
new file mode 100644
index 000000000..aed783b58
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/BlowfishSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_BlowfishSpi__
+#define __gnu_javax_crypto_jce_cipher_BlowfishSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class BlowfishSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::BlowfishSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  BlowfishSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_BlowfishSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h b/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h
new file mode 100644
index 000000000..dbba171aa
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/Cast5Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_Cast5Spi__
+#define __gnu_javax_crypto_jce_cipher_Cast5Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class Cast5Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::Cast5Spi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  Cast5Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_Cast5Spi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h b/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h
new file mode 100644
index 000000000..751abfe01
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/CipherAdapter.h
@@ -0,0 +1,94 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_CipherAdapter__
+#define __gnu_javax_crypto_jce_cipher_CipherAdapter__
+
+#pragma interface
+
+#include <javax/crypto/CipherSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace jce
+        {
+          namespace cipher
+          {
+              class CipherAdapter;
+          }
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+        namespace pad
+        {
+            class IPad;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::CipherAdapter : public ::javax::crypto::CipherSpi
+{
+
+public: // actually protected
+  CipherAdapter(::java::lang::String *, jint);
+  CipherAdapter(::java::lang::String *);
+  virtual void engineSetMode(::java::lang::String *);
+  virtual void engineSetPadding(::java::lang::String *);
+  virtual jint engineGetBlockSize();
+  virtual jint engineGetOutputSize(jint);
+  virtual JArray< jbyte > * engineGetIV();
+  virtual ::java::security::AlgorithmParameters * engineGetParameters();
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+private:
+  void engineInitHandler(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+public: // actually protected
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
+  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
+  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+private:
+  void reset();
+public: // actually protected
+  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) cipher;
+  ::gnu::javax::crypto::mode::IMode * mode;
+  ::gnu::javax::crypto::pad::IPad * pad;
+  jint keyLen;
+  ::java::util::Map * attributes;
+  JArray< jbyte > * partBlock;
+  jint partLen;
+  jint blockLen;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_CipherAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h
new file mode 100644
index 000000000..59a2c919c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/DESSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_DESSpi__
+#define __gnu_javax_crypto_jce_cipher_DESSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class DESSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::DESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  DESSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_DESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h b/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h
new file mode 100644
index 000000000..43a5a6e35
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
+#define __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
+
+#pragma interface
+
+#include <javax/crypto/CipherSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class KeyWrappingAlgorithmAdapter;
+          }
+        }
+        namespace kwa
+        {
+            class IKeyWrappingAlgorithm;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter : public ::javax::crypto::CipherSpi
+{
+
+public: // actually protected
+  KeyWrappingAlgorithmAdapter(::java::lang::String *, jint, jint, ::java::lang::String *);
+  virtual JArray< jbyte > * engineWrap(::java::security::Key *);
+  virtual ::java::security::Key * engineUnwrap(JArray< jbyte > *, ::java::lang::String *, jint);
+  virtual jint engineGetBlockSize();
+  virtual JArray< jbyte > * engineGetIV();
+  virtual jint engineGetOutputSize(jint);
+  virtual ::java::security::AlgorithmParameters * engineGetParameters();
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineSetMode(::java::lang::String *);
+  virtual void engineSetPadding(::java::lang::String *);
+  virtual JArray< jbyte > * engineUpdate(JArray< jbyte > *, jint, jint);
+  virtual jint engineUpdate(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * engineDoFinal(JArray< jbyte > *, jint, jint);
+  virtual jint engineDoFinal(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual jint getOutputSizeForWrap(jint);
+  virtual jint getOutputSizeForUnwrap(jint);
+private:
+  void checkOpMode(jint);
+  JArray< jbyte > * checkAndGetKekBytes(::java::security::Key *);
+  void initAlgorithm(jint, JArray< jbyte > *, JArray< jbyte > *, ::java::security::SecureRandom *);
+  static ::java::util::logging::Logger * log;
+  static ::java::lang::String * NO_PADDING;
+public: // actually protected
+  ::gnu::javax::crypto::kwa::IKeyWrappingAlgorithm * __attribute__((aligned(__alignof__( ::javax::crypto::CipherSpi)))) kwAlgorithm;
+  jint kwaBlockSize;
+  jint kwaKeySize;
+  ::java::lang::String * supportedMode;
+  jint opmode;
+public: // actually package-private
+  JArray< jbyte > * iv;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_KeyWrappingAlgorithmAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h b/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h
new file mode 100644
index 000000000..76ace5867
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/KhazadSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_KhazadSpi__
+#define __gnu_javax_crypto_jce_cipher_KhazadSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class KhazadSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::KhazadSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  KhazadSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_KhazadSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h b/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h
new file mode 100644
index 000000000..62c4749c5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/NullCipherSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_NullCipherSpi__
+#define __gnu_javax_crypto_jce_cipher_NullCipherSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class NullCipherSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::NullCipherSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  NullCipherSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_NullCipherSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h
new file mode 100644
index 000000000..eb6bb4cd1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h
new file mode 100644
index 000000000..c90eb3899
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h
new file mode 100644
index 000000000..c370b08db
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h
new file mode 100644
index 000000000..6252b4b34
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h
new file mode 100644
index 000000000..57eab6c4d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h
new file mode 100644
index 000000000..cbec01198
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h
new file mode 100644
index 000000000..242887a8f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h
new file mode 100644
index 000000000..e81b65b1f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h
new file mode 100644
index 000000000..1c4787f29
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h
new file mode 100644
index 000000000..42cd2c2b4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacHaval
+{
+
+public:
+  PBES2$HMacHaval$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h
new file mode 100644
index 000000000..964738806
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacHaval.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacHaval;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacHaval : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacHaval(::java::lang::String *, jint);
+  PBES2$HMacHaval(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacHaval__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h
new file mode 100644
index 000000000..d8dc29470
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h
new file mode 100644
index 000000000..777337be1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h
new file mode 100644
index 000000000..a4874de7a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h
new file mode 100644
index 000000000..e89caead4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h
new file mode 100644
index 000000000..8d1788e8a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h
new file mode 100644
index 000000000..1385a24b1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h
new file mode 100644
index 000000000..b56ce910b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h
new file mode 100644
index 000000000..18b4f2646
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h
new file mode 100644
index 000000000..925414bf6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h
new file mode 100644
index 000000000..1299150f9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD2
+{
+
+public:
+  PBES2$HMacMD2$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h
new file mode 100644
index 000000000..50db50fa6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD2.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD2;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD2 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacMD2(::java::lang::String *, jint);
+  PBES2$HMacMD2(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD2__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h
new file mode 100644
index 000000000..205e01ee0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h
new file mode 100644
index 000000000..8d0385048
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h
new file mode 100644
index 000000000..a5a2b2308
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h
new file mode 100644
index 000000000..8727bc746
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h
new file mode 100644
index 000000000..10e3c7eea
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h
new file mode 100644
index 000000000..8bf669338
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h
new file mode 100644
index 000000000..5c921229c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h
new file mode 100644
index 000000000..a14ef595e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h
new file mode 100644
index 000000000..851eedfda
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h
new file mode 100644
index 000000000..fe69d0d89
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD4
+{
+
+public:
+  PBES2$HMacMD4$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h
new file mode 100644
index 000000000..95d6018ae
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD4.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD4;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD4 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacMD4(::java::lang::String *, jint);
+  PBES2$HMacMD4(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD4__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h
new file mode 100644
index 000000000..0e51830bc
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h
new file mode 100644
index 000000000..758d607d2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h
new file mode 100644
index 000000000..66546b8ed
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h
new file mode 100644
index 000000000..cc38df76f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h
new file mode 100644
index 000000000..14d6581df
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h
new file mode 100644
index 000000000..1e3ee6cde
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h
new file mode 100644
index 000000000..2678cb2ca
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h
new file mode 100644
index 000000000..212cfac15
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h
new file mode 100644
index 000000000..9e7feddd1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h
new file mode 100644
index 000000000..59933417c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacMD5
+{
+
+public:
+  PBES2$HMacMD5$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h
new file mode 100644
index 000000000..27467b8ac
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacMD5.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacMD5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacMD5 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacMD5(::java::lang::String *, jint);
+  PBES2$HMacMD5(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacMD5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h
new file mode 100644
index 000000000..4accfd63e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h
new file mode 100644
index 000000000..dd5773e93
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h
new file mode 100644
index 000000000..ea8859b06
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h
new file mode 100644
index 000000000..8874aa0f1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h
new file mode 100644
index 000000000..db5b01bb8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h
new file mode 100644
index 000000000..128eb9cf3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h
new file mode 100644
index 000000000..266eb25ef
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h
new file mode 100644
index 000000000..7bcacce88
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h
new file mode 100644
index 000000000..172cb92e2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h
new file mode 100644
index 000000000..77ca273c5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128
+{
+
+public:
+  PBES2$HMacRipeMD128$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h
new file mode 100644
index 000000000..db5652b58
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD128.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD128;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD128 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacRipeMD128(::java::lang::String *, jint);
+  PBES2$HMacRipeMD128(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD128__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h
new file mode 100644
index 000000000..a5c78d334
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h
new file mode 100644
index 000000000..d5fb9ee5c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h
new file mode 100644
index 000000000..72d603113
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h
new file mode 100644
index 000000000..9c0119bea
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h
new file mode 100644
index 000000000..37045f289
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h
new file mode 100644
index 000000000..e0a3b3f13
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h
new file mode 100644
index 000000000..e3fa08619
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h
new file mode 100644
index 000000000..6d820e5e4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h
new file mode 100644
index 000000000..40518b147
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h
new file mode 100644
index 000000000..f2beac4eb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160
+{
+
+public:
+  PBES2$HMacRipeMD160$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h
new file mode 100644
index 000000000..416db1df6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacRipeMD160.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacRipeMD160;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacRipeMD160 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacRipeMD160(::java::lang::String *, jint);
+  PBES2$HMacRipeMD160(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacRipeMD160__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h
new file mode 100644
index 000000000..35f84425c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h
new file mode 100644
index 000000000..52cbbeb0f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h
new file mode 100644
index 000000000..9352b8d52
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h
new file mode 100644
index 000000000..c84c600b0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h
new file mode 100644
index 000000000..2eb4abf1f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h
new file mode 100644
index 000000000..9b7478640
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h
new file mode 100644
index 000000000..c8af0ca28
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h
new file mode 100644
index 000000000..a3f55daa1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h
new file mode 100644
index 000000000..3f629b205
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h
new file mode 100644
index 000000000..3bda01a27
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1
+{
+
+public:
+  PBES2$HMacSHA1$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h
new file mode 100644
index 000000000..06e4c964f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA1.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA1;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA1 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacSHA1(::java::lang::String *, jint);
+  PBES2$HMacSHA1(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA1__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h
new file mode 100644
index 000000000..523bb3a63
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h
new file mode 100644
index 000000000..28fa73d7a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h
new file mode 100644
index 000000000..ab4b62b59
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h
new file mode 100644
index 000000000..a8edc0c73
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h
new file mode 100644
index 000000000..4812a26ff
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h
new file mode 100644
index 000000000..04221e0ee
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h
new file mode 100644
index 000000000..69f68c5c8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h
new file mode 100644
index 000000000..30a4207a9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h
new file mode 100644
index 000000000..e05e6bc1b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h
new file mode 100644
index 000000000..9e8b2c632
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256
+{
+
+public:
+  PBES2$HMacSHA256$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h
new file mode 100644
index 000000000..7771d0b64
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA256.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA256;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA256 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacSHA256(::java::lang::String *, jint);
+  PBES2$HMacSHA256(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA256__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h
new file mode 100644
index 000000000..8b32b776f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h
new file mode 100644
index 000000000..6818d600d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h
new file mode 100644
index 000000000..80cf46574
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h
new file mode 100644
index 000000000..6d8e4797c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h
new file mode 100644
index 000000000..c0a597ea6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h
new file mode 100644
index 000000000..3444db066
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h
new file mode 100644
index 000000000..3bb0a1c43
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h
new file mode 100644
index 000000000..2b8b4c310
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h
new file mode 100644
index 000000000..a5388f0b1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h
new file mode 100644
index 000000000..5b849efba
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384
+{
+
+public:
+  PBES2$HMacSHA384$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h
new file mode 100644
index 000000000..1bdf6807d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA384.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA384;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA384 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacSHA384(::java::lang::String *, jint);
+  PBES2$HMacSHA384(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA384__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h
new file mode 100644
index 000000000..f338e2d9a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h
new file mode 100644
index 000000000..1ff4f701a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h
new file mode 100644
index 000000000..fada5cb87
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h
new file mode 100644
index 000000000..9ecaadfb9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h
new file mode 100644
index 000000000..466ccf0dd
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h
new file mode 100644
index 000000000..f342c6938
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h
new file mode 100644
index 000000000..1c393d07e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h
new file mode 100644
index 000000000..f2f5601a6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h
new file mode 100644
index 000000000..14b4b15cb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h
new file mode 100644
index 000000000..d492efc20
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512
+{
+
+public:
+  PBES2$HMacSHA512$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h
new file mode 100644
index 000000000..f1db51acd
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacSHA512.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacSHA512;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacSHA512 : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacSHA512(::java::lang::String *, jint);
+  PBES2$HMacSHA512(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacSHA512__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h
new file mode 100644
index 000000000..baa9f27c1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h
new file mode 100644
index 000000000..bce1ed801
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h
new file mode 100644
index 000000000..6e0bfe238
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h
new file mode 100644
index 000000000..d171bdf1d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h
new file mode 100644
index 000000000..a6ff79970
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h
new file mode 100644
index 000000000..15162434d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h
new file mode 100644
index 000000000..e7e49e517
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h
new file mode 100644
index 000000000..052f90242
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h
new file mode 100644
index 000000000..3477866e2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h
new file mode 100644
index 000000000..b9a62a8a2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacTiger
+{
+
+public:
+  PBES2$HMacTiger$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h
new file mode 100644
index 000000000..2b1ca5941
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacTiger.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacTiger;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacTiger : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacTiger(::java::lang::String *, jint);
+  PBES2$HMacTiger(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacTiger__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h
new file mode 100644
index 000000000..c2f5d6b42
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$AES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$AES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$AES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$AES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$AES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h
new file mode 100644
index 000000000..c8fd00f1e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Anubis.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Anubis : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Anubis();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h
new file mode 100644
index 000000000..03f922f23
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Blowfish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Blowfish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Blowfish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h
new file mode 100644
index 000000000..f9037b258
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Cast5.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Cast5 : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Cast5();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h
new file mode 100644
index 000000000..788ad9dab
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$DES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$DES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$DES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$DES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h
new file mode 100644
index 000000000..7738c8864
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Khazad.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Khazad : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Khazad();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h
new file mode 100644
index 000000000..2d53d0b7c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Serpent.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Serpent : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Serpent();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h
new file mode 100644
index 000000000..ca4bb7f07
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Square.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Square : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Square();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Square__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h
new file mode 100644
index 000000000..9a58b29f2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$TripleDES.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$TripleDES : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$TripleDES();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h
new file mode 100644
index 000000000..8cb59ebaf
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool$Twofish.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool$Twofish : public ::gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool
+{
+
+public:
+  PBES2$HMacWhirlpool$Twofish();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h
new file mode 100644
index 000000000..d420db0ea
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2$HMacWhirlpool.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
+#define __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/PBES2.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2$HMacWhirlpool;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2$HMacWhirlpool : public ::gnu::javax::crypto::jce::cipher::PBES2
+{
+
+public:
+  PBES2$HMacWhirlpool(::java::lang::String *, jint);
+  PBES2$HMacWhirlpool(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2$HMacWhirlpool__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/PBES2.h b/libjava/gnu/javax/crypto/jce/cipher/PBES2.h
new file mode 100644
index 000000000..15042c228
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/PBES2.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_PBES2__
+#define __gnu_javax_crypto_jce_cipher_PBES2__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class PBES2;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Key;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class PBEKey;
+      }
+      namespace spec
+      {
+          class SecretKeySpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::PBES2 : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public: // actually protected
+  PBES2(::java::lang::String *, jint, ::java::lang::String *);
+  PBES2(::java::lang::String *, ::java::lang::String *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::Key *, ::java::security::AlgorithmParameters *, ::java::security::SecureRandom *);
+private:
+  ::javax::crypto::spec::SecretKeySpec * genkey(::javax::crypto::interfaces::PBEKey *);
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::cipher::CipherAdapter)))) macName;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_PBES2__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h b/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h
new file mode 100644
index 000000000..6d13b2b78
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/RijndaelSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_RijndaelSpi__
+#define __gnu_javax_crypto_jce_cipher_RijndaelSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class RijndaelSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::RijndaelSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  RijndaelSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_RijndaelSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h b/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h
new file mode 100644
index 000000000..a7934c59e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/SerpentSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_SerpentSpi__
+#define __gnu_javax_crypto_jce_cipher_SerpentSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class SerpentSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::SerpentSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  SerpentSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_SerpentSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h b/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h
new file mode 100644
index 000000000..9fb25ca9c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/SquareSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_SquareSpi__
+#define __gnu_javax_crypto_jce_cipher_SquareSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class SquareSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::SquareSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  SquareSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_SquareSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h
new file mode 100644
index 000000000..7fcb2fdfd
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/TripleDESKeyWrapSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
+#define __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/KeyWrappingAlgorithmAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class TripleDESKeyWrapSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::TripleDESKeyWrapSpi : public ::gnu::javax::crypto::jce::cipher::KeyWrappingAlgorithmAdapter
+{
+
+public:
+  TripleDESKeyWrapSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_TripleDESKeyWrapSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h
new file mode 100644
index 000000000..fc5eb2989
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/TripleDESSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_TripleDESSpi__
+#define __gnu_javax_crypto_jce_cipher_TripleDESSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class TripleDESSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::TripleDESSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  TripleDESSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_TripleDESSpi__
diff --git a/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h b/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h
new file mode 100644
index 000000000..ff0caf6a6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/cipher/TwofishSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_cipher_TwofishSpi__
+#define __gnu_javax_crypto_jce_cipher_TwofishSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/cipher/CipherAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace cipher
+          {
+              class TwofishSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::cipher::TwofishSpi : public ::gnu::javax::crypto::jce::cipher::CipherAdapter
+{
+
+public:
+  TwofishSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_cipher_TwofishSpi__
diff --git a/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h
new file mode 100644
index 000000000..d961e5f02
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/AnubisKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class AnubisKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::AnubisKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  AnubisKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_AnubisKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..98d4e3f20
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/AnubisSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class AnubisSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::AnubisSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  AnubisSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_AnubisSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h
new file mode 100644
index 000000000..28a40ee4a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/BlowfishKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class BlowfishKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::BlowfishKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  BlowfishKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_BlowfishKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..d88dcde83
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/BlowfishSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class BlowfishSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::BlowfishSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  BlowfishSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_BlowfishSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h
new file mode 100644
index 000000000..6dab8fe7d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/Cast5KeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class Cast5KeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::Cast5KeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  Cast5KeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_Cast5KeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h
new file mode 100644
index 000000000..8f5b7b844
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/Cast5SecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class Cast5SecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::Cast5SecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  Cast5SecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_Cast5SecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h
new file mode 100644
index 000000000..59f82ea35
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/DESKeyGeneratorImpl.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class DESKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::DESKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  DESKeyGeneratorImpl();
+public: // actually protected
+  virtual ::javax::crypto::SecretKey * engineGenerateKey();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_DESKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..1886826e4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/DESSecretKeyFactoryImpl.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class DESSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::DESSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  DESSecretKeyFactoryImpl();
+public: // actually protected
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_DESSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..2521a3fc8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/DESedeSecretKeyFactoryImpl.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class DESedeSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::DESedeSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  DESedeSecretKeyFactoryImpl();
+public: // actually protected
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_DESedeSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h
new file mode 100644
index 000000000..732e311b6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/KhazadKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class KhazadKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::KhazadKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  KhazadKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_KhazadKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..258fae3ff
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/KhazadSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class KhazadSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::KhazadSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  KhazadSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_KhazadSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h
new file mode 100644
index 000000000..698a08dea
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/RijndaelKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class RijndaelKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::RijndaelKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  RijndaelKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_RijndaelKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..f97734e77
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/RijndaelSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class RijndaelSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::RijndaelSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  RijndaelSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_RijndaelSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h
new file mode 100644
index 000000000..87b5e58d7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <javax/crypto/SecretKeyFactorySpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SecretKeyFactoryImpl : public ::javax::crypto::SecretKeyFactorySpi
+{
+
+public: // actually protected
+  SecretKeyFactoryImpl();
+  virtual ::javax::crypto::SecretKey * engineGenerateSecret(::java::security::spec::KeySpec *);
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::javax::crypto::SecretKey *, ::java::lang::Class *);
+  virtual ::javax::crypto::SecretKey * engineTranslateKey(::javax::crypto::SecretKey *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h
new file mode 100644
index 000000000..9658a14e8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
+
+#pragma interface
+
+#include <javax/crypto/KeyGeneratorSpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SecretKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+        class SecretKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl : public ::javax::crypto::KeyGeneratorSpi
+{
+
+public: // actually protected
+  SecretKeyGeneratorImpl(::java::lang::String *);
+  virtual ::javax::crypto::SecretKey * engineGenerateKey();
+  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual void engineInit(jint, ::java::security::SecureRandom *);
+  virtual void engineInit(::java::security::SecureRandom *);
+  jint __attribute__((aligned(__alignof__( ::javax::crypto::KeyGeneratorSpi)))) defaultKeySize;
+  ::java::util::List * keySizes;
+  ::java::lang::String * algorithm;
+  jboolean init;
+  jint currentKeySize;
+  ::java::security::SecureRandom * random;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SecretKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h
new file mode 100644
index 000000000..e74ccf64d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SerpentKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SerpentKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SerpentKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  SerpentKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SerpentKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..1d63cfafa
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SerpentSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SerpentSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SerpentSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  SerpentSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SerpentSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h
new file mode 100644
index 000000000..a3a34ea37
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SquareKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SquareKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SquareKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  SquareKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SquareKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..36ea77169
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/SquareSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class SquareSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::SquareSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  SquareSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_SquareSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h
new file mode 100644
index 000000000..535df8337
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/TripleDESKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class TripleDESKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::TripleDESKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  TripleDESKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_TripleDESKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h b/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h
new file mode 100644
index 000000000..aa31ef433
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/TwofishKeyGeneratorImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
+#define __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyGeneratorImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class TwofishKeyGeneratorImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::TwofishKeyGeneratorImpl : public ::gnu::javax::crypto::jce::key::SecretKeyGeneratorImpl
+{
+
+public:
+  TwofishKeyGeneratorImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_TwofishKeyGeneratorImpl__
diff --git a/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h b/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h
new file mode 100644
index 000000000..13fad905a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/key/TwofishSecretKeyFactoryImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
+#define __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/key/SecretKeyFactoryImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace key
+          {
+              class TwofishSecretKeyFactoryImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::key::TwofishSecretKeyFactoryImpl : public ::gnu::javax::crypto::jce::key::SecretKeyFactoryImpl
+{
+
+public:
+  TwofishSecretKeyFactoryImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_key_TwofishSecretKeyFactoryImpl__
diff --git a/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h b/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h
new file mode 100644
index 000000000..4f9b6f90e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/keyring/GnuKeyring.h
@@ -0,0 +1,85 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_keyring_GnuKeyring__
+#define __gnu_javax_crypto_jce_keyring_GnuKeyring__
+
+#pragma interface
+
+#include <java/security/KeyStoreSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace keyring
+          {
+              class GnuKeyring;
+          }
+        }
+        namespace keyring
+        {
+            class IKeyring;
+            class IPrivateKeyring;
+            class IPublicKeyring;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+      namespace cert
+      {
+          class Certificate;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::keyring::GnuKeyring : public ::java::security::KeyStoreSpi
+{
+
+public:
+  GnuKeyring();
+  virtual ::java::util::Enumeration * engineAliases();
+  virtual jboolean engineContainsAlias(::java::lang::String *);
+  virtual void engineDeleteEntry(::java::lang::String *);
+  virtual ::java::security::cert::Certificate * engineGetCertificate(::java::lang::String *);
+  virtual ::java::lang::String * engineGetCertificateAlias(::java::security::cert::Certificate *);
+  virtual void engineSetCertificateEntry(::java::lang::String *, ::java::security::cert::Certificate *);
+  virtual JArray< ::java::security::cert::Certificate * > * engineGetCertificateChain(::java::lang::String *);
+  virtual ::java::util::Date * engineGetCreationDate(::java::lang::String *);
+  virtual ::java::security::Key * engineGetKey(::java::lang::String *, JArray< jchar > *);
+  virtual void engineSetKeyEntry(::java::lang::String *, ::java::security::Key *, JArray< jchar > *, JArray< ::java::security::cert::Certificate * > *);
+  virtual void engineSetKeyEntry(::java::lang::String *, JArray< jbyte > *, JArray< ::java::security::cert::Certificate * > *);
+  virtual jboolean engineIsCertificateEntry(::java::lang::String *);
+  virtual jboolean engineIsKeyEntry(::java::lang::String *);
+  virtual void engineLoad(::java::io::InputStream *, JArray< jchar > *);
+  virtual void engineStore(::java::io::OutputStream *, JArray< jchar > *);
+  virtual jint engineSize();
+private:
+  void ensureLoaded();
+  void loadPrivateKeyring(::java::io::InputStream *, JArray< jchar > *);
+  void loadPublicKeyring(::java::io::InputStream *, JArray< jchar > *);
+  ::java::util::Date * getCreationDate(::java::lang::String *, ::gnu::javax::crypto::keyring::IKeyring *);
+  void createNewKeyrings();
+  static ::java::util::logging::Logger * log;
+  static ::java::lang::String * NOT_LOADED;
+  jboolean __attribute__((aligned(__alignof__( ::java::security::KeyStoreSpi)))) loaded;
+  ::gnu::javax::crypto::keyring::IPrivateKeyring * privateKR;
+  ::gnu::javax::crypto::keyring::IPublicKeyring * publicKR;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_keyring_GnuKeyring__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h
new file mode 100644
index 000000000..4f5af339b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacHavalSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacHavalSpi__
+#define __gnu_javax_crypto_jce_mac_HMacHavalSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacHavalSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacHavalSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacHavalSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacHavalSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h
new file mode 100644
index 000000000..c584ddb55
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacMD2Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacMD2Spi__
+#define __gnu_javax_crypto_jce_mac_HMacMD2Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacMD2Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacMD2Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacMD2Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacMD2Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h
new file mode 100644
index 000000000..7cf2e14dc
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacMD4Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacMD4Spi__
+#define __gnu_javax_crypto_jce_mac_HMacMD4Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacMD4Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacMD4Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacMD4Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacMD4Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h
new file mode 100644
index 000000000..dd54fe257
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacMD5Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacMD5Spi__
+#define __gnu_javax_crypto_jce_mac_HMacMD5Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacMD5Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacMD5Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacMD5Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacMD5Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h
new file mode 100644
index 000000000..195cf9667
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD128Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
+#define __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacRipeMD128Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacRipeMD128Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacRipeMD128Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacRipeMD128Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h
new file mode 100644
index 000000000..43dc02640
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacRipeMD160Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
+#define __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacRipeMD160Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacRipeMD160Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacRipeMD160Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacRipeMD160Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h
new file mode 100644
index 000000000..83682077b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacSHA160Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
+#define __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacSHA160Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacSHA160Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacSHA160Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacSHA160Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h
new file mode 100644
index 000000000..5ec8ab05e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacSHA256Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
+#define __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacSHA256Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacSHA256Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacSHA256Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacSHA256Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h
new file mode 100644
index 000000000..2f6dbd9a8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacSHA384Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
+#define __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacSHA384Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacSHA384Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacSHA384Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacSHA384Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h b/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h
new file mode 100644
index 000000000..af69a4ebb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacSHA512Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
+#define __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacSHA512Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacSHA512Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacSHA512Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacSHA512Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h
new file mode 100644
index 000000000..c085185b8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacTigerSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacTigerSpi__
+#define __gnu_javax_crypto_jce_mac_HMacTigerSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacTigerSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacTigerSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacTigerSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacTigerSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h b/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h
new file mode 100644
index 000000000..102ce5173
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/HMacWhirlpoolSpi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
+#define __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class HMacWhirlpoolSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::HMacWhirlpoolSpi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  HMacWhirlpoolSpi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_HMacWhirlpoolSpi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h b/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h
new file mode 100644
index 000000000..1d4cadde7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/MacAdapter.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_MacAdapter__
+#define __gnu_javax_crypto_jce_mac_MacAdapter__
+
+#pragma interface
+
+#include <javax/crypto/MacSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class MacAdapter;
+          }
+        }
+        namespace mac
+        {
+            class IMac;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::MacAdapter : public ::javax::crypto::MacSpi
+{
+
+public: // actually protected
+  MacAdapter(::java::lang::String *);
+private:
+  MacAdapter(::gnu::javax::crypto::mac::IMac *, ::java::util::Map *);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually protected
+  virtual JArray< jbyte > * engineDoFinal();
+  virtual jint engineGetMacLength();
+  virtual void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+  virtual void engineReset();
+  virtual void engineUpdate(jbyte);
+  virtual void engineUpdate(JArray< jbyte > *, jint, jint);
+  ::gnu::javax::crypto::mac::IMac * __attribute__((aligned(__alignof__( ::javax::crypto::MacSpi)))) mac;
+  ::java::util::Map * attributes;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_MacAdapter__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h
new file mode 100644
index 000000000..958181598
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacAnubisImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
+#define __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacAnubisImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacAnubisImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacAnubisImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacAnubisImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h
new file mode 100644
index 000000000..76e69d2ce
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacBlowfishImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
+#define __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacBlowfishImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacBlowfishImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacBlowfishImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacBlowfishImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h b/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h
new file mode 100644
index 000000000..9308b254e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacCast5Impl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacCast5Impl__
+#define __gnu_javax_crypto_jce_mac_OMacCast5Impl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacCast5Impl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacCast5Impl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacCast5Impl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacCast5Impl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h
new file mode 100644
index 000000000..614e64503
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacDESImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacDESImpl__
+#define __gnu_javax_crypto_jce_mac_OMacDESImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacDESImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacDESImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacDESImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacDESImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h
new file mode 100644
index 000000000..6eacd2dae
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Anubis.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Anubis;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Anubis : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Anubis(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Anubis__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h
new file mode 100644
index 000000000..597aefae4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Blowfish.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Blowfish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Blowfish : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Blowfish(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Blowfish__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h
new file mode 100644
index 000000000..65b6f9d79
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Cast5.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Cast5;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Cast5 : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Cast5(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Cast5__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h
new file mode 100644
index 000000000..e5945e4cc
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$DES.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$DES__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$DES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$DES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$DES : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$DES(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$DES__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h
new file mode 100644
index 000000000..e15074a3a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Khazad.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Khazad;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Khazad : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Khazad(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Khazad__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h
new file mode 100644
index 000000000..e337ef96b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Rijndael.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Rijndael;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Rijndael : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Rijndael(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Rijndael__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h
new file mode 100644
index 000000000..8e5b0640c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Serpent.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Serpent;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Serpent : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Serpent(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Serpent__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h
new file mode 100644
index 000000000..0f90c75b3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Square.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Square__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Square__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Square;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Square : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Square(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Square__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h
new file mode 100644
index 000000000..0b7d3d9e2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$TripleDES.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$TripleDES;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$TripleDES : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$TripleDES(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$TripleDES__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h
new file mode 100644
index 000000000..c398f3de4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl$Twofish.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
+#define __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/OMacImpl.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+              class OMacImpl$Twofish;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl$Twofish : public ::gnu::javax::crypto::jce::mac::OMacImpl
+{
+
+public:
+  OMacImpl$Twofish(::gnu::javax::crypto::jce::mac::OMacImpl *);
+public: // actually package-private
+  ::gnu::javax::crypto::jce::mac::OMacImpl * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::jce::mac::OMacImpl)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl$Twofish__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h
new file mode 100644
index 000000000..fce8e1ad0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacImpl.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacImpl__
+#define __gnu_javax_crypto_jce_mac_OMacImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public: // actually protected
+  OMacImpl(::java::lang::String *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h
new file mode 100644
index 000000000..817790646
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacKhazadImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
+#define __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacKhazadImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacKhazadImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacKhazadImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacKhazadImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h
new file mode 100644
index 000000000..d785945f7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacRijndaelImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
+#define __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacRijndaelImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacRijndaelImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacRijndaelImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacRijndaelImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h
new file mode 100644
index 000000000..d5a2f4cfd
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacSerpentImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
+#define __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacSerpentImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacSerpentImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacSerpentImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacSerpentImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h
new file mode 100644
index 000000000..b7952b33e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacSquareImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacSquareImpl__
+#define __gnu_javax_crypto_jce_mac_OMacSquareImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacSquareImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacSquareImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacSquareImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacSquareImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h
new file mode 100644
index 000000000..1c907e1d0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacTripleDESImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
+#define __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacTripleDESImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacTripleDESImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacTripleDESImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacTripleDESImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h b/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h
new file mode 100644
index 000000000..24189f079
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/OMacTwofishImpl.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
+#define __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class OMacTwofishImpl;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::OMacTwofishImpl : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  OMacTwofishImpl();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_OMacTwofishImpl__
diff --git a/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h b/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h
new file mode 100644
index 000000000..e70700874
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/TMMH16Spi.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_TMMH16Spi__
+#define __gnu_javax_crypto_jce_mac_TMMH16Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class TMMH16Spi;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::TMMH16Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  TMMH16Spi();
+public: // actually protected
+  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_TMMH16Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h b/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h
new file mode 100644
index 000000000..67449d495
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/UHash32Spi.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_UHash32Spi__
+#define __gnu_javax_crypto_jce_mac_UHash32Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class UHash32Spi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::UHash32Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  UHash32Spi();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_UHash32Spi__
diff --git a/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h b/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h
new file mode 100644
index 000000000..37daf31f8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/mac/UMac32Spi.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_mac_UMac32Spi__
+#define __gnu_javax_crypto_jce_mac_UMac32Spi__
+
+#pragma interface
+
+#include <gnu/javax/crypto/jce/mac/MacAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace mac
+          {
+              class UMac32Spi;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::mac::UMac32Spi : public ::gnu::javax::crypto::jce::mac::MacAdapter
+{
+
+public:
+  UMac32Spi();
+public: // actually protected
+  void engineInit(::java::security::Key *, ::java::security::spec::AlgorithmParameterSpec *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_mac_UMac32Spi__
diff --git a/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h b/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h
new file mode 100644
index 000000000..8a506c0cb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/params/BlockCipherParameters.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_params_BlockCipherParameters__
+#define __gnu_javax_crypto_jce_params_BlockCipherParameters__
+
+#pragma interface
+
+#include <java/security/AlgorithmParametersSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace params
+          {
+              class BlockCipherParameters;
+          }
+          namespace spec
+          {
+              class BlockCipherParameterSpec;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::params::BlockCipherParameters : public ::java::security::AlgorithmParametersSpi
+{
+
+public:
+  BlockCipherParameters();
+public: // actually protected
+  virtual JArray< jbyte > * engineGetEncoded();
+  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *);
+  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *);
+  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *);
+  virtual void engineInit(JArray< jbyte > *);
+  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *);
+  virtual ::java::lang::String * engineToString();
+private:
+  static ::java::util::logging::Logger * log;
+public: // actually protected
+  ::gnu::javax::crypto::jce::spec::BlockCipherParameterSpec * __attribute__((aligned(__alignof__( ::java::security::AlgorithmParametersSpi)))) cipherSpec;
+private:
+  static ::java::lang::String * DEFAULT_FORMAT;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_params_BlockCipherParameters__
diff --git a/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h b/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h
new file mode 100644
index 000000000..6d47c98e4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/params/DEREncodingException.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_params_DEREncodingException__
+#define __gnu_javax_crypto_jce_params_DEREncodingException__
+
+#pragma interface
+
+#include <java/io/IOException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace params
+          {
+              class DEREncodingException;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::params::DEREncodingException : public ::java::io::IOException
+{
+
+public:
+  DEREncodingException();
+  DEREncodingException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_params_DEREncodingException__
diff --git a/libjava/gnu/javax/crypto/jce/params/DERReader.h b/libjava/gnu/javax/crypto/jce/params/DERReader.h
new file mode 100644
index 000000000..1a85bc483
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/params/DERReader.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_params_DERReader__
+#define __gnu_javax_crypto_jce_params_DERReader__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace params
+          {
+              class DERReader;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::params::DERReader : public ::java::lang::Object
+{
+
+public:
+  DERReader();
+  DERReader(JArray< jbyte > *);
+  virtual void init(::java::lang::String *);
+  virtual void init(JArray< jbyte > *);
+  virtual jboolean hasMorePrimitives();
+  virtual ::java::math::BigInteger * getBigInteger();
+private:
+  JArray< jbyte > * getPrimitive();
+  jint translateLeadIdentifierByte(jbyte);
+  jint getIdentifier(jint);
+public: // actually package-private
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) source;
+  jint pos;
+  static const jint UNIVERSAL = 1;
+  static const jint APPLICATION = 2;
+  static const jint CONTEXT_SPECIFIC = 3;
+  static const jint PRIVATE = 4;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_params_DERReader__
diff --git a/libjava/gnu/javax/crypto/jce/params/DERWriter.h b/libjava/gnu/javax/crypto/jce/params/DERWriter.h
new file mode 100644
index 000000000..742d4934c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/params/DERWriter.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_params_DERWriter__
+#define __gnu_javax_crypto_jce_params_DERWriter__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace params
+          {
+              class DERWriter;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::params::DERWriter : public ::java::lang::Object
+{
+
+public:
+  DERWriter();
+  virtual JArray< jbyte > * writeBigInteger(::java::math::BigInteger *);
+private:
+  JArray< jbyte > * writePrimitive(jint, jint, jint, JArray< jbyte > *);
+public:
+  virtual JArray< jbyte > * joinarrays(JArray< jbyte > *, JArray< jbyte > *);
+  virtual JArray< jbyte > * joinarrays(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+private:
+  JArray< jbyte > * generateIdentifier(jint, jint);
+  jbyte translateLeadIdentifierByte(jint);
+  JArray< jbyte > * generateLength(jint);
+public: // actually package-private
+  static const jint UNIVERSAL = 1;
+  static const jint APPLICATION = 2;
+  static const jint CONTEXT_SPECIFIC = 3;
+  static const jint PRIVATE = 4;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_params_DERWriter__
diff --git a/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h
new file mode 100644
index 000000000..e46dee30b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
+#define __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
+
+#pragma interface
+
+#include <java/security/SecureRandomSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace prng
+          {
+              class ARCFourRandomSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::prng::ARCFourRandomSpi : public ::java::security::SecureRandomSpi
+{
+
+public:
+  ARCFourRandomSpi();
+  virtual JArray< jbyte > * engineGenerateSeed(jint);
+  virtual void engineNextBytes(JArray< jbyte > *);
+  virtual void engineSetSeed(JArray< jbyte > *);
+private:
+  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
+  jboolean virgin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_prng_ARCFourRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h b/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h
new file mode 100644
index 000000000..6abf9be9e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/prng/CSPRNGSpi.h
@@ -0,0 +1,58 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_prng_CSPRNGSpi__
+#define __gnu_javax_crypto_jce_prng_CSPRNGSpi__
+
+#pragma interface
+
+#include <java/security/SecureRandomSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace prng
+          {
+              class CSPRNGSpi;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::prng::CSPRNGSpi : public ::java::security::SecureRandomSpi
+{
+
+public:
+  CSPRNGSpi();
+public: // actually protected
+  virtual JArray< jbyte > * engineGenerateSeed(jint);
+  virtual void engineNextBytes(JArray< jbyte > *);
+  virtual void engineSetSeed(JArray< jbyte > *);
+private:
+  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
+  jboolean virgin;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_prng_CSPRNGSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h b/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h
new file mode 100644
index 000000000..d684e366a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/prng/FortunaImpl.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_prng_FortunaImpl__
+#define __gnu_javax_crypto_jce_prng_FortunaImpl__
+
+#pragma interface
+
+#include <java/security/SecureRandomSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace prng
+          {
+              class FortunaImpl;
+          }
+        }
+        namespace prng
+        {
+            class Fortuna;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::prng::FortunaImpl : public ::java::security::SecureRandomSpi
+{
+
+public:
+  FortunaImpl();
+public: // actually protected
+  void engineSetSeed(JArray< jbyte > *);
+  void engineNextBytes(JArray< jbyte > *);
+  JArray< jbyte > * engineGenerateSeed(jint);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) virgin;
+  ::gnu::javax::crypto::prng::Fortuna * adaptee;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_prng_FortunaImpl__
diff --git a/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h
new file mode 100644
index 000000000..540349362
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/prng/ICMRandomSpi.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_prng_ICMRandomSpi__
+#define __gnu_javax_crypto_jce_prng_ICMRandomSpi__
+
+#pragma interface
+
+#include <java/security/SecureRandomSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace prng
+          {
+              class ICMRandomSpi;
+          }
+        }
+        namespace prng
+        {
+            class ICMGenerator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::prng::ICMRandomSpi : public ::java::security::SecureRandomSpi
+{
+
+public:
+  ICMRandomSpi();
+private:
+  static void resetLocalPRNG();
+public:
+  virtual JArray< jbyte > * engineGenerateSeed(jint);
+  virtual void engineNextBytes(JArray< jbyte > *);
+  virtual void engineSetSeed(JArray< jbyte > *);
+private:
+  static ::java::util::logging::Logger * log;
+  static ::gnu::javax::crypto::prng::ICMGenerator * prng;
+  static ::java::lang::String * MSG;
+  static ::java::lang::String * RETRY;
+  static ::java::lang::String * LIMIT_REACHED_MSG;
+  static ::java::lang::String * RESEED;
+  ::gnu::javax::crypto::prng::ICMGenerator * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_prng_ICMRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h b/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h
new file mode 100644
index 000000000..e27425a0b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/prng/UMacRandomSpi.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_prng_UMacRandomSpi__
+#define __gnu_javax_crypto_jce_prng_UMacRandomSpi__
+
+#pragma interface
+
+#include <java/security/SecureRandomSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace prng
+          {
+              class UMacRandomSpi;
+          }
+        }
+        namespace prng
+        {
+            class UMacGenerator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::prng::UMacRandomSpi : public ::java::security::SecureRandomSpi
+{
+
+public:
+  UMacRandomSpi();
+private:
+  static void resetLocalPRNG();
+public:
+  virtual JArray< jbyte > * engineGenerateSeed(jint);
+  virtual void engineNextBytes(JArray< jbyte > *);
+  virtual void engineSetSeed(JArray< jbyte > *);
+private:
+  static ::java::util::logging::Logger * log;
+  static ::gnu::javax::crypto::prng::UMacGenerator * prng;
+  static ::java::lang::String * MSG;
+  static ::java::lang::String * RETRY;
+  ::gnu::javax::crypto::prng::UMacGenerator * __attribute__((aligned(__alignof__( ::java::security::SecureRandomSpi)))) adaptee;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_prng_UMacRandomSpi__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h b/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h
new file mode 100644
index 000000000..99e937310
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/sig/DHKeyFactory.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_sig_DHKeyFactory__
+#define __gnu_javax_crypto_jce_sig_DHKeyFactory__
+
+#pragma interface
+
+#include <java/security/KeyFactorySpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace sig
+          {
+              class DHKeyFactory;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class Key;
+        class PrivateKey;
+        class PublicKey;
+      namespace spec
+      {
+          class KeySpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::sig::DHKeyFactory : public ::java::security::KeyFactorySpi
+{
+
+public:
+  DHKeyFactory();
+public: // actually protected
+  virtual ::java::security::PublicKey * engineGeneratePublic(::java::security::spec::KeySpec *);
+  virtual ::java::security::PrivateKey * engineGeneratePrivate(::java::security::spec::KeySpec *);
+  virtual ::java::security::spec::KeySpec * engineGetKeySpec(::java::security::Key *, ::java::lang::Class *);
+  virtual ::java::security::Key * engineTranslateKey(::java::security::Key *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_sig_DHKeyFactory__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h b/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h
new file mode 100644
index 000000000..9421af833
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/sig/DHKeyPairGeneratorSpi.h
@@ -0,0 +1,51 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
+#define __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
+
+#pragma interface
+
+#include <gnu/java/security/jce/sig/KeyPairGeneratorAdapter.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace sig
+          {
+              class DHKeyPairGeneratorSpi;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::sig::DHKeyPairGeneratorSpi : public ::gnu::java::security::jce::sig::KeyPairGeneratorAdapter
+{
+
+public:
+  DHKeyPairGeneratorSpi();
+  virtual void initialize(jint, ::java::security::SecureRandom *);
+  virtual void initialize(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_sig_DHKeyPairGeneratorSpi__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHParameters.h b/libjava/gnu/javax/crypto/jce/sig/DHParameters.h
new file mode 100644
index 000000000..43f53fe85
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/sig/DHParameters.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_sig_DHParameters__
+#define __gnu_javax_crypto_jce_sig_DHParameters__
+
+#pragma interface
+
+#include <java/security/AlgorithmParametersSpi.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace sig
+          {
+              class DHParameters;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::sig::DHParameters : public ::java::security::AlgorithmParametersSpi
+{
+
+public:
+  DHParameters();
+public: // actually protected
+  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *);
+  virtual void engineInit(JArray< jbyte > *);
+  virtual void engineInit(JArray< jbyte > *, ::java::lang::String *);
+  virtual ::java::security::spec::AlgorithmParameterSpec * engineGetParameterSpec(::java::lang::Class *);
+  virtual JArray< jbyte > * engineGetEncoded();
+  virtual JArray< jbyte > * engineGetEncoded(::java::lang::String *);
+  virtual ::java::lang::String * engineToString();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::security::AlgorithmParametersSpi)))) p;
+  ::java::math::BigInteger * g;
+  ::java::math::BigInteger * q;
+  jint l;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_sig_DHParameters__
diff --git a/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h b/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h
new file mode 100644
index 000000000..4c2b43b7e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/sig/DHParametersGenerator.h
@@ -0,0 +1,69 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_sig_DHParametersGenerator__
+#define __gnu_javax_crypto_jce_sig_DHParametersGenerator__
+
+#pragma interface
+
+#include <java/security/AlgorithmParameterGeneratorSpi.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace sig
+          {
+              class DHParametersGenerator;
+          }
+        }
+        namespace key
+        {
+          namespace dh
+          {
+              class RFC2631;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class AlgorithmParameters;
+        class Provider;
+        class SecureRandom;
+      namespace spec
+      {
+          class AlgorithmParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::sig::DHParametersGenerator : public ::java::security::AlgorithmParameterGeneratorSpi
+{
+
+public:
+  DHParametersGenerator();
+public: // actually protected
+  virtual void engineInit(jint, ::java::security::SecureRandom *);
+  virtual void engineInit(::java::security::spec::AlgorithmParameterSpec *, ::java::security::SecureRandom *);
+  virtual ::java::security::AlgorithmParameters * engineGenerateParameters();
+private:
+  static ::java::security::Provider * GNU_CRYPTO;
+  jint __attribute__((aligned(__alignof__( ::java::security::AlgorithmParameterGeneratorSpi)))) modulusSize;
+  jint exponentSize;
+  ::java::security::SecureRandom * rnd;
+  ::gnu::javax::crypto::key::dh::RFC2631 * rfc2631;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_sig_DHParametersGenerator__
diff --git a/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h
new file mode 100644
index 000000000..166ed5897
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/spec/BlockCipherParameterSpec.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
+#define __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace spec
+          {
+              class BlockCipherParameterSpec;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::spec::BlockCipherParameterSpec : public ::java::lang::Object
+{
+
+public:
+  BlockCipherParameterSpec(JArray< jbyte > *, jint, jint);
+  BlockCipherParameterSpec(jint, jint);
+  virtual JArray< jbyte > * getIV();
+  virtual jint getBlockSize();
+  virtual jint getKeySize();
+  virtual ::java::lang::String * toString();
+public: // actually protected
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iv;
+  jint blockSize;
+  jint keySize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_spec_BlockCipherParameterSpec__
diff --git a/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h
new file mode 100644
index 000000000..26fca5d09
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/spec/TMMHParameterSpec.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
+#define __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace spec
+          {
+              class TMMHParameterSpec;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::spec::TMMHParameterSpec : public ::java::lang::Object
+{
+
+public:
+  TMMHParameterSpec(::gnu::java::security::prng::IRandom *, ::java::lang::Integer *, JArray< jbyte > *);
+  TMMHParameterSpec(::gnu::java::security::prng::IRandom *, ::java::lang::Integer *);
+  virtual ::gnu::java::security::prng::IRandom * getKeystream();
+  virtual ::java::lang::Integer * getTagLength();
+  virtual JArray< jbyte > * getPrefix();
+public: // actually protected
+  ::gnu::java::security::prng::IRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) keystream;
+  ::java::lang::Integer * tagLength;
+  JArray< jbyte > * prefix;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_spec_TMMHParameterSpec__
diff --git a/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h b/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h
new file mode 100644
index 000000000..81c2c21e7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/jce/spec/UMac32ParameterSpec.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
+#define __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace jce
+        {
+          namespace spec
+          {
+              class UMac32ParameterSpec;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::jce::spec::UMac32ParameterSpec : public ::java::lang::Object
+{
+
+public:
+  UMac32ParameterSpec(JArray< jbyte > *);
+  virtual JArray< jbyte > * getNonce();
+public: // actually protected
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nonce;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_jce_spec_UMac32ParameterSpec__
diff --git a/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h b/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h
new file mode 100644
index 000000000..20d76e632
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/BaseKeyAgreementParty.h
@@ -0,0 +1,90 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_BaseKeyAgreementParty__
+#define __gnu_javax_crypto_key_BaseKeyAgreementParty__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class BaseKeyAgreementParty;
+            class IncomingMessage;
+            class OutgoingMessage;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class SecureRandom;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::BaseKeyAgreementParty : public ::java::lang::Object
+{
+
+public: // actually protected
+  BaseKeyAgreementParty(::java::lang::String *);
+public:
+  virtual ::java::lang::String * name();
+  virtual void init(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * processMessage(::gnu::javax::crypto::key::IncomingMessage *);
+  virtual jboolean isComplete();
+  virtual JArray< jbyte > * getSharedSecret();
+  virtual void reset();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *) = 0;
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *) = 0;
+  virtual JArray< jbyte > * engineSharedSecret() = 0;
+  virtual void engineReset() = 0;
+  virtual void nextRandomBytes(JArray< jbyte > *);
+private:
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+public: // actually protected
+  static ::java::math::BigInteger * TWO;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+  jboolean initialised;
+  jint step;
+  jboolean complete;
+  ::java::security::SecureRandom * rnd;
+  ::gnu::java::security::prng::IRandom * irnd;
+private:
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_BaseKeyAgreementParty__
diff --git a/libjava/gnu/javax/crypto/key/GnuPBEKey.h b/libjava/gnu/javax/crypto/key/GnuPBEKey.h
new file mode 100644
index 000000000..e52cd5e3c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/GnuPBEKey.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_GnuPBEKey__
+#define __gnu_javax_crypto_key_GnuPBEKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class GnuPBEKey;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class PBEKeySpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::GnuPBEKey : public ::java::lang::Object
+{
+
+public:
+  GnuPBEKey(::javax::crypto::spec::PBEKeySpec *);
+  GnuPBEKey(JArray< jchar > *, JArray< jbyte > *, jint);
+  virtual jint getIterationCount();
+  virtual JArray< jchar > * getPassword();
+  virtual JArray< jbyte > * getSalt();
+  virtual ::java::lang::String * getAlgorithm();
+  virtual ::java::lang::String * getFormat();
+  virtual JArray< jbyte > * getEncoded();
+private:
+  ::javax::crypto::spec::PBEKeySpec * __attribute__((aligned(__alignof__( ::java::lang::Object)))) spec;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_GnuPBEKey__
diff --git a/libjava/gnu/javax/crypto/key/GnuSecretKey.h b/libjava/gnu/javax/crypto/key/GnuSecretKey.h
new file mode 100644
index 000000000..b9a3133d6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/GnuSecretKey.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_GnuSecretKey__
+#define __gnu_javax_crypto_key_GnuSecretKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class GnuSecretKey;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::GnuSecretKey : public ::java::lang::Object
+{
+
+public:
+  GnuSecretKey(JArray< jbyte > *, ::java::lang::String *);
+  GnuSecretKey(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 ::java::lang::String * toString();
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  ::java::lang::String * algorithm;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_GnuSecretKey__
diff --git a/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h b/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h
new file mode 100644
index 000000000..4fb301943
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/IKeyAgreementParty.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_IKeyAgreementParty__
+#define __gnu_javax_crypto_key_IKeyAgreementParty__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IKeyAgreementParty;
+            class IncomingMessage;
+            class OutgoingMessage;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::IKeyAgreementParty : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * name() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * processMessage(::gnu::javax::crypto::key::IncomingMessage *) = 0;
+  virtual jboolean isComplete() = 0;
+  virtual JArray< jbyte > * getSharedSecret() = 0;
+  virtual void reset() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_key_IKeyAgreementParty__
diff --git a/libjava/gnu/javax/crypto/key/IncomingMessage.h b/libjava/gnu/javax/crypto/key/IncomingMessage.h
new file mode 100644
index 000000000..ed3f33a57
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/IncomingMessage.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_IncomingMessage__
+#define __gnu_javax_crypto_key_IncomingMessage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace key
+        {
+            class IKeyPairCodec;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::IncomingMessage : public ::java::lang::Object
+{
+
+public:
+  IncomingMessage(JArray< jbyte > *);
+private:
+  IncomingMessage();
+public:
+  static ::gnu::javax::crypto::key::IncomingMessage * getInstance(JArray< jbyte > *);
+  static ::gnu::javax::crypto::key::IncomingMessage * getInstance(JArray< jbyte > *, jint, jint);
+  static jint twoBytesToLength(JArray< jbyte > *);
+  static jint fourBytesToLength(JArray< jbyte > *);
+  virtual jboolean hasMoreElements();
+  virtual ::java::security::PublicKey * readPublicKey();
+  virtual ::java::security::PrivateKey * readPrivateKey();
+  virtual ::java::math::BigInteger * readMPI();
+  virtual ::java::lang::String * readString();
+private:
+  ::gnu::java::security::key::IKeyPairCodec * getKeyPairCodec(jint);
+public: // actually protected
+  ::java::io::ByteArrayInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
+  jint length;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_IncomingMessage__
diff --git a/libjava/gnu/javax/crypto/key/KeyAgreementException.h b/libjava/gnu/javax/crypto/key/KeyAgreementException.h
new file mode 100644
index 000000000..77bc760d1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/KeyAgreementException.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_KeyAgreementException__
+#define __gnu_javax_crypto_key_KeyAgreementException__
+
+#pragma interface
+
+#include <java/security/KeyManagementException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class KeyAgreementException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::KeyAgreementException : public ::java::security::KeyManagementException
+{
+
+public:
+  KeyAgreementException();
+  KeyAgreementException(::java::lang::String *);
+  KeyAgreementException(::java::lang::String *, ::java::lang::Throwable *);
+  virtual ::java::lang::Throwable * getCause();
+  virtual void printStackTrace();
+  virtual void printStackTrace(::java::io::PrintStream *);
+  virtual void printStackTrace(::java::io::PrintWriter *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::lang::Throwable * __attribute__((aligned(__alignof__( ::java::security::KeyManagementException)))) cause;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_KeyAgreementException__
diff --git a/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h b/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h
new file mode 100644
index 000000000..abbfd2871
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/KeyAgreementFactory.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_KeyAgreementFactory__
+#define __gnu_javax_crypto_key_KeyAgreementFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IKeyAgreementParty;
+            class KeyAgreementFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::KeyAgreementFactory : public ::java::lang::Object
+{
+
+  KeyAgreementFactory();
+public:
+  static ::gnu::javax::crypto::key::IKeyAgreementParty * getPartyAInstance(::java::lang::String *);
+  static ::gnu::javax::crypto::key::IKeyAgreementParty * getPartyBInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_KeyAgreementFactory__
diff --git a/libjava/gnu/javax/crypto/key/OutgoingMessage.h b/libjava/gnu/javax/crypto/key/OutgoingMessage.h
new file mode 100644
index 000000000..8f46a1e16
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/OutgoingMessage.h
@@ -0,0 +1,61 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_OutgoingMessage__
+#define __gnu_javax_crypto_key_OutgoingMessage__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class OutgoingMessage;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class Key;
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::OutgoingMessage : public ::java::lang::Object
+{
+
+public:
+  OutgoingMessage();
+  virtual JArray< jbyte > * toByteArray();
+  virtual JArray< jbyte > * wrap();
+  virtual void writePublicKey(::java::security::PublicKey *);
+  virtual void writePrivateKey(::java::security::PrivateKey *);
+  virtual void writeMPI(::java::math::BigInteger *);
+  virtual void writeString(::java::lang::String *);
+private:
+  void writeKey(::java::security::Key *);
+  jint getKeyType(::java::security::Key *);
+  ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_OutgoingMessage__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h
new file mode 100644
index 000000000..17e0ccea0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DHKeyPairPKCS8Codec.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
+#define __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+          class OID;
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class DHKeyPairPKCS8Codec;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DHKeyPairPKCS8Codec : public ::java::lang::Object
+{
+
+public:
+  DHKeyPairPKCS8Codec();
+  virtual jint getFormatID();
+  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
+  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
+  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
+  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
+private:
+  static ::gnu::java::security::OID * DH_ALG_OID;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DHKeyPairPKCS8Codec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h
new file mode 100644
index 000000000..1c5507c98
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DHKeyPairRawCodec.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
+#define __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class DHKeyPairRawCodec;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DHKeyPairRawCodec : public ::java::lang::Object
+{
+
+public:
+  DHKeyPairRawCodec();
+  virtual jint getFormatID();
+  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
+  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
+  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
+  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DHKeyPairRawCodec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h b/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h
new file mode 100644
index 000000000..a52ab8adc
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DHKeyPairX509Codec.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
+#define __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+          class OID;
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class DHKeyPairX509Codec;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DHKeyPairX509Codec : public ::java::lang::Object
+{
+
+public:
+  DHKeyPairX509Codec();
+  virtual jint getFormatID();
+  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
+  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
+  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
+  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
+private:
+  static ::gnu::java::security::OID * DH_ALG_OID;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DHKeyPairX509Codec__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h
new file mode 100644
index 000000000..c592f769a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
+#define __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class DiffieHellmanKeyAgreement;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHPrivateKey;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
+{
+
+public: // actually protected
+  DiffieHellmanKeyAgreement();
+  virtual JArray< jbyte > * engineSharedSecret();
+  virtual void engineReset();
+public:
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+  static ::java::lang::String * KA_DIFFIE_HELLMAN_OWNER_PRIVATE_KEY;
+public: // actually protected
+  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) ownerKey;
+  ::java::math::BigInteger * ZZ;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DiffieHellmanKeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h
new file mode 100644
index 000000000..56bae1b6f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanReceiver.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
+#define __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace dh
+          {
+              class DiffieHellmanReceiver;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DiffieHellmanReceiver : public ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement
+{
+
+public:
+  DiffieHellmanReceiver();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement)))) y;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DiffieHellmanReceiver__
diff --git a/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h
new file mode 100644
index 000000000..ff9ab2984
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/DiffieHellmanSender.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_DiffieHellmanSender__
+#define __gnu_javax_crypto_key_dh_DiffieHellmanSender__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/DiffieHellmanKeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace dh
+          {
+              class DiffieHellmanSender;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::DiffieHellmanSender : public ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement
+{
+
+public:
+  DiffieHellmanSender();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * sendRandomSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::DiffieHellmanKeyAgreement)))) x;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_DiffieHellmanSender__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h b/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h
new file mode 100644
index 000000000..d167c7ce1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
+#define __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class ElGamalKeyAgreement;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::ElGamalKeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
+{
+
+public: // actually protected
+  ElGamalKeyAgreement();
+  virtual JArray< jbyte > * engineSharedSecret();
+  virtual void engineReset();
+public:
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+  static ::java::lang::String * KA_ELGAMAL_RECIPIENT_PRIVATE_KEY;
+  static ::java::lang::String * KA_ELGAMAL_RECIPIENT_PUBLIC_KEY;
+public: // actually protected
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) ZZ;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_ElGamalKeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h b/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h
new file mode 100644
index 000000000..cba0013d3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/ElGamalReceiver.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_ElGamalReceiver__
+#define __gnu_javax_crypto_key_dh_ElGamalReceiver__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace dh
+          {
+              class ElGamalReceiver;
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHPrivateKey;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::ElGamalReceiver : public ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement
+{
+
+public:
+  ElGamalReceiver();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::javax::crypto::interfaces::DHPrivateKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement)))) B;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_ElGamalReceiver__
diff --git a/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h b/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h
new file mode 100644
index 000000000..487867fd6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/ElGamalSender.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_ElGamalSender__
+#define __gnu_javax_crypto_key_dh_ElGamalSender__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/ElGamalKeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace dh
+          {
+              class ElGamalSender;
+          }
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace interfaces
+      {
+          class DHPublicKey;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::ElGamalSender : public ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement
+{
+
+public:
+  ElGamalSender();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::javax::crypto::interfaces::DHPublicKey * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::ElGamalKeyAgreement)))) B;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_ElGamalSender__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h
new file mode 100644
index 000000000..2d8f29222
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/GnuDHKey.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_GnuDHKey__
+#define __gnu_javax_crypto_key_dh_GnuDHKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class GnuDHKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+  namespace javax
+  {
+    namespace crypto
+    {
+      namespace spec
+      {
+          class DHParameterSpec;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::GnuDHKey : public ::java::lang::Object
+{
+
+public: // actually protected
+  GnuDHKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+public:
+  virtual ::javax::crypto::spec::DHParameterSpec * getParams();
+  virtual ::java::lang::String * getAlgorithm();
+  virtual JArray< jbyte > * getEncoded();
+  virtual ::java::lang::String * getFormat();
+  virtual ::java::math::BigInteger * getQ();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+  virtual JArray< jbyte > * getEncoded(jint) = 0;
+public: // actually protected
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) q;
+  ::java::math::BigInteger * p;
+  ::java::math::BigInteger * g;
+  jint defaultFormat;
+private:
+  ::java::lang::String * str;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_GnuDHKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
new file mode 100644
index 000000000..aaab2bf51
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
@@ -0,0 +1,96 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
+#define __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class Sha160;
+        }
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class GnuDHKeyPairGenerator;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class KeyPair;
+        class SecureRandom;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::GnuDHKeyPairGenerator : public ::java::lang::Object
+{
+
+public:
+  GnuDHKeyPairGenerator();
+  virtual ::java::lang::String * name();
+  virtual void setup(::java::util::Map *);
+  virtual ::java::security::KeyPair * generate();
+private:
+  void nextRandomBytes(JArray< jbyte > *);
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+  static ::java::util::logging::Logger * log;
+public:
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+  static ::java::lang::String * DH_PARAMETERS;
+  static ::java::lang::String * PRIME_SIZE;
+  static ::java::lang::String * EXPONENT_SIZE;
+  static ::java::lang::String * PREFERRED_ENCODING_FORMAT;
+  static const jint DEFAULT_PRIME_SIZE = 512;
+  static const jint DEFAULT_EXPONENT_SIZE = 160;
+private:
+  static const jint DEFAULT_ENCODING_FORMAT = 1;
+  ::gnu::java::security::hash::Sha160 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sha;
+  ::java::security::SecureRandom * rnd;
+  jint l;
+  jint m;
+  ::java::math::BigInteger * seed;
+  ::java::math::BigInteger * counter;
+  ::java::math::BigInteger * q;
+  ::java::math::BigInteger * p;
+  ::java::math::BigInteger * j;
+  ::java::math::BigInteger * g;
+  ::gnu::java::security::util::PRNG * prng;
+  jint preferredFormat;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_GnuDHKeyPairGenerator__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h
new file mode 100644
index 000000000..142262255
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/GnuDHPrivateKey.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
+#define __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/GnuDHKey.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class GnuDHPrivateKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::GnuDHPrivateKey : public ::gnu::javax::crypto::key::dh::GnuDHKey
+{
+
+public:
+  GnuDHPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  GnuDHPrivateKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  static ::gnu::javax::crypto::key::dh::GnuDHPrivateKey * valueOf(JArray< jbyte > *);
+  virtual ::java::math::BigInteger * getX();
+  virtual JArray< jbyte > * getEncoded(jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::GnuDHKey)))) x;
+  ::java::lang::String * str;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_GnuDHPrivateKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h b/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h
new file mode 100644
index 000000000..980e7f74b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/GnuDHPublicKey.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_GnuDHPublicKey__
+#define __gnu_javax_crypto_key_dh_GnuDHPublicKey__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/dh/GnuDHKey.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class GnuDHPublicKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::GnuDHPublicKey : public ::gnu::javax::crypto::key::dh::GnuDHKey
+{
+
+public:
+  GnuDHPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  GnuDHPublicKey(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  static ::gnu::javax::crypto::key::dh::GnuDHPublicKey * valueOf(JArray< jbyte > *);
+  virtual ::java::math::BigInteger * getY();
+  virtual JArray< jbyte > * getEncoded(jint);
+  virtual jboolean equals(::java::lang::Object *);
+  virtual ::java::lang::String * toString();
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::dh::GnuDHKey)))) y;
+  ::java::lang::String * str;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_GnuDHPublicKey__
diff --git a/libjava/gnu/javax/crypto/key/dh/RFC2631.h b/libjava/gnu/javax/crypto/key/dh/RFC2631.h
new file mode 100644
index 000000000..36f1f46c0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/dh/RFC2631.h
@@ -0,0 +1,84 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_dh_RFC2631__
+#define __gnu_javax_crypto_key_dh_RFC2631__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class Sha160;
+        }
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace dh
+          {
+              class RFC2631;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class SecureRandom;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::dh::RFC2631 : public ::java::lang::Object
+{
+
+public:
+  RFC2631(jint, jint, ::java::security::SecureRandom *);
+  virtual JArray< ::java::math::BigInteger * > * generateParameters();
+private:
+  void nextRandomBytes(JArray< jbyte > *);
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+public:
+  static const jint DH_PARAMS_SEED = 0;
+  static const jint DH_PARAMS_COUNTER = 1;
+  static const jint DH_PARAMS_Q = 2;
+  static const jint DH_PARAMS_P = 3;
+  static const jint DH_PARAMS_J = 4;
+  static const jint DH_PARAMS_G = 5;
+private:
+  static ::java::math::BigInteger * TWO;
+  ::gnu::java::security::hash::Sha160 * __attribute__((aligned(__alignof__( ::java::lang::Object)))) sha;
+  jint m;
+  jint L;
+  ::java::security::SecureRandom * rnd;
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_dh_RFC2631__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h b/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h
new file mode 100644
index 000000000..34913f031
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6Host.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6Host__
+#define __gnu_javax_crypto_key_srp6_SRP6Host__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6Host;
+          }
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SRPAuthInfoProvider;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class KeyPair;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6Host : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
+{
+
+public:
+  SRP6Host();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+  virtual void engineReset();
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::java::security::KeyPair * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) hostKeyPair;
+  ::gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider * passwordDB;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6Host__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h b/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h
new file mode 100644
index 000000000..7479d7e68
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
+#define __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/BaseKeyAgreementParty.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRP6KeyAgreement;
+          }
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SRP;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6KeyAgreement : public ::gnu::javax::crypto::key::BaseKeyAgreementParty
+{
+
+public: // actually protected
+  SRP6KeyAgreement();
+  virtual JArray< jbyte > * engineSharedSecret();
+  virtual void engineReset();
+  virtual ::java::math::BigInteger * uValue(::java::math::BigInteger *, ::java::math::BigInteger *);
+public:
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+  static ::java::lang::String * SHARED_MODULUS;
+  static ::java::lang::String * GENERATOR;
+  static ::java::lang::String * HASH_FUNCTION;
+  static ::java::lang::String * USER_IDENTITY;
+  static ::java::lang::String * USER_PASSWORD;
+  static ::java::lang::String * HOST_PASSWORD_DB;
+public: // actually protected
+  static ::java::math::BigInteger * THREE;
+  ::gnu::javax::crypto::sasl::srp::SRP * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::BaseKeyAgreementParty)))) srp;
+  ::java::math::BigInteger * N;
+  ::java::math::BigInteger * g;
+  ::java::math::BigInteger * K;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6KeyAgreement__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h
new file mode 100644
index 000000000..179741557
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslClient.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6SaslClient__
+#define __gnu_javax_crypto_key_srp6_SRP6SaslClient__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6TLSClient.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6SaslClient;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6SaslClient : public ::gnu::javax::crypto::key::srp6::SRP6TLSClient
+{
+
+public:
+  SRP6SaslClient();
+public: // actually protected
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6SaslClient__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h
new file mode 100644
index 000000000..5ac6a478e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6SaslServer.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6SaslServer__
+#define __gnu_javax_crypto_key_srp6_SRP6SaslServer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6TLSServer.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6SaslServer;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6SaslServer : public ::gnu::javax::crypto::key::srp6::SRP6TLSServer
+{
+
+public:
+  SRP6SaslServer();
+public: // actually protected
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6SaslServer__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h
new file mode 100644
index 000000000..b5df35136
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSClient.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6TLSClient__
+#define __gnu_javax_crypto_key_srp6_SRP6TLSClient__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6TLSClient;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class KeyPair;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6TLSClient : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
+{
+
+public:
+  SRP6TLSClient();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+  virtual void engineReset();
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * sendIdentity(::gnu::javax::crypto::key::IncomingMessage *);
+public: // actually protected
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) I;
+  JArray< jbyte > * p;
+  ::java::security::KeyPair * userKeyPair;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6TLSClient__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h
new file mode 100644
index 000000000..facb7cbb7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6TLSServer.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6TLSServer__
+#define __gnu_javax_crypto_key_srp6_SRP6TLSServer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6TLSServer;
+          }
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SRPAuthInfoProvider;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class KeyPair;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6TLSServer : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
+{
+
+public:
+  SRP6TLSServer();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+  virtual void engineReset();
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * sendParameters(::gnu::javax::crypto::key::IncomingMessage *);
+public: // actually protected
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+private:
+  ::java::security::KeyPair * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) hostKeyPair;
+  ::gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider * passwordDB;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6TLSServer__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRP6User.h b/libjava/gnu/javax/crypto/key/srp6/SRP6User.h
new file mode 100644
index 000000000..2d9f72510
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRP6User.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRP6User__
+#define __gnu_javax_crypto_key_srp6_SRP6User__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRP6KeyAgreement.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IncomingMessage;
+            class OutgoingMessage;
+          namespace srp6
+          {
+              class SRP6User;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class KeyPair;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRP6User : public ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement
+{
+
+public:
+  SRP6User();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual ::gnu::javax::crypto::key::OutgoingMessage * engineProcessMessage(::gnu::javax::crypto::key::IncomingMessage *);
+  virtual void engineReset();
+private:
+  ::gnu::javax::crypto::key::OutgoingMessage * sendIdentity(::gnu::javax::crypto::key::IncomingMessage *);
+  ::gnu::javax::crypto::key::OutgoingMessage * computeSharedSecret(::gnu::javax::crypto::key::IncomingMessage *);
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRP6KeyAgreement)))) I;
+  JArray< jbyte > * p;
+  ::java::security::KeyPair * userKeyPair;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRP6User__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h b/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h
new file mode 100644
index 000000000..534c681c8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPAlgorithm.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPAlgorithm__
+#define __gnu_javax_crypto_key_srp6_SRPAlgorithm__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPAlgorithm;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPAlgorithm : public ::java::lang::Object
+{
+
+  SRPAlgorithm();
+public:
+  static void checkParams(::java::math::BigInteger *, ::java::math::BigInteger *);
+  static ::java::math::BigInteger * N_2048;
+  static ::java::math::BigInteger * N_1536;
+  static ::java::math::BigInteger * N_1280;
+  static ::java::math::BigInteger * N_1024;
+  static ::java::math::BigInteger * N_768;
+  static ::java::math::BigInteger * N_640;
+  static ::java::math::BigInteger * N_512;
+  static ::java::math::BigInteger * N_384;
+  static ::java::math::BigInteger * N_264;
+private:
+  static ::java::math::BigInteger * ZERO;
+  static ::java::math::BigInteger * ONE;
+  static ::java::math::BigInteger * TWO;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPAlgorithm__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPKey.h
new file mode 100644
index 000000000..9c4ef5189
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPKey.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPKey__
+#define __gnu_javax_crypto_key_srp6_SRPKey__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPKey : public ::java::lang::Object
+{
+
+public: // actually protected
+  SRPKey(::java::math::BigInteger *, ::java::math::BigInteger *);
+public:
+  virtual ::java::lang::String * getAlgorithm();
+  virtual JArray< jbyte > * getEncoded();
+  virtual ::java::lang::String * getFormat();
+  virtual ::java::math::BigInteger * getN();
+  virtual ::java::math::BigInteger * getG();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual JArray< jbyte > * getEncoded(jint) = 0;
+public: // actually protected
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) N;
+  ::java::math::BigInteger * g;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPKey__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h
new file mode 100644
index 000000000..2be95fbb3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairGenerator.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
+#define __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPKeyPairGenerator;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+    namespace security
+    {
+        class KeyPair;
+        class SecureRandom;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPKeyPairGenerator : public ::java::lang::Object
+{
+
+public:
+  SRPKeyPairGenerator();
+  virtual ::java::lang::String * name();
+  virtual void setup(::java::util::Map *);
+  virtual ::java::security::KeyPair * generate();
+private:
+  JArray< ::java::math::BigInteger * > * generateParameters();
+  ::java::security::KeyPair * hostKeyPair();
+  ::java::security::KeyPair * userKeyPair();
+  void nextRandomBytes(JArray< jbyte > *);
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+  static ::java::util::logging::Logger * log;
+  static ::java::math::BigInteger * ZERO;
+  static ::java::math::BigInteger * ONE;
+  static ::java::math::BigInteger * TWO;
+  static ::java::math::BigInteger * THREE;
+public:
+  static ::java::lang::String * MODULUS_LENGTH;
+  static ::java::lang::String * USE_DEFAULTS;
+  static ::java::lang::String * SHARED_MODULUS;
+  static ::java::lang::String * GENERATOR;
+  static ::java::lang::String * USER_VERIFIER;
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+private:
+  static const jint DEFAULT_MODULUS_LENGTH = 1024;
+  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rnd;
+  jint l;
+  ::java::math::BigInteger * N;
+  ::java::math::BigInteger * g;
+  ::java::math::BigInteger * v;
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPKeyPairGenerator__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h
new file mode 100644
index 000000000..3f6f0db75
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPKeyPairRawCodec.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
+#define __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPKeyPairRawCodec;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class PrivateKey;
+        class PublicKey;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPKeyPairRawCodec : public ::java::lang::Object
+{
+
+public:
+  SRPKeyPairRawCodec();
+  virtual jint getFormatID();
+  virtual JArray< jbyte > * encodePublicKey(::java::security::PublicKey *);
+  virtual ::java::security::PublicKey * decodePublicKey(JArray< jbyte > *);
+  virtual JArray< jbyte > * encodePrivateKey(::java::security::PrivateKey *);
+  virtual ::java::security::PrivateKey * decodePrivateKey(JArray< jbyte > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPKeyPairRawCodec__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h
new file mode 100644
index 000000000..af942a1eb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPPrivateKey.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPPrivateKey__
+#define __gnu_javax_crypto_key_srp6_SRPPrivateKey__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRPKey.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPPrivateKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPPrivateKey : public ::gnu::javax::crypto::key::srp6::SRPKey
+{
+
+public:
+  SRPPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+  SRPPrivateKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+public: // actually package-private
+  SRPPrivateKey(JArray< ::java::math::BigInteger * > *);
+public:
+  static ::gnu::javax::crypto::key::srp6::SRPPrivateKey * valueOf(JArray< jbyte > *);
+  virtual ::java::math::BigInteger * getX();
+  virtual ::java::math::BigInteger * getV();
+  virtual JArray< jbyte > * getEncoded(jint);
+  virtual jboolean equals(::java::lang::Object *);
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRPKey)))) X;
+  ::java::math::BigInteger * v;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPPrivateKey__
diff --git a/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h b/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h
new file mode 100644
index 000000000..8b1b7b0d0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/key/srp6/SRPPublicKey.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_key_srp6_SRPPublicKey__
+#define __gnu_javax_crypto_key_srp6_SRPPublicKey__
+
+#pragma interface
+
+#include <gnu/javax/crypto/key/srp6/SRPKey.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+          namespace srp6
+          {
+              class SRPPublicKey;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::key::srp6::SRPPublicKey : public ::gnu::javax::crypto::key::srp6::SRPKey
+{
+
+public:
+  SRPPublicKey(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::math::BigInteger *);
+public: // actually package-private
+  SRPPublicKey(JArray< ::java::math::BigInteger * > *);
+public:
+  static ::gnu::javax::crypto::key::srp6::SRPPublicKey * valueOf(JArray< jbyte > *);
+  virtual ::java::math::BigInteger * getY();
+  virtual JArray< jbyte > * getEncoded(jint);
+  virtual jboolean equals(::java::lang::Object *);
+private:
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::key::srp6::SRPKey)))) Y;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_key_srp6_SRPPublicKey__
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__
diff --git a/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h b/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h
new file mode 100644
index 000000000..6e1528a75
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/AESKeyWrap.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_AESKeyWrap__
+#define __gnu_javax_crypto_kwa_AESKeyWrap__
+
+#pragma interface
+
+#include <gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class Rijndael;
+        }
+        namespace kwa
+        {
+            class AESKeyWrap;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::AESKeyWrap : public ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm
+{
+
+public:
+  AESKeyWrap();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+private:
+  static JArray< jbyte > * DEFAULT_IV;
+  ::gnu::javax::crypto::cipher::Rijndael * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm)))) aes;
+  JArray< jbyte > * iv;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_kwa_AESKeyWrap__
diff --git a/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h b/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h
new file mode 100644
index 000000000..34e131931
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
+#define __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace kwa
+        {
+            class BaseKeyWrappingAlgorithm;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm : public ::java::lang::Object
+{
+
+public: // actually protected
+  BaseKeyWrappingAlgorithm(::java::lang::String *);
+public:
+  virtual ::java::lang::String * name();
+  virtual void init(::java::util::Map *);
+  virtual jint wrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
+  virtual jint unwrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint);
+  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
+public: // actually protected
+  virtual void engineInit(::java::util::Map *) = 0;
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint) = 0;
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint) = 0;
+  virtual ::gnu::java::security::util::PRNG * getDefaultPRNG();
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+private:
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_kwa_BaseKeyWrappingAlgorithm__
diff --git a/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h b/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h
new file mode 100644
index 000000000..56d032add
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/IKeyWrappingAlgorithm.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
+#define __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace kwa
+        {
+            class IKeyWrappingAlgorithm;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::IKeyWrappingAlgorithm : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * name() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual jint wrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
+  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint) = 0;
+  virtual jint unwrap(JArray< jbyte > *, jint, jint, JArray< jbyte > *, jint) = 0;
+  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint) = 0;
+  static ::java::lang::String * KEY_ENCRYPTION_KEY_MATERIAL;
+  static ::java::lang::String * INITIAL_VALUE;
+  static ::java::lang::String * SOURCE_OF_RANDOMNESS;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_kwa_IKeyWrappingAlgorithm__
diff --git a/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h b/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h
new file mode 100644
index 000000000..b9d9039fb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/KeyUnwrappingException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_KeyUnwrappingException__
+#define __gnu_javax_crypto_kwa_KeyUnwrappingException__
+
+#pragma interface
+
+#include <java/security/GeneralSecurityException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace kwa
+        {
+            class KeyUnwrappingException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::KeyUnwrappingException : public ::java::security::GeneralSecurityException
+{
+
+public:
+  KeyUnwrappingException();
+  KeyUnwrappingException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_kwa_KeyUnwrappingException__
diff --git a/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h b/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h
new file mode 100644
index 000000000..ab443dbe7
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/KeyWrappingAlgorithmFactory.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
+#define __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace kwa
+        {
+            class IKeyWrappingAlgorithm;
+            class KeyWrappingAlgorithmFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::KeyWrappingAlgorithmFactory : public ::java::lang::Object
+{
+
+  KeyWrappingAlgorithmFactory();
+public:
+  static ::gnu::javax::crypto::kwa::IKeyWrappingAlgorithm * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+private:
+  static ::java::util::Set * names;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_kwa_KeyWrappingAlgorithmFactory__
diff --git a/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h b/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h
new file mode 100644
index 000000000..5f23a7015
--- /dev/null
+++ b/libjava/gnu/javax/crypto/kwa/TripleDESKeyWrap.h
@@ -0,0 +1,71 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_kwa_TripleDESKeyWrap__
+#define __gnu_javax_crypto_kwa_TripleDESKeyWrap__
+
+#pragma interface
+
+#include <gnu/javax/crypto/kwa/BaseKeyWrappingAlgorithm.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class Sha160;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Assembly;
+        }
+        namespace kwa
+        {
+            class TripleDESKeyWrap;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class SecureRandom;
+    }
+  }
+}
+
+class gnu::javax::crypto::kwa::TripleDESKeyWrap : public ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm
+{
+
+public:
+  TripleDESKeyWrap();
+public: // actually protected
+  virtual void engineInit(::java::util::Map *);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+private:
+  void nextRandomBytes(JArray< jbyte > *);
+  static JArray< jbyte > * DEFAULT_IV;
+  ::gnu::javax::crypto::assembly::Assembly * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::kwa::BaseKeyWrappingAlgorithm)))) asm$;
+  ::java::util::HashMap * asmAttributes;
+  ::java::util::HashMap * modeAttributes;
+  ::gnu::java::security::hash::Sha160 * sha;
+  ::java::security::SecureRandom * rnd;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_kwa_TripleDESKeyWrap__
diff --git a/libjava/gnu/javax/crypto/mac/BaseMac.h b/libjava/gnu/javax/crypto/mac/BaseMac.h
new file mode 100644
index 000000000..aebe9313e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/BaseMac.h
@@ -0,0 +1,63 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_BaseMac__
+#define __gnu_javax_crypto_mac_BaseMac__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class BaseMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::BaseMac : public ::java::lang::Object
+{
+
+public: // actually protected
+  BaseMac(::java::lang::String *);
+  BaseMac(::java::lang::String *, ::gnu::java::security::hash::IMessageDigest *);
+public:
+  virtual ::java::lang::String * name();
+  virtual jint macSize();
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual void reset();
+  virtual ::java::lang::Object * clone();
+  virtual void init(::java::util::Map *) = 0;
+  virtual JArray< jbyte > * digest() = 0;
+  virtual jboolean selfTest() = 0;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+  ::gnu::java::security::hash::IMessageDigest * underlyingHash;
+  jint truncatedSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_BaseMac__
diff --git a/libjava/gnu/javax/crypto/mac/HMac.h b/libjava/gnu/javax/crypto/mac/HMac.h
new file mode 100644
index 000000000..c38a9e795
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/HMac.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_HMac__
+#define __gnu_javax_crypto_mac_HMac__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mac/BaseMac.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class HMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::HMac : public ::gnu::javax::crypto::mac::BaseMac
+{
+
+public: // actually protected
+  HMac(::gnu::java::security::hash::IMessageDigest *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void init(::java::util::Map *);
+  virtual void reset();
+  virtual JArray< jbyte > * digest();
+  virtual jboolean selfTest();
+  static ::java::lang::String * USE_WITH_PKCS5_V2;
+private:
+  static const jbyte IPAD_BYTE = 54;
+  static const jbyte OPAD_BYTE = 92;
+  static ::java::lang::Boolean * valid;
+public: // actually protected
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) macSize;
+  jint blockSize;
+  ::gnu::java::security::hash::IMessageDigest * ipadHash;
+  ::gnu::java::security::hash::IMessageDigest * opadHash;
+  JArray< jbyte > * ipad;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_HMac__
diff --git a/libjava/gnu/javax/crypto/mac/HMacFactory.h b/libjava/gnu/javax/crypto/mac/HMacFactory.h
new file mode 100644
index 000000000..e32104e7a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/HMacFactory.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_HMacFactory__
+#define __gnu_javax_crypto_mac_HMacFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class HMacFactory;
+            class IMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::HMacFactory : public ::java::lang::Object
+{
+
+  HMacFactory();
+public:
+  static ::gnu::javax::crypto::mac::IMac * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_HMacFactory__
diff --git a/libjava/gnu/javax/crypto/mac/IMac.h b/libjava/gnu/javax/crypto/mac/IMac.h
new file mode 100644
index 000000000..9bed61ae2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/IMac.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_IMac__
+#define __gnu_javax_crypto_mac_IMac__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::IMac : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * name() = 0;
+  virtual jint macSize() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual void update(jbyte) = 0;
+  virtual void update(JArray< jbyte > *, jint, jint) = 0;
+  virtual JArray< jbyte > * digest() = 0;
+  virtual void reset() = 0;
+  virtual jboolean selfTest() = 0;
+  virtual ::java::lang::Object * clone() = 0;
+  static ::java::lang::String * MAC_KEY_MATERIAL;
+  static ::java::lang::String * TRUNCATED_SIZE;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_mac_IMac__
diff --git a/libjava/gnu/javax/crypto/mac/MacFactory.h b/libjava/gnu/javax/crypto/mac/MacFactory.h
new file mode 100644
index 000000000..141a59cf6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/MacFactory.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_MacFactory__
+#define __gnu_javax_crypto_mac_MacFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+            class MacFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::MacFactory : public ::java::lang::Object
+{
+
+  MacFactory();
+public:
+  static ::gnu::javax::crypto::mac::IMac * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+private:
+  static ::java::util::Set * names;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_MacFactory__
diff --git a/libjava/gnu/javax/crypto/mac/MacInputStream.h b/libjava/gnu/javax/crypto/mac/MacInputStream.h
new file mode 100644
index 000000000..52087df38
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/MacInputStream.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_MacInputStream__
+#define __gnu_javax_crypto_mac_MacInputStream__
+
+#pragma interface
+
+#include <java/io/FilterInputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+            class MacInputStream;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::MacInputStream : public ::java::io::FilterInputStream
+{
+
+public:
+  MacInputStream(::java::io::InputStream *, ::gnu::javax::crypto::mac::IMac *);
+  virtual ::gnu::javax::crypto::mac::IMac * getMac();
+  virtual void setMac(::gnu::javax::crypto::mac::IMac *);
+  virtual void on(jboolean);
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterInputStream)))) digesting;
+  ::gnu::javax::crypto::mac::IMac * mac;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_MacInputStream__
diff --git a/libjava/gnu/javax/crypto/mac/MacOutputStream.h b/libjava/gnu/javax/crypto/mac/MacOutputStream.h
new file mode 100644
index 000000000..936a59927
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/MacOutputStream.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_MacOutputStream__
+#define __gnu_javax_crypto_mac_MacOutputStream__
+
+#pragma interface
+
+#include <java/io/FilterOutputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+            class MacOutputStream;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::MacOutputStream : public ::java::io::FilterOutputStream
+{
+
+public:
+  MacOutputStream(::java::io::OutputStream *, ::gnu::javax::crypto::mac::IMac *);
+  virtual ::gnu::javax::crypto::mac::IMac * getMac();
+  virtual void setMac(::gnu::javax::crypto::mac::IMac *);
+  virtual void on(jboolean);
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) digesting;
+  ::gnu::javax::crypto::mac::IMac * mac;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_MacOutputStream__
diff --git a/libjava/gnu/javax/crypto/mac/OMAC.h b/libjava/gnu/javax/crypto/mac/OMAC.h
new file mode 100644
index 000000000..e608c466c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/OMAC.h
@@ -0,0 +1,75 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_OMAC__
+#define __gnu_javax_crypto_mac_OMAC__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mac
+        {
+            class OMAC;
+        }
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::OMAC : public ::java::lang::Object
+{
+
+public:
+  OMAC(::gnu::javax::crypto::cipher::IBlockCipher *);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::String * name();
+  virtual jint macSize();
+  virtual void init(::java::util::Map *);
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  virtual void digest(JArray< jbyte > *, jint);
+  virtual void reset();
+  virtual jboolean selfTest();
+private:
+  void process();
+  static ::java::util::logging::Logger * log;
+  static const jbyte C1 = -121;
+  static const jbyte C2 = 27;
+  static JArray< jbyte > * KEY0;
+  static JArray< jbyte > * DIGEST0;
+  static ::java::lang::Boolean * valid;
+  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipher;
+  ::java::lang::String * name__;
+  ::gnu::javax::crypto::mode::IMode * mode;
+  jint blockSize;
+  jint outputSize;
+  JArray< jbyte > * Lu;
+  JArray< jbyte > * Lu2;
+  JArray< jbyte > * M;
+  JArray< jbyte > * Y;
+  jboolean init__;
+  jint index;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_OMAC__
diff --git a/libjava/gnu/javax/crypto/mac/TMMH16.h b/libjava/gnu/javax/crypto/mac/TMMH16.h
new file mode 100644
index 000000000..9ca8a7a4f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/TMMH16.h
@@ -0,0 +1,79 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_TMMH16__
+#define __gnu_javax_crypto_mac_TMMH16__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mac/BaseMac.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class TMMH16;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::TMMH16 : public ::gnu::javax::crypto::mac::BaseMac
+{
+
+public:
+  TMMH16();
+  virtual jint macSize();
+  virtual void init(::java::util::Map *);
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  virtual void reset();
+  virtual jboolean selfTest();
+  virtual ::java::lang::Object * clone();
+  virtual void update(jbyte, ::gnu::java::security::prng::IRandom *);
+  virtual void update(JArray< jbyte > *, jint, jint, ::gnu::java::security::prng::IRandom *);
+  virtual JArray< jbyte > * digest(::gnu::java::security::prng::IRandom *);
+private:
+  jint getNextKeyWord(::gnu::java::security::prng::IRandom *);
+  void doFinalRound(::gnu::java::security::prng::IRandom *);
+public:
+  static ::java::lang::String * TAG_LENGTH;
+  static ::java::lang::String * KEYSTREAM;
+  static ::java::lang::String * PREFIX;
+private:
+  static const jint P = 65537;
+  static ::java::lang::Boolean * valid;
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) tagWords;
+  ::gnu::java::security::prng::IRandom * keystream;
+  JArray< jbyte > * prefix;
+  jlong keyWords;
+  jlong msgLength;
+  jlong msgWords;
+  JArray< jint > * context;
+  JArray< jint > * K0;
+  JArray< jint > * Ki;
+  jint Mi;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_TMMH16__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h
new file mode 100644
index 000000000..8df86621d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/UHash32$L1Hash32.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_UHash32$L1Hash32__
+#define __gnu_javax_crypto_mac_UHash32$L1Hash32__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class UHash32;
+            class UHash32$L1Hash32;
+            class UHash32$L2Hash32;
+            class UHash32$L3Hash32;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::UHash32$L1Hash32 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UHash32$L1Hash32(::gnu::javax::crypto::mac::UHash32 *);
+private:
+  UHash32$L1Hash32(::gnu::javax::crypto::mac::UHash32 *, ::gnu::javax::crypto::mac::UHash32$L1Hash32 *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void init(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+  virtual void update(jbyte);
+  virtual JArray< jbyte > * digest();
+  virtual void reset();
+private:
+  JArray< jbyte > * nh32(jint);
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key;
+  JArray< jbyte > * buffer;
+  jint count;
+  ::java::io::ByteArrayOutputStream * Y;
+  jlong totalCount;
+  ::gnu::javax::crypto::mac::UHash32$L2Hash32 * l2hash;
+  ::gnu::javax::crypto::mac::UHash32$L3Hash32 * l3hash;
+public: // actually package-private
+  ::gnu::javax::crypto::mac::UHash32 * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_UHash32$L1Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h
new file mode 100644
index 000000000..1971adda4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/UHash32$L2Hash32.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_UHash32$L2Hash32__
+#define __gnu_javax_crypto_mac_UHash32$L2Hash32__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class UHash32;
+            class UHash32$L2Hash32;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::UHash32$L2Hash32 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UHash32$L2Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jbyte > *);
+private:
+  UHash32$L2Hash32(::gnu::javax::crypto::mac::UHash32 *, ::gnu::javax::crypto::mac::UHash32$L2Hash32 *);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  virtual void reset();
+private:
+  JArray< jbyte > * yTo16bytes();
+  void poly(jint, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< jbyte > *, jint, jint);
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k64;
+  ::java::math::BigInteger * k128;
+  ::java::math::BigInteger * y;
+  jboolean highBound;
+  jlong bytesSoFar;
+  ::java::io::ByteArrayOutputStream * buffer;
+public: // actually package-private
+  ::gnu::javax::crypto::mac::UHash32 * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_UHash32$L2Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h b/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h
new file mode 100644
index 000000000..4e6b580b5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/UHash32$L3Hash32.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_UHash32$L3Hash32__
+#define __gnu_javax_crypto_mac_UHash32$L3Hash32__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class UHash32;
+            class UHash32$L3Hash32;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::UHash32$L3Hash32 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  UHash32$L3Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jbyte > *, JArray< jbyte > *);
+private:
+  UHash32$L3Hash32(::gnu::javax::crypto::mac::UHash32 *, JArray< jint > *);
+public:
+  virtual ::java::lang::Object * clone();
+public: // actually package-private
+  virtual JArray< jbyte > * digest(JArray< jbyte > *);
+private:
+  static const jlong PRIME_36 = 68719476731LL;
+  JArray< jint > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) k;
+public: // actually package-private
+  ::gnu::javax::crypto::mac::UHash32 * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_UHash32$L3Hash32__
diff --git a/libjava/gnu/javax/crypto/mac/UHash32.h b/libjava/gnu/javax/crypto/mac/UHash32.h
new file mode 100644
index 000000000..0b2be15f4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/UHash32.h
@@ -0,0 +1,73 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_UHash32__
+#define __gnu_javax_crypto_mac_UHash32__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mac/BaseMac.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class UHash32;
+            class UHash32$L1Hash32;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::UHash32 : public ::gnu::javax::crypto::mac::BaseMac
+{
+
+public:
+  UHash32();
+private:
+  UHash32(::gnu::javax::crypto::mac::UHash32 *);
+public: // actually package-private
+  static ::java::math::BigInteger * prime(jint);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual jint macSize();
+  virtual void init(::java::util::Map *);
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  virtual void reset();
+  virtual jboolean selfTest();
+private:
+  static ::java::math::BigInteger * PRIME_19;
+  static ::java::math::BigInteger * PRIME_32;
+  static ::java::math::BigInteger * PRIME_36;
+  static ::java::math::BigInteger * PRIME_64;
+  static ::java::math::BigInteger * PRIME_128;
+public: // actually package-private
+  static ::java::math::BigInteger * TWO;
+  static jlong BOUNDARY;
+  static ::java::math::BigInteger * LOWER_RANGE;
+  static ::java::math::BigInteger * UPPER_RANGE;
+  static JArray< jbyte > * ALL_ZEROES;
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) streams;
+  JArray< ::gnu::javax::crypto::mac::UHash32$L1Hash32 * > * l1hash;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_UHash32__
diff --git a/libjava/gnu/javax/crypto/mac/UMac32.h b/libjava/gnu/javax/crypto/mac/UMac32.h
new file mode 100644
index 000000000..7cec99eff
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mac/UMac32.h
@@ -0,0 +1,74 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mac_UMac32__
+#define __gnu_javax_crypto_mac_UMac32__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mac/BaseMac.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class UHash32;
+            class UMac32;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::mac::UMac32 : public ::gnu::javax::crypto::mac::BaseMac
+{
+
+public:
+  UMac32();
+private:
+  UMac32(::gnu::javax::crypto::mac::UMac32 *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual jint macSize();
+  virtual void init(::java::util::Map *);
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * digest();
+  virtual void reset();
+  virtual jboolean selfTest();
+private:
+  JArray< jbyte > * pdf();
+public:
+  static ::java::lang::String * NONCE_MATERIAL;
+private:
+  static ::java::lang::String * TV1;
+  static ::java::math::BigInteger * MAX_NONCE_ITERATIONS;
+public: // actually package-private
+  static const jint OUTPUT_LEN = 8;
+  static const jint L1_KEY_LEN = 1024;
+  static const jint KEY_LEN = 16;
+private:
+  static ::java::lang::Boolean * valid;
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mac::BaseMac)))) nonce;
+  ::gnu::javax::crypto::mac::UHash32 * uhash32;
+  ::java::math::BigInteger * nonceReuseCount;
+  JArray< jbyte > * K;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mac_UMac32__
diff --git a/libjava/gnu/javax/crypto/mode/BaseMode.h b/libjava/gnu/javax/crypto/mode/BaseMode.h
new file mode 100644
index 000000000..25ad4aaf0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/BaseMode.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_BaseMode__
+#define __gnu_javax_crypto_mode_BaseMode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class BaseMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::BaseMode : public ::java::lang::Object
+{
+
+public: // actually protected
+  BaseMode(::java::lang::String *, ::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+public:
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual ::java::lang::String * name();
+  virtual jint defaultBlockSize();
+  virtual jint defaultKeySize();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize();
+  virtual void reset();
+  virtual jboolean selfTest();
+  virtual ::java::lang::Object * clone() = 0;
+  virtual void setup() = 0;
+  virtual void teardown() = 0;
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+private:
+  jboolean testSymmetry(jint, jint);
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+  jint state;
+  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
+  jint cipherBlockSize;
+  jint modeBlockSize;
+  JArray< jbyte > * iv;
+  ::java::lang::Object * lock;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_BaseMode__
diff --git a/libjava/gnu/javax/crypto/mode/CBC.h b/libjava/gnu/javax/crypto/mode/CBC.h
new file mode 100644
index 000000000..24126a67b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/CBC.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_CBC__
+#define __gnu_javax_crypto_mode_CBC__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class CBC;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::CBC : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  CBC(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  CBC(::gnu::javax::crypto::mode::CBC *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) lastBlock;
+  JArray< jbyte > * scratch;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_CBC__
diff --git a/libjava/gnu/javax/crypto/mode/CFB.h b/libjava/gnu/javax/crypto/mode/CFB.h
new file mode 100644
index 000000000..3931a9b2d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/CFB.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_CFB__
+#define __gnu_javax_crypto_mode_CFB__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class CFB;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::CFB : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  CFB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  CFB(::gnu::javax::crypto::mode::CFB *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) shiftRegister;
+  JArray< jbyte > * scratch;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_CFB__
diff --git a/libjava/gnu/javax/crypto/mode/CTR.h b/libjava/gnu/javax/crypto/mode/CTR.h
new file mode 100644
index 000000000..3bb11e642
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/CTR.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_CTR__
+#define __gnu_javax_crypto_mode_CTR__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class CTR;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::CTR : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  CTR(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  CTR(::gnu::javax::crypto::mode::CTR *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual ::java::util::Iterator * blockSizes();
+private:
+  void ctr(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  jint __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) off;
+  JArray< jbyte > * counter;
+  JArray< jbyte > * enc;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_CTR__
diff --git a/libjava/gnu/javax/crypto/mode/EAX.h b/libjava/gnu/javax/crypto/mode/EAX.h
new file mode 100644
index 000000000..d47f07b41
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/EAX.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_EAX__
+#define __gnu_javax_crypto_mode_EAX__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mac
+        {
+            class IMac;
+        }
+        namespace mode
+        {
+            class EAX;
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::EAX : public ::java::lang::Object
+{
+
+public:
+  EAX(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+  virtual ::java::lang::Object * clone();
+  virtual ::java::lang::String * name();
+  virtual jint defaultBlockSize();
+  virtual jint defaultKeySize();
+  virtual ::java::util::Iterator * blockSizes();
+  virtual ::java::util::Iterator * keySizes();
+  virtual void init(::java::util::Map *);
+  virtual jint currentBlockSize();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void reset();
+  virtual jboolean selfTest();
+  virtual jint macSize();
+  virtual JArray< jbyte > * digest();
+  virtual void digest(JArray< jbyte > *, jint);
+  virtual void update(jbyte);
+  virtual void update(JArray< jbyte > *, jint, jint);
+private:
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) tagSize;
+  ::gnu::javax::crypto::mac::IMac * nonceOmac;
+  ::gnu::javax::crypto::mac::IMac * headerOmac;
+  ::gnu::javax::crypto::mac::IMac * msgOmac;
+  ::gnu::javax::crypto::mode::IMode * ctr;
+  jint state;
+  jboolean init__;
+  jint cipherBlockSize;
+  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
+  JArray< jbyte > * t_n;
+  static jboolean valid;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_EAX__
diff --git a/libjava/gnu/javax/crypto/mode/ECB.h b/libjava/gnu/javax/crypto/mode/ECB.h
new file mode 100644
index 000000000..ddde9c777
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/ECB.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_ECB__
+#define __gnu_javax_crypto_mode_ECB__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class ECB;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::ECB : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  ECB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  ECB(::gnu::javax::crypto::mode::ECB *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_ECB__
diff --git a/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h b/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h
new file mode 100644
index 000000000..7954ce83d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/IAuthenticatedMode.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_IAuthenticatedMode__
+#define __gnu_javax_crypto_mode_IAuthenticatedMode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mode
+        {
+            class IAuthenticatedMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::IAuthenticatedMode : public ::java::lang::Object
+{
+
+public:
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual ::java::lang::String * name() = 0;
+  virtual jint defaultBlockSize() = 0;
+  virtual jint defaultKeySize() = 0;
+  virtual ::java::util::Iterator * blockSizes() = 0;
+  virtual ::java::util::Iterator * keySizes() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual jint currentBlockSize() = 0;
+  virtual void reset() = 0;
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual jboolean selfTest() = 0;
+  virtual jint macSize() = 0;
+  virtual void update(jbyte) = 0;
+  virtual void update(JArray< jbyte > *, jint, jint) = 0;
+  virtual JArray< jbyte > * digest() = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_mode_IAuthenticatedMode__
diff --git a/libjava/gnu/javax/crypto/mode/ICM.h b/libjava/gnu/javax/crypto/mode/ICM.h
new file mode 100644
index 000000000..ee18743e8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/ICM.h
@@ -0,0 +1,64 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_ICM__
+#define __gnu_javax_crypto_mode_ICM__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class ICM;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::ICM : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  ICM(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  ICM(::gnu::javax::crypto::mode::ICM *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+private:
+  void icm(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  static ::java::math::BigInteger * TWO_FIFTY_SIX;
+  ::java::math::BigInteger * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) maxBlocksPerSegment;
+  ::java::math::BigInteger * counterRange;
+  ::java::math::BigInteger * C0;
+  ::java::math::BigInteger * blockNdx;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_ICM__
diff --git a/libjava/gnu/javax/crypto/mode/IMode.h b/libjava/gnu/javax/crypto/mode/IMode.h
new file mode 100644
index 000000000..8ee59c1ff
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/IMode.h
@@ -0,0 +1,53 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_IMode__
+#define __gnu_javax_crypto_mode_IMode__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mode
+        {
+            class IMode;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::IMode : public ::java::lang::Object
+{
+
+public:
+  virtual void update(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual ::java::lang::String * name() = 0;
+  virtual jint defaultBlockSize() = 0;
+  virtual jint defaultKeySize() = 0;
+  virtual ::java::util::Iterator * blockSizes() = 0;
+  virtual ::java::util::Iterator * keySizes() = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual jint currentBlockSize() = 0;
+  virtual void reset() = 0;
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint) = 0;
+  virtual jboolean selfTest() = 0;
+  static ::java::lang::String * STATE;
+  static ::java::lang::String * MODE_BLOCK_SIZE;
+  static ::java::lang::String * IV;
+  static const jint ENCRYPTION = 1;
+  static const jint DECRYPTION = 2;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_mode_IMode__
diff --git a/libjava/gnu/javax/crypto/mode/ModeFactory.h b/libjava/gnu/javax/crypto/mode/ModeFactory.h
new file mode 100644
index 000000000..d3f694e66
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/ModeFactory.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_ModeFactory__
+#define __gnu_javax_crypto_mode_ModeFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class IMode;
+            class ModeFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::ModeFactory : public ::java::lang::Object
+{
+
+  ModeFactory();
+public:
+  static ::gnu::javax::crypto::mode::IMode * getInstance(::java::lang::String *, ::java::lang::String *, jint);
+  static ::gnu::javax::crypto::mode::IMode * getInstance(::java::lang::String *, ::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+  static ::java::util::Set * getNames();
+private:
+  static ::java::util::Set * names;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_ModeFactory__
diff --git a/libjava/gnu/javax/crypto/mode/OFB.h b/libjava/gnu/javax/crypto/mode/OFB.h
new file mode 100644
index 000000000..04bbaece8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/mode/OFB.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_mode_OFB__
+#define __gnu_javax_crypto_mode_OFB__
+
+#pragma interface
+
+#include <gnu/javax/crypto/mode/BaseMode.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace mode
+        {
+            class OFB;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::mode::OFB : public ::gnu::javax::crypto::mode::BaseMode
+{
+
+public: // actually package-private
+  OFB(::gnu::javax::crypto::cipher::IBlockCipher *, jint);
+private:
+  OFB(::gnu::javax::crypto::mode::OFB *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup();
+  virtual void teardown();
+  virtual void encryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+  virtual void decryptBlock(JArray< jbyte > *, jint, JArray< jbyte > *, jint);
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::mode::BaseMode)))) outputBlock;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_mode_OFB__
diff --git a/libjava/gnu/javax/crypto/pad/BasePad.h b/libjava/gnu/javax/crypto/pad/BasePad.h
new file mode 100644
index 000000000..130b4000b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/BasePad.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_BasePad__
+#define __gnu_javax_crypto_pad_BasePad__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class BasePad;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::BasePad : public ::java::lang::Object
+{
+
+public: // actually protected
+  BasePad(::java::lang::String *);
+public:
+  virtual ::java::lang::String * name();
+  virtual void init(jint);
+  virtual void init(::java::util::Map *);
+  virtual void reset();
+  virtual jboolean selfTest();
+public: // actually protected
+  virtual jboolean test1BlockSize(jint, JArray< jbyte > *);
+public:
+  virtual void setup() = 0;
+  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint) = 0;
+  virtual jint unpad(JArray< jbyte > *, jint, jint) = 0;
+private:
+  static ::java::util::logging::Logger * log;
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name__;
+  jint blockSize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_BasePad__
diff --git a/libjava/gnu/javax/crypto/pad/IPad.h b/libjava/gnu/javax/crypto/pad/IPad.h
new file mode 100644
index 000000000..67e298924
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/IPad.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_IPad__
+#define __gnu_javax_crypto_pad_IPad__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class IPad;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::IPad : public ::java::lang::Object
+{
+
+public:
+  virtual ::java::lang::String * name() = 0;
+  virtual void init(jint) = 0;
+  virtual void init(::java::util::Map *) = 0;
+  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint) = 0;
+  virtual jint unpad(JArray< jbyte > *, jint, jint) = 0;
+  virtual void reset() = 0;
+  virtual jboolean selfTest() = 0;
+  static ::java::lang::String * PADDING_BLOCK_SIZE;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_pad_IPad__
diff --git a/libjava/gnu/javax/crypto/pad/ISO10126.h b/libjava/gnu/javax/crypto/pad/ISO10126.h
new file mode 100644
index 000000000..2d7debaa4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/ISO10126.h
@@ -0,0 +1,55 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_ISO10126__
+#define __gnu_javax_crypto_pad_ISO10126__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class ISO10126;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::ISO10126 : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public: // actually package-private
+  ISO10126();
+public:
+  void setup();
+  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  jint unpad(JArray< jbyte > *, jint, jint);
+  jboolean selfTest();
+private:
+  ::gnu::java::security::util::PRNG * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::pad::BasePad)))) prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_ISO10126__
diff --git a/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h b/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h
new file mode 100644
index 000000000..b681a0fa3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/PKCS1_V1_5.h
@@ -0,0 +1,59 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_PKCS1_V1_5__
+#define __gnu_javax_crypto_pad_PKCS1_V1_5__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace sig
+        {
+          namespace rsa
+          {
+              class EME_PKCS1_V1_5;
+          }
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class PKCS1_V1_5;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::PKCS1_V1_5 : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public: // actually package-private
+  PKCS1_V1_5();
+public:
+  virtual void setup();
+  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  virtual jint unpad(JArray< jbyte > *, jint, jint);
+  virtual jboolean selfTest();
+private:
+  static ::java::util::logging::Logger * log;
+  ::gnu::java::security::sig::rsa::EME_PKCS1_V1_5 * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::pad::BasePad)))) codec;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_PKCS1_V1_5__
diff --git a/libjava/gnu/javax/crypto/pad/PKCS7.h b/libjava/gnu/javax/crypto/pad/PKCS7.h
new file mode 100644
index 000000000..609d4b35b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/PKCS7.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_PKCS7__
+#define __gnu_javax_crypto_pad_PKCS7__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class PKCS7;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::PKCS7 : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public: // actually package-private
+  PKCS7();
+public:
+  void setup();
+  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  jint unpad(JArray< jbyte > *, jint, jint);
+private:
+  static ::java::util::logging::Logger * log;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_PKCS7__
diff --git a/libjava/gnu/javax/crypto/pad/PadFactory.h b/libjava/gnu/javax/crypto/pad/PadFactory.h
new file mode 100644
index 000000000..fea2a3b09
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/PadFactory.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_PadFactory__
+#define __gnu_javax_crypto_pad_PadFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class IPad;
+            class PadFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::PadFactory : public ::java::lang::Object
+{
+
+  PadFactory();
+public:
+  static ::gnu::javax::crypto::pad::IPad * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+private:
+  static ::java::util::Set * names;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_PadFactory__
diff --git a/libjava/gnu/javax/crypto/pad/SSL3.h b/libjava/gnu/javax/crypto/pad/SSL3.h
new file mode 100644
index 000000000..1154d8ed8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/SSL3.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_SSL3__
+#define __gnu_javax_crypto_pad_SSL3__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class SSL3;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::SSL3 : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public:
+  SSL3();
+  virtual void setup();
+  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  virtual jint unpad(JArray< jbyte > *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_SSL3__
diff --git a/libjava/gnu/javax/crypto/pad/TBC.h b/libjava/gnu/javax/crypto/pad/TBC.h
new file mode 100644
index 000000000..099c05a82
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/TBC.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_TBC__
+#define __gnu_javax_crypto_pad_TBC__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class TBC;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::TBC : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public: // actually package-private
+  TBC();
+public:
+  void setup();
+  JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  jint unpad(JArray< jbyte > *, jint, jint);
+private:
+  static ::java::util::logging::Logger * log;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_TBC__
diff --git a/libjava/gnu/javax/crypto/pad/TLS1.h b/libjava/gnu/javax/crypto/pad/TLS1.h
new file mode 100644
index 000000000..0f361fc51
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/TLS1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_TLS1__
+#define __gnu_javax_crypto_pad_TLS1__
+
+#pragma interface
+
+#include <gnu/javax/crypto/pad/BasePad.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class TLS1;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::TLS1 : public ::gnu::javax::crypto::pad::BasePad
+{
+
+public:
+  TLS1();
+  virtual void setup();
+  virtual JArray< jbyte > * pad(JArray< jbyte > *, jint, jint);
+  virtual jint unpad(JArray< jbyte > *, jint, jint);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_TLS1__
diff --git a/libjava/gnu/javax/crypto/pad/WrongPaddingException.h b/libjava/gnu/javax/crypto/pad/WrongPaddingException.h
new file mode 100644
index 000000000..16a9b331b
--- /dev/null
+++ b/libjava/gnu/javax/crypto/pad/WrongPaddingException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_pad_WrongPaddingException__
+#define __gnu_javax_crypto_pad_WrongPaddingException__
+
+#pragma interface
+
+#include <java/lang/Exception.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace pad
+        {
+            class WrongPaddingException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::pad::WrongPaddingException : public ::java::lang::Exception
+{
+
+public:
+  WrongPaddingException();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_pad_WrongPaddingException__
diff --git a/libjava/gnu/javax/crypto/prng/ARCFour.h b/libjava/gnu/javax/crypto/prng/ARCFour.h
new file mode 100644
index 000000000..097b0b367
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/ARCFour.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_ARCFour__
+#define __gnu_javax_crypto_prng_ARCFour__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class ARCFour;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::ARCFour : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  ARCFour();
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+  static ::java::lang::String * ARCFOUR_KEY_MATERIAL;
+  static const jint ARCFOUR_SBOX_SIZE = 256;
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) s;
+  jbyte m;
+  jbyte n;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_ARCFour__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$1.h b/libjava/gnu/javax/crypto/prng/CSPRNG$1.h
new file mode 100644
index 000000000..bfad93aff
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/CSPRNG$1.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_CSPRNG$1__
+#define __gnu_javax_crypto_prng_CSPRNG$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class CSPRNG$1;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::CSPRNG$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CSPRNG$1(::java::lang::String *);
+public:
+  virtual ::java::lang::Object * run();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) val$name;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_CSPRNG$1__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h b/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h
new file mode 100644
index 000000000..823b08baa
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/CSPRNG$Poller.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_CSPRNG$Poller__
+#define __gnu_javax_crypto_prng_CSPRNG$Poller__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class CSPRNG;
+            class CSPRNG$Poller;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::CSPRNG$Poller : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CSPRNG$Poller(::gnu::javax::crypto::prng::CSPRNG *, ::java::util::List *, ::java::util::List *, ::java::util::List *, ::java::util::List *, ::gnu::javax::crypto::prng::CSPRNG *);
+public:
+  void run();
+  void stopUpdating();
+private:
+  ::java::util::List * __attribute__((aligned(__alignof__( ::java::lang::Object)))) files;
+  ::java::util::List * urls;
+  ::java::util::List * progs;
+  ::java::util::List * other;
+  ::gnu::javax::crypto::prng::CSPRNG * pool;
+  jboolean running;
+public: // actually package-private
+  ::gnu::javax::crypto::prng::CSPRNG * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_CSPRNG$Poller__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h b/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h
new file mode 100644
index 000000000..305d9cac8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/CSPRNG$Spinner.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_CSPRNG$Spinner__
+#define __gnu_javax_crypto_prng_CSPRNG$Spinner__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class CSPRNG$Spinner;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::CSPRNG$Spinner : public ::java::lang::Object
+{
+
+  CSPRNG$Spinner();
+public:
+  virtual void run();
+public: // actually package-private
+  CSPRNG$Spinner(::gnu::javax::crypto::prng::CSPRNG$Spinner *);
+public: // actually protected
+  jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) counter;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_CSPRNG$Spinner__
diff --git a/libjava/gnu/javax/crypto/prng/CSPRNG.h b/libjava/gnu/javax/crypto/prng/CSPRNG.h
new file mode 100644
index 000000000..4773413e6
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/CSPRNG.h
@@ -0,0 +1,121 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_CSPRNG__
+#define __gnu_javax_crypto_prng_CSPRNG__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace prng
+        {
+            class CSPRNG;
+            class CSPRNG$Poller;
+            class CSPRNG$Spinner;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::CSPRNG : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  CSPRNG();
+  static ::gnu::java::security::prng::IRandom * getSystemInstance();
+private:
+  static ::java::lang::String * getProperty(::java::lang::String *);
+  static ::java::util::List * parseString(::java::lang::String *);
+  static ::java::util::List * parseURL(::java::lang::String *);
+public:
+  virtual ::java::lang::Object * clone();
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
+  virtual void addRandomByte(jbyte);
+public: // actually package-private
+  virtual void addQuality(jdouble);
+  virtual jdouble getQuality();
+private:
+  void mixRandomPool(JArray< jbyte > *);
+  void mixRandomPool();
+  void generateX917(JArray< jbyte > *);
+  void fastPoll();
+  void slowPoll();
+public: // actually protected
+  virtual void finalize();
+private:
+  static ::java::util::logging::Logger * log;
+public:
+  static ::java::lang::String * FILE_SOURCES;
+  static ::java::lang::String * URL_SOURCES;
+  static ::java::lang::String * PROGRAM_SOURCES;
+  static ::java::lang::String * OTHER_SOURCES;
+  static ::java::lang::String * BLOCKING;
+private:
+  static ::java::lang::String * FILES;
+  static ::java::lang::String * URLS;
+  static ::java::lang::String * PROGS;
+  static ::java::lang::String * OTHER;
+  static ::java::lang::String * BLOCK;
+  static const jint POOL_SIZE = 256;
+  static const jint ALLOC_SIZE = 260;
+  static const jint OUTPUT_SIZE = 128;
+  static const jint X917_POOL_SIZE = 16;
+  static ::java::lang::String * HASH_FUNCTION;
+  static ::java::lang::String * CIPHER;
+  static const jint MIX_COUNT = 10;
+  static const jint X917_LIFETIME = 8192;
+  static const jint SPINNER_COUNT = 8;
+  static JArray< ::gnu::javax::crypto::prng::CSPRNG$Spinner * > * SPINNERS;
+  static JArray< ::java::lang::Thread * > * SPINNER_THREADS;
+  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) hash;
+  ::gnu::javax::crypto::cipher::IBlockCipher * cipher;
+  jint mixCount;
+  JArray< jbyte > * pool;
+  jdouble quality;
+  jint index;
+  JArray< jbyte > * x917pool;
+  jint x917count;
+  jboolean x917init;
+  ::java::util::List * files;
+  ::java::util::List * urls;
+  ::java::util::List * progs;
+  ::java::util::List * other;
+  jboolean blocking;
+  ::gnu::javax::crypto::prng::CSPRNG$Poller * poller;
+  ::java::lang::Thread * pollerThread;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_CSPRNG__
diff --git a/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h b/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h
new file mode 100644
index 000000000..1507af34f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/Fortuna$Generator.h
@@ -0,0 +1,67 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_Fortuna$Generator__
+#define __gnu_javax_crypto_prng_Fortuna$Generator__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace prng
+        {
+            class Fortuna$Generator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::Fortuna$Generator : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  Fortuna$Generator(::gnu::javax::crypto::cipher::IBlockCipher *, ::gnu::java::security::hash::IMessageDigest *);
+  virtual jbyte nextByte();
+  virtual void nextBytes(JArray< jbyte > *, jint, jint);
+  virtual void addRandomByte(jbyte);
+  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
+  virtual void fillBlock();
+  virtual void setup(::java::util::Map *);
+private:
+  void resetKey();
+  void incrementCounter();
+  static const jint LIMIT = 1048576;
+  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
+  ::gnu::java::security::hash::IMessageDigest * hash;
+  JArray< jbyte > * counter;
+  JArray< jbyte > * key;
+  jboolean seeded;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_Fortuna$Generator__
diff --git a/libjava/gnu/javax/crypto/prng/Fortuna.h b/libjava/gnu/javax/crypto/prng/Fortuna.h
new file mode 100644
index 000000000..aab98c709
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/Fortuna.h
@@ -0,0 +1,72 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_Fortuna__
+#define __gnu_javax_crypto_prng_Fortuna__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+        namespace prng
+        {
+            class RandomEvent;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class Fortuna;
+            class Fortuna$Generator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::Fortuna : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  Fortuna();
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+  virtual void addRandomByte(jbyte);
+  virtual void addRandomBytes(JArray< jbyte > *, jint, jint);
+  virtual void addRandomEvent(::gnu::java::security::prng::RandomEvent *);
+private:
+  void writeObject(::java::io::ObjectOutputStream *);
+  void readObject(::java::io::ObjectInputStream *);
+  static const jlong serialVersionUID = 16435934LL;
+  static const jint SEED_FILE_SIZE = 64;
+  static const jint NUM_POOLS = 32;
+  static const jint MIN_POOL_SIZE = 64;
+  ::gnu::javax::crypto::prng::Fortuna$Generator * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) generator;
+  JArray< ::gnu::java::security::hash::IMessageDigest * > * pools;
+  jlong lastReseed;
+  jint pool;
+  jint pool0Count;
+  jint reseedCount;
+public:
+  static ::java::lang::String * SEED;
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_Fortuna__
diff --git a/libjava/gnu/javax/crypto/prng/ICMGenerator.h b/libjava/gnu/javax/crypto/prng/ICMGenerator.h
new file mode 100644
index 000000000..e69f6c090
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/ICMGenerator.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_ICMGenerator__
+#define __gnu_javax_crypto_prng_ICMGenerator__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace prng
+        {
+            class ICMGenerator;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::ICMGenerator : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  ICMGenerator();
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+  static ::java::lang::String * CIPHER;
+  static ::java::lang::String * BLOCK_INDEX_LENGTH;
+  static ::java::lang::String * SEGMENT_INDEX_LENGTH;
+  static ::java::lang::String * OFFSET;
+  static ::java::lang::String * SEGMENT_INDEX;
+private:
+  static ::java::math::BigInteger * TWO_FIFTY_SIX;
+  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
+  jint blockNdxLength;
+  jint segmentNdxLength;
+  ::java::math::BigInteger * blockNdx;
+  ::java::math::BigInteger * segmentNdx;
+  ::java::math::BigInteger * C0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_ICMGenerator__
diff --git a/libjava/gnu/javax/crypto/prng/IPBE.h b/libjava/gnu/javax/crypto/prng/IPBE.h
new file mode 100644
index 000000000..4fae1c4b1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/IPBE.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_IPBE__
+#define __gnu_javax_crypto_prng_IPBE__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class IPBE;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::IPBE : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::String * ITERATION_COUNT;
+  static ::java::lang::String * PASSWORD;
+  static ::java::lang::String * PASSWORD_ENCODING;
+  static ::java::lang::String * SALT;
+  static ::java::lang::String * DEFAULT_PASSWORD_ENCODING;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_prng_IPBE__
diff --git a/libjava/gnu/javax/crypto/prng/PBKDF2.h b/libjava/gnu/javax/crypto/prng/PBKDF2.h
new file mode 100644
index 000000000..209d69523
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/PBKDF2.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_PBKDF2__
+#define __gnu_javax_crypto_prng_PBKDF2__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+        }
+        namespace prng
+        {
+            class PBKDF2;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::PBKDF2 : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  PBKDF2(::gnu::javax::crypto::mac::IMac *);
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+private:
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) in;
+  jint iterationCount;
+  JArray< jbyte > * salt;
+  ::gnu::javax::crypto::mac::IMac * mac;
+  jlong count;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_PBKDF2__
diff --git a/libjava/gnu/javax/crypto/prng/PRNGFactory.h b/libjava/gnu/javax/crypto/prng/PRNGFactory.h
new file mode 100644
index 000000000..76d9e2623
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/PRNGFactory.h
@@ -0,0 +1,47 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_PRNGFactory__
+#define __gnu_javax_crypto_prng_PRNGFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace prng
+        {
+            class IRandom;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class PRNGFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::PRNGFactory : public ::java::lang::Object
+{
+
+  PRNGFactory();
+public:
+  static ::gnu::java::security::prng::IRandom * getInstance(::java::lang::String *);
+  static ::java::util::Set * getNames();
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_PRNGFactory__
diff --git a/libjava/gnu/javax/crypto/prng/UMacGenerator.h b/libjava/gnu/javax/crypto/prng/UMacGenerator.h
new file mode 100644
index 000000000..3da98cdf8
--- /dev/null
+++ b/libjava/gnu/javax/crypto/prng/UMacGenerator.h
@@ -0,0 +1,46 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_prng_UMacGenerator__
+#define __gnu_javax_crypto_prng_UMacGenerator__
+
+#pragma interface
+
+#include <gnu/java/security/prng/BasePRNG.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace cipher
+        {
+            class IBlockCipher;
+        }
+        namespace prng
+        {
+            class UMacGenerator;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::prng::UMacGenerator : public ::gnu::java::security::prng::BasePRNG
+{
+
+public:
+  UMacGenerator();
+  virtual void setup(::java::util::Map *);
+  virtual void fillBlock();
+  static ::java::lang::String * INDEX;
+  static ::java::lang::String * CIPHER;
+private:
+  ::gnu::javax::crypto::cipher::IBlockCipher * __attribute__((aligned(__alignof__( ::gnu::java::security::prng::BasePRNG)))) cipher;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_prng_UMacGenerator__
diff --git a/libjava/gnu/javax/crypto/sasl/AuthInfo.h b/libjava/gnu/javax/crypto/sasl/AuthInfo.h
new file mode 100644
index 000000000..39fa49b45
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/AuthInfo.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_AuthInfo__
+#define __gnu_javax_crypto_sasl_AuthInfo__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class AuthInfo;
+            class IAuthInfoProvider;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::AuthInfo : public ::java::lang::Object
+{
+
+  AuthInfo();
+public:
+  static ::gnu::javax::crypto::sasl::IAuthInfoProvider * getProvider(::java::lang::String *);
+private:
+  static ::java::util::ArrayList * factories;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_AuthInfo__
diff --git a/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h b/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h
new file mode 100644
index 000000000..5431e6178
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/AuthInfoProviderFactory.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
+#define __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class AuthInfoProviderFactory;
+            class IAuthInfoProvider;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::AuthInfoProviderFactory : public ::java::lang::Object
+{
+
+public:
+  AuthInfoProviderFactory();
+  virtual ::gnu::javax::crypto::sasl::IAuthInfoProvider * getInstance(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_AuthInfoProviderFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ClientFactory.h b/libjava/gnu/javax/crypto/sasl/ClientFactory.h
new file mode 100644
index 000000000..a74916a93
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/ClientFactory.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_ClientFactory__
+#define __gnu_javax_crypto_sasl_ClientFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class ClientFactory;
+            class ClientMechanism;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace auth
+      {
+        namespace callback
+        {
+            class CallbackHandler;
+        }
+      }
+      namespace sasl
+      {
+          class SaslClient;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::ClientFactory : public ::java::lang::Object
+{
+
+public:
+  ClientFactory();
+  static ::java::util::Set * getNames();
+private:
+  static JArray< ::java::lang::String * > * getNamesInternal(::java::util::Map *);
+public:
+  static ::gnu::javax::crypto::sasl::ClientMechanism * getInstance(::java::lang::String *);
+  virtual ::javax::security::sasl::SaslClient * createSaslClient(JArray< ::java::lang::String * > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
+  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *);
+private:
+  static jboolean hasPolicy(::java::lang::String *, ::java::util::Map *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_ClientFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ClientMechanism.h b/libjava/gnu/javax/crypto/sasl/ClientMechanism.h
new file mode 100644
index 000000000..b1bd010be
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/ClientMechanism.h
@@ -0,0 +1,91 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_ClientMechanism__
+#define __gnu_javax_crypto_sasl_ClientMechanism__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class ClientMechanism;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace auth
+      {
+        namespace callback
+        {
+            class CallbackHandler;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::ClientMechanism : public ::java::lang::Object
+{
+
+public: // actually protected
+  ClientMechanism(::java::lang::String *);
+  virtual void initMechanism() = 0;
+  virtual void resetMechanism() = 0;
+public:
+  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *) = 0;
+  virtual jboolean hasInitialResponse() = 0;
+  virtual jboolean isComplete();
+  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
+  virtual ::java::lang::String * getMechanismName();
+  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *);
+  virtual void dispose();
+  virtual ::java::lang::String * getAuthorizationID();
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+  virtual ::java::lang::String * getNegotiatedStrength();
+  virtual ::java::lang::String * getNegotiatedServerAuth();
+  virtual ::java::lang::String * getNegotiatedMaxBuffer();
+  virtual ::java::lang::String * getNegotiatedRawSendSize();
+  virtual ::java::lang::String * getNegotiatedPolicyNoPlainText();
+  virtual ::java::lang::String * getNegotiatedPolicyNoActive();
+  virtual ::java::lang::String * getNegotiatedPolicyNoDictionary();
+  virtual ::java::lang::String * getNegotiatedPolicyNoAnonymous();
+  virtual ::java::lang::String * getNegotiatedPolicyForwardSecrecy();
+  virtual ::java::lang::String * getNegotiatedPolicyPassCredentials();
+  virtual ::java::lang::String * getReuse();
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+public:
+  virtual void init(::java::util::Map *);
+  virtual void reset();
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mechanism;
+  ::java::lang::String * authorizationID;
+  ::java::lang::String * protocol;
+  ::java::lang::String * serverName;
+  ::java::util::Map * properties;
+  ::javax::security::auth::callback::CallbackHandler * handler;
+  JArray< jbyte > * channelBinding;
+  jboolean complete;
+  jint state;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_ClientMechanism__
diff --git a/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h b/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h
new file mode 100644
index 000000000..6c0019331
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/ConfidentialityException.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_ConfidentialityException__
+#define __gnu_javax_crypto_sasl_ConfidentialityException__
+
+#pragma interface
+
+#include <javax/security/sasl/SaslException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class ConfidentialityException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::ConfidentialityException : public ::javax::security::sasl::SaslException
+{
+
+public:
+  ConfidentialityException();
+  ConfidentialityException(::java::lang::String *);
+  ConfidentialityException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_ConfidentialityException__
diff --git a/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h
new file mode 100644
index 000000000..fbf8cee29
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/IAuthInfoProvider.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_IAuthInfoProvider__
+#define __gnu_javax_crypto_sasl_IAuthInfoProvider__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class IAuthInfoProvider;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::IAuthInfoProvider : public ::java::lang::Object
+{
+
+public:
+  virtual void activate(::java::util::Map *) = 0;
+  virtual void passivate() = 0;
+  virtual jboolean contains(::java::lang::String *) = 0;
+  virtual ::java::util::Map * lookup(::java::util::Map *) = 0;
+  virtual void update(::java::util::Map *) = 0;
+  virtual ::java::util::Map * getConfiguration(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_sasl_IAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h b/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h
new file mode 100644
index 000000000..7fcb4915f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/IAuthInfoProviderFactory.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
+#define __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class IAuthInfoProvider;
+            class IAuthInfoProviderFactory;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::IAuthInfoProviderFactory : public ::java::lang::Object
+{
+
+public:
+  virtual ::gnu::javax::crypto::sasl::IAuthInfoProvider * getInstance(::java::lang::String *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_sasl_IAuthInfoProviderFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h b/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h
new file mode 100644
index 000000000..0503f0d50
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/IllegalMechanismStateException.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_IllegalMechanismStateException__
+#define __gnu_javax_crypto_sasl_IllegalMechanismStateException__
+
+#pragma interface
+
+#include <javax/security/sasl/AuthenticationException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class IllegalMechanismStateException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::IllegalMechanismStateException : public ::javax::security::sasl::AuthenticationException
+{
+
+public:
+  IllegalMechanismStateException();
+  IllegalMechanismStateException(::java::lang::String *);
+  IllegalMechanismStateException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_IllegalMechanismStateException__
diff --git a/libjava/gnu/javax/crypto/sasl/InputBuffer.h b/libjava/gnu/javax/crypto/sasl/InputBuffer.h
new file mode 100644
index 000000000..d628f7a65
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/InputBuffer.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_InputBuffer__
+#define __gnu_javax_crypto_sasl_InputBuffer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class InputBuffer;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::InputBuffer : public ::java::lang::Object
+{
+
+public:
+  InputBuffer(JArray< jbyte > *);
+private:
+  InputBuffer();
+public:
+  static ::gnu::javax::crypto::sasl::InputBuffer * getInstance(JArray< jbyte > *);
+  static ::gnu::javax::crypto::sasl::InputBuffer * getInstance(JArray< jbyte > *, jint, jint);
+  static jint twoBytesToLength(JArray< jbyte > *);
+  virtual jboolean hasMoreElements();
+  virtual jlong getScalar(jint);
+  virtual JArray< jbyte > * getOS();
+  virtual JArray< jbyte > * getEOS();
+  virtual ::java::math::BigInteger * getMPI();
+  virtual ::java::lang::String * getText();
+public: // actually protected
+  ::java::io::ByteArrayInputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) in;
+  jint length;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_InputBuffer__
diff --git a/libjava/gnu/javax/crypto/sasl/IntegrityException.h b/libjava/gnu/javax/crypto/sasl/IntegrityException.h
new file mode 100644
index 000000000..5c66cb4a3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/IntegrityException.h
@@ -0,0 +1,37 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_IntegrityException__
+#define __gnu_javax_crypto_sasl_IntegrityException__
+
+#pragma interface
+
+#include <javax/security/sasl/SaslException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class IntegrityException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::IntegrityException : public ::javax::security::sasl::SaslException
+{
+
+public:
+  IntegrityException();
+  IntegrityException(::java::lang::String *);
+  IntegrityException(::java::lang::String *, ::java::lang::Throwable *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_IntegrityException__
diff --git a/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h b/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h
new file mode 100644
index 000000000..0668d16cf
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/NoSuchMechanismException.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_NoSuchMechanismException__
+#define __gnu_javax_crypto_sasl_NoSuchMechanismException__
+
+#pragma interface
+
+#include <javax/security/sasl/SaslException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class NoSuchMechanismException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::NoSuchMechanismException : public ::javax::security::sasl::SaslException
+{
+
+public:
+  NoSuchMechanismException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_NoSuchMechanismException__
diff --git a/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h b/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h
new file mode 100644
index 000000000..17bc8fc1d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/NoSuchUserException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_NoSuchUserException__
+#define __gnu_javax_crypto_sasl_NoSuchUserException__
+
+#pragma interface
+
+#include <javax/security/sasl/AuthenticationException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class NoSuchUserException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::NoSuchUserException : public ::javax::security::sasl::AuthenticationException
+{
+
+public:
+  NoSuchUserException();
+  NoSuchUserException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_NoSuchUserException__
diff --git a/libjava/gnu/javax/crypto/sasl/OutputBuffer.h b/libjava/gnu/javax/crypto/sasl/OutputBuffer.h
new file mode 100644
index 000000000..40cd18911
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/OutputBuffer.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_OutputBuffer__
+#define __gnu_javax_crypto_sasl_OutputBuffer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class OutputBuffer;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::OutputBuffer : public ::java::lang::Object
+{
+
+public:
+  OutputBuffer();
+  virtual void setScalar(jint, jint);
+  virtual void setOS(JArray< jbyte > *);
+  virtual void setEOS(JArray< jbyte > *);
+  virtual void setMPI(::java::math::BigInteger *);
+  virtual void setText(::java::lang::String *);
+  virtual JArray< jbyte > * encode();
+  virtual JArray< jbyte > * wrap();
+private:
+  ::java::io::ByteArrayOutputStream * __attribute__((aligned(__alignof__( ::java::lang::Object)))) out;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_OutputBuffer__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h b/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h
new file mode 100644
index 000000000..000b36799
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/SaslEncodingException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_SaslEncodingException__
+#define __gnu_javax_crypto_sasl_SaslEncodingException__
+
+#pragma interface
+
+#include <javax/security/sasl/SaslException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class SaslEncodingException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::SaslEncodingException : public ::javax::security::sasl::SaslException
+{
+
+public:
+  SaslEncodingException();
+  SaslEncodingException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_SaslEncodingException__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslInputStream.h b/libjava/gnu/javax/crypto/sasl/SaslInputStream.h
new file mode 100644
index 000000000..6a5c65319
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/SaslInputStream.h
@@ -0,0 +1,62 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_SaslInputStream__
+#define __gnu_javax_crypto_sasl_SaslInputStream__
+
+#pragma interface
+
+#include <java/io/InputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class SaslInputStream;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace sasl
+      {
+          class SaslClient;
+          class SaslServer;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::SaslInputStream : public ::java::io::InputStream
+{
+
+public:
+  SaslInputStream(::javax::security::sasl::SaslClient *, ::java::io::InputStream *);
+  SaslInputStream(::javax::security::sasl::SaslServer *, ::java::io::InputStream *);
+  virtual jint available();
+  virtual void close();
+  virtual jint read();
+  virtual jint read(JArray< jbyte > *, jint, jint);
+private:
+  JArray< jbyte > * readSaslBuffer();
+  static ::java::util::logging::Logger * log;
+  ::javax::security::sasl::SaslClient * __attribute__((aligned(__alignof__( ::java::io::InputStream)))) client;
+  ::javax::security::sasl::SaslServer * server;
+  jint maxRawSendSize;
+  ::java::io::InputStream * source;
+  JArray< jbyte > * internalBuf;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_SaslInputStream__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h b/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h
new file mode 100644
index 000000000..8d55853bd
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/SaslOutputStream.h
@@ -0,0 +1,60 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_SaslOutputStream__
+#define __gnu_javax_crypto_sasl_SaslOutputStream__
+
+#pragma interface
+
+#include <java/io/OutputStream.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class SaslOutputStream;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace sasl
+      {
+          class SaslClient;
+          class SaslServer;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::SaslOutputStream : public ::java::io::OutputStream
+{
+
+public:
+  SaslOutputStream(::javax::security::sasl::SaslClient *, ::java::io::OutputStream *);
+  SaslOutputStream(::javax::security::sasl::SaslServer *, ::java::io::OutputStream *);
+  virtual void close();
+  virtual void flush();
+  virtual void write(jint);
+  virtual void write(JArray< jbyte > *, jint, jint);
+private:
+  static ::java::util::logging::Logger * log;
+  ::javax::security::sasl::SaslClient * __attribute__((aligned(__alignof__( ::java::io::OutputStream)))) client;
+  ::javax::security::sasl::SaslServer * server;
+  jint maxRawSendSize;
+  ::java::io::OutputStream * dest;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_SaslOutputStream__
diff --git a/libjava/gnu/javax/crypto/sasl/SaslUtil.h b/libjava/gnu/javax/crypto/sasl/SaslUtil.h
new file mode 100644
index 000000000..3d043c051
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/SaslUtil.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_SaslUtil__
+#define __gnu_javax_crypto_sasl_SaslUtil__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class SaslUtil;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace security
+    {
+        class MessageDigest;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::SaslUtil : public ::java::lang::Object
+{
+
+  SaslUtil();
+public:
+  static jboolean validEmailAddress(::java::lang::String *);
+  static ::java::lang::String * dump(::java::security::MessageDigest *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_SaslUtil__
diff --git a/libjava/gnu/javax/crypto/sasl/ServerFactory.h b/libjava/gnu/javax/crypto/sasl/ServerFactory.h
new file mode 100644
index 000000000..00ee64508
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/ServerFactory.h
@@ -0,0 +1,65 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_ServerFactory__
+#define __gnu_javax_crypto_sasl_ServerFactory__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class ServerFactory;
+            class ServerMechanism;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace auth
+      {
+        namespace callback
+        {
+            class CallbackHandler;
+        }
+      }
+      namespace sasl
+      {
+          class SaslServer;
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::ServerFactory : public ::java::lang::Object
+{
+
+public:
+  ServerFactory();
+  static ::java::util::Set * getNames();
+private:
+  static JArray< ::java::lang::String * > * getNamesInternal(::java::util::Map *);
+public:
+  static ::gnu::javax::crypto::sasl::ServerMechanism * getInstance(::java::lang::String *);
+  virtual ::javax::security::sasl::SaslServer * createSaslServer(::java::lang::String *, ::java::lang::String *, ::java::lang::String *, ::java::util::Map *, ::javax::security::auth::callback::CallbackHandler *);
+  virtual JArray< ::java::lang::String * > * getMechanismNames(::java::util::Map *);
+private:
+  static jboolean hasPolicy(::java::lang::String *, ::java::util::Map *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_ServerFactory__
diff --git a/libjava/gnu/javax/crypto/sasl/ServerMechanism.h b/libjava/gnu/javax/crypto/sasl/ServerMechanism.h
new file mode 100644
index 000000000..4b7a196d2
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/ServerMechanism.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_ServerMechanism__
+#define __gnu_javax_crypto_sasl_ServerMechanism__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class IAuthInfoProvider;
+            class ServerMechanism;
+        }
+      }
+    }
+  }
+  namespace javax
+  {
+    namespace security
+    {
+      namespace auth
+      {
+        namespace callback
+        {
+            class CallbackHandler;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::ServerMechanism : public ::java::lang::Object
+{
+
+public: // actually protected
+  ServerMechanism(::java::lang::String *);
+  virtual void initMechanism() = 0;
+  virtual void resetMechanism() = 0;
+public:
+  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *) = 0;
+  virtual jboolean isComplete();
+  virtual JArray< jbyte > * unwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * wrap(JArray< jbyte > *, jint, jint);
+  virtual ::java::lang::String * getMechanismName();
+  virtual ::java::lang::String * getAuthorizationID();
+  virtual ::java::lang::Object * getNegotiatedProperty(::java::lang::String *);
+  virtual void dispose();
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+  virtual ::java::lang::String * getNegotiatedStrength();
+  virtual ::java::lang::String * getNegotiatedServerAuth();
+  virtual ::java::lang::String * getNegotiatedMaxBuffer();
+  virtual ::java::lang::String * getNegotiatedPolicyNoPlainText();
+  virtual ::java::lang::String * getNegotiatedPolicyNoActive();
+  virtual ::java::lang::String * getNegotiatedPolicyNoDictionary();
+  virtual ::java::lang::String * getNegotiatedPolicyNoAnonymous();
+  virtual ::java::lang::String * getNegotiatedPolicyForwardSecrecy();
+  virtual ::java::lang::String * getNegotiatedPolicyPassCredentials();
+  virtual ::java::lang::String * getNegotiatedRawSendSize();
+  virtual ::java::lang::String * getReuse();
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+public:
+  virtual void init(::java::util::Map *);
+  virtual void reset();
+public: // actually protected
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mechanism;
+  ::java::lang::String * protocol;
+  ::java::lang::String * serverName;
+  ::java::util::Map * properties;
+  ::javax::security::auth::callback::CallbackHandler * handler;
+  jboolean complete;
+  ::java::lang::String * authorizationID;
+  JArray< jbyte > * channelBinding;
+  jint state;
+  ::gnu::javax::crypto::sasl::IAuthInfoProvider * authenticator;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_ServerMechanism__
diff --git a/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h b/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h
new file mode 100644
index 000000000..89622a068
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/UserAlreadyExistsException.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_UserAlreadyExistsException__
+#define __gnu_javax_crypto_sasl_UserAlreadyExistsException__
+
+#pragma interface
+
+#include <javax/security/sasl/SaslException.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+            class UserAlreadyExistsException;
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::UserAlreadyExistsException : public ::javax::security::sasl::SaslException
+{
+
+public:
+  UserAlreadyExistsException();
+  UserAlreadyExistsException(::java::lang::String *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_UserAlreadyExistsException__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h
new file mode 100644
index 000000000..87aaded6f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousClient.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
+#define __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ClientMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace anonymous
+          {
+              class AnonymousClient;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::anonymous::AnonymousClient : public ::gnu::javax::crypto::sasl::ClientMechanism
+{
+
+public:
+  AnonymousClient();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual jboolean hasInitialResponse();
+  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
+private:
+  JArray< jbyte > * response();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousClient__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h
new file mode 100644
index 000000000..3c3b1834a
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousServer.h
@@ -0,0 +1,45 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
+#define __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ServerMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace anonymous
+          {
+              class AnonymousServer;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::anonymous::AnonymousServer : public ::gnu::javax::crypto::sasl::ServerMechanism
+{
+
+public:
+  AnonymousServer();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousServer__
diff --git a/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h
new file mode 100644
index 000000000..45b0873c9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/anonymous/AnonymousUtil.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
+#define __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace anonymous
+          {
+              class AnonymousUtil;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::anonymous::AnonymousUtil : public ::java::lang::Object
+{
+
+  AnonymousUtil();
+public: // actually package-private
+  static jboolean isValidTraceInformation(::java::lang::String *);
+  static jboolean isValidToken(::java::lang::String *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_anonymous_AnonymousUtil__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h
new file mode 100644
index 000000000..3a5ae195c
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5AuthInfoProvider.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
+#define __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class CramMD5AuthInfoProvider;
+              class PasswordFile;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::CramMD5AuthInfoProvider : public ::java::lang::Object
+{
+
+public:
+  CramMD5AuthInfoProvider();
+  virtual void activate(::java::util::Map *);
+  virtual void passivate();
+  virtual jboolean contains(::java::lang::String *);
+  virtual ::java::util::Map * lookup(::java::util::Map *);
+  virtual void update(::java::util::Map *);
+  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
+private:
+  ::gnu::javax::crypto::sasl::crammd5::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5AuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h
new file mode 100644
index 000000000..b524a65a5
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Client.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
+#define __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ClientMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class CramMD5Client;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::CramMD5Client : public ::gnu::javax::crypto::sasl::ClientMechanism
+{
+
+public:
+  CramMD5Client();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual jboolean hasInitialResponse();
+  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Client__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h
new file mode 100644
index 000000000..2858e0521
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Registry.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
+#define __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class CramMD5Registry;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::CramMD5Registry : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::String * PASSWORD_FILE;
+  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
+  static ::java::lang::String * UID_FIELD;
+  static ::java::lang::String * GID_FIELD;
+  static ::java::lang::String * GECOS_FIELD;
+  static ::java::lang::String * DIR_FIELD;
+  static ::java::lang::String * SHELL_FIELD;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Registry__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h
new file mode 100644
index 000000000..b6712fd89
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Server.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
+#define __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ServerMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class CramMD5Server;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::CramMD5Server : public ::gnu::javax::crypto::sasl::ServerMechanism
+{
+
+public:
+  CramMD5Server();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
+  virtual jboolean isComplete();
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+private:
+  JArray< jchar > * lookupPassword(::java::lang::String *);
+  JArray< jbyte > * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ServerMechanism)))) msgID;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Server__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h
new file mode 100644
index 000000000..4e3387195
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/CramMD5Util.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
+#define __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class CramMD5Util;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::CramMD5Util : public ::java::lang::Object
+{
+
+  CramMD5Util();
+public: // actually package-private
+  static JArray< jbyte > * createMsgID();
+  static JArray< jbyte > * createHMac(JArray< jchar > *, JArray< jbyte > *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_crammd5_CramMD5Util__
diff --git a/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h
new file mode 100644
index 000000000..cb97b2fb9
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/crammd5/PasswordFile.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_crammd5_PasswordFile__
+#define __gnu_javax_crypto_sasl_crammd5_PasswordFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace crammd5
+          {
+              class PasswordFile;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::crammd5::PasswordFile : public ::java::lang::Object
+{
+
+public:
+  PasswordFile();
+  PasswordFile(::java::io::File *);
+  PasswordFile(::java::lang::String *);
+  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *);
+  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
+  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *);
+  virtual jboolean contains(::java::lang::String *);
+private:
+  void update();
+  void checkCurrent();
+  void readPasswd(::java::io::InputStream *);
+  void savePasswd();
+  static ::java::lang::String * DEFAULT_FILE;
+  ::java::util::HashMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
+  ::java::io::File * passwdFile;
+  jlong lastmod;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_crammd5_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h
new file mode 100644
index 000000000..2269e4870
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/plain/PasswordFile.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_plain_PasswordFile__
+#define __gnu_javax_crypto_sasl_plain_PasswordFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace plain
+          {
+              class PasswordFile;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::plain::PasswordFile : public ::java::lang::Object
+{
+
+public:
+  PasswordFile();
+  PasswordFile(::java::io::File *);
+  PasswordFile(::java::lang::String *);
+  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< ::java::lang::String * > *);
+  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
+  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *);
+  virtual jboolean contains(::java::lang::String *);
+private:
+  void update();
+  void checkCurrent();
+  void readPasswd(::java::io::InputStream *);
+  void savePasswd();
+  static ::java::lang::String * DEFAULT_FILE;
+  ::java::util::Hashtable * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries;
+  ::java::io::File * passwdFile;
+  jlong lastmod;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_plain_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h
new file mode 100644
index 000000000..179026d49
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/plain/PlainAuthInfoProvider.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
+#define __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace plain
+          {
+              class PasswordFile;
+              class PlainAuthInfoProvider;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::plain::PlainAuthInfoProvider : public ::java::lang::Object
+{
+
+public:
+  PlainAuthInfoProvider();
+  virtual void activate(::java::util::Map *);
+  virtual void passivate();
+  virtual jboolean contains(::java::lang::String *);
+  virtual ::java::util::Map * lookup(::java::util::Map *);
+  virtual void update(::java::util::Map *);
+  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
+private:
+  ::gnu::javax::crypto::sasl::plain::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_plain_PlainAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h b/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h
new file mode 100644
index 000000000..0c3e6dd00
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/plain/PlainClient.h
@@ -0,0 +1,49 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_plain_PlainClient__
+#define __gnu_javax_crypto_sasl_plain_PlainClient__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ClientMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace plain
+          {
+              class PlainClient;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::plain::PlainClient : public ::gnu::javax::crypto::sasl::ClientMechanism
+{
+
+public:
+  PlainClient();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual jboolean hasInitialResponse();
+  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_plain_PlainClient__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h b/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h
new file mode 100644
index 000000000..d141b1e71
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/plain/PlainRegistry.h
@@ -0,0 +1,44 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_plain_PlainRegistry__
+#define __gnu_javax_crypto_sasl_plain_PlainRegistry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace plain
+          {
+              class PlainRegistry;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::plain::PlainRegistry : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::String * PASSWORD_FILE;
+  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
+  static ::java::lang::String * UID_FIELD;
+  static ::java::lang::String * GID_FIELD;
+  static ::java::lang::String * GECOS_FIELD;
+  static ::java::lang::String * DIR_FIELD;
+  static ::java::lang::String * SHELL_FIELD;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_sasl_plain_PlainRegistry__
diff --git a/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h b/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h
new file mode 100644
index 000000000..a9214a2eb
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/plain/PlainServer.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_plain_PlainServer__
+#define __gnu_javax_crypto_sasl_plain_PlainServer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ServerMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace plain
+          {
+              class PlainServer;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::plain::PlainServer : public ::gnu::javax::crypto::sasl::ServerMechanism
+{
+
+public:
+  PlainServer();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
+public: // actually protected
+  virtual ::java::lang::String * getNegotiatedQOP();
+private:
+  JArray< jchar > * lookupPassword(::java::lang::String *);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_plain_PlainServer__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/CALG.h b/libjava/gnu/javax/crypto/sasl/srp/CALG.h
new file mode 100644
index 000000000..0b625387f
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/CALG.h
@@ -0,0 +1,57 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_CALG__
+#define __gnu_javax_crypto_sasl_srp_CALG__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace assembly
+        {
+            class Assembly;
+            class Direction;
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class CALG;
+              class KDF;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::CALG : public ::java::lang::Object
+{
+
+  CALG(jint, jint, ::java::lang::Object *, ::gnu::javax::crypto::assembly::Assembly *);
+public: // actually package-private
+  static ::gnu::javax::crypto::sasl::srp::CALG * getInstance(::java::lang::String *);
+public:
+  void init(::gnu::javax::crypto::sasl::srp::KDF *, JArray< jbyte > *, ::gnu::javax::crypto::assembly::Direction *);
+  JArray< jbyte > * doFinal(JArray< jbyte > *);
+  JArray< jbyte > * doFinal(JArray< jbyte > *, jint, jint);
+private:
+  ::gnu::javax::crypto::assembly::Assembly * __attribute__((aligned(__alignof__( ::java::lang::Object)))) assembly;
+  ::java::lang::Object * modeNdx;
+  jint blockSize;
+  jint keySize;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_CALG__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h b/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h
new file mode 100644
index 000000000..3a5e0e60d
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/ClientStore.h
@@ -0,0 +1,50 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_ClientStore__
+#define __gnu_javax_crypto_sasl_srp_ClientStore__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class ClientStore;
+              class SecurityContext;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::ClientStore : public ::java::lang::Object
+{
+
+  ClientStore();
+public: // actually package-private
+  static ::gnu::javax::crypto::sasl::srp::ClientStore * instance();
+  virtual jboolean isAlive(::java::lang::String *);
+  virtual void cacheSession(::java::lang::String *, jint, ::gnu::javax::crypto::sasl::srp::SecurityContext *);
+  virtual void invalidateSession(::java::lang::String *);
+  virtual ::gnu::javax::crypto::sasl::srp::SecurityContext * restoreSession(::java::lang::String *);
+private:
+  static ::gnu::javax::crypto::sasl::srp::ClientStore * singleton;
+  static ::java::util::HashMap * uid2ssc;
+  static ::java::util::HashMap * uid2ttl;
+  static ::java::lang::Object * lock;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_ClientStore__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/IALG.h b/libjava/gnu/javax/crypto/sasl/srp/IALG.h
new file mode 100644
index 000000000..faaa512e3
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/IALG.h
@@ -0,0 +1,56 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_IALG__
+#define __gnu_javax_crypto_sasl_srp_IALG__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace mac
+        {
+            class IMac;
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class IALG;
+              class KDF;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::IALG : public ::java::lang::Object
+{
+
+  IALG(::gnu::javax::crypto::mac::IMac *);
+public: // actually package-private
+  static ::gnu::javax::crypto::sasl::srp::IALG * getInstance(::java::lang::String *);
+public:
+  ::java::lang::Object * clone();
+  void init(::gnu::javax::crypto::sasl::srp::KDF *);
+  void update(JArray< jbyte > *);
+  void update(JArray< jbyte > *, jint, jint);
+  JArray< jbyte > * doFinal();
+  jint length();
+private:
+  ::gnu::javax::crypto::mac::IMac * __attribute__((aligned(__alignof__( ::java::lang::Object)))) hmac;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_IALG__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/KDF.h b/libjava/gnu/javax/crypto/sasl/srp/KDF.h
new file mode 100644
index 000000000..3862fa0c1
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/KDF.h
@@ -0,0 +1,66 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_KDF__
+#define __gnu_javax_crypto_sasl_srp_KDF__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace prng
+        {
+            class UMacGenerator;
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class KDF;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::KDF : public ::java::lang::Object
+{
+
+  KDF(JArray< jbyte > *, jint);
+public: // actually package-private
+  static ::gnu::javax::crypto::sasl::srp::KDF * getInstance(JArray< jbyte > *);
+private:
+  static jint nextByte();
+public:
+  virtual JArray< jbyte > * derive(jint);
+private:
+  static const jint AES_BLOCK_SIZE = 16;
+  static const jint AES_KEY_SIZE = 16;
+  static JArray< jbyte > * buffer;
+  static ::gnu::java::security::util::PRNG * prng;
+  ::gnu::javax::crypto::prng::UMacGenerator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) umac;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_KDF__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h b/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h
new file mode 100644
index 000000000..46cf78389
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/PasswordFile.h
@@ -0,0 +1,89 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_PasswordFile__
+#define __gnu_javax_crypto_sasl_srp_PasswordFile__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class PasswordFile;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::PasswordFile : public ::java::lang::Object
+{
+
+public:
+  PasswordFile();
+  PasswordFile(::java::io::File *);
+  PasswordFile(::java::lang::String *);
+  PasswordFile(::java::lang::String *, ::java::lang::String *);
+  PasswordFile(::java::lang::String *, ::java::lang::String *, ::java::lang::String *);
+private:
+  static ::java::lang::String * nameToID(::java::lang::String *);
+public:
+  virtual jboolean containsConfig(::java::lang::String *);
+  virtual JArray< ::java::lang::String * > * lookupConfig(::java::lang::String *);
+  virtual jboolean contains(::java::lang::String *);
+  virtual void add(::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, ::java::lang::String *);
+  virtual void changePasswd(::java::lang::String *, ::java::lang::String *);
+  virtual void savePasswd();
+  virtual JArray< ::java::lang::String * > * lookup(::java::lang::String *, ::java::lang::String *);
+private:
+  void readOrCreateConf();
+  void readConf(::java::io::InputStream *);
+  void writeConf(::java::io::PrintWriter *);
+  ::java::util::HashMap * newVerifiers(::java::lang::String *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *);
+  void update();
+  void checkCurrent();
+  void readPasswd(::java::io::InputStream *);
+  void readPasswd2(::java::io::InputStream *);
+  void writePasswd(::java::io::PrintWriter *, ::java::io::PrintWriter *);
+  static ::java::lang::String * USER_FIELD;
+  static ::java::lang::String * VERIFIERS_FIELD;
+  static ::java::lang::String * SALT_FIELD;
+  static ::java::lang::String * CONFIG_FIELD;
+  static ::java::lang::String * DEFAULT_FILE;
+  static ::java::util::HashMap * srps;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) confName;
+  ::java::lang::String * pwName;
+  ::java::lang::String * pw2Name;
+  ::java::io::File * configFile;
+  ::java::io::File * passwdFile;
+  ::java::io::File * passwd2File;
+  jlong lastmodPasswdFile;
+  jlong lastmodPasswd2File;
+  ::java::util::HashMap * entries;
+  ::java::util::HashMap * configurations;
+  static JArray< ::java::math::BigInteger * > * Nsrp;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_PasswordFile__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRP.h b/libjava/gnu/javax/crypto/sasl/srp/SRP.h
new file mode 100644
index 000000000..b092d8a96
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SRP.h
@@ -0,0 +1,77 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SRP__
+#define __gnu_javax_crypto_sasl_srp_SRP__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace hash
+        {
+            class IMessageDigest;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SRP;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SRP : public ::java::lang::Object
+{
+
+  SRP(::gnu::java::security::hash::IMessageDigest *);
+public:
+  static ::gnu::javax::crypto::sasl::srp::SRP * instance(::java::lang::String *);
+private:
+  static JArray< jbyte > * xor$(JArray< jbyte > *, JArray< jbyte > *, jint);
+public:
+  ::java::lang::String * getAlgorithm();
+  ::gnu::java::security::hash::IMessageDigest * newDigest();
+  JArray< jbyte > * digest(JArray< jbyte > *);
+  JArray< jbyte > * digest(::java::lang::String *);
+  JArray< jbyte > * xor$(JArray< jbyte > *, JArray< jbyte > *);
+  JArray< jbyte > * generateM1(::java::math::BigInteger *, ::java::math::BigInteger *, ::java::lang::String *, JArray< jbyte > *, ::java::math::BigInteger *, ::java::math::BigInteger *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, JArray< jbyte > *);
+  JArray< jbyte > * generateM2(::java::math::BigInteger *, JArray< jbyte > *, JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *, ::java::lang::String *, JArray< jbyte > *, jint, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+  JArray< jbyte > * generateKn(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+  JArray< jbyte > * computeX(JArray< jbyte > *, ::java::lang::String *, ::java::lang::String *);
+  JArray< jbyte > * computeX(JArray< jbyte > *, ::java::lang::String *, JArray< jbyte > *);
+private:
+  JArray< jbyte > * computeX(JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *);
+  static ::java::util::HashMap * algorithms;
+  static const jbyte COLON = 58;
+  ::gnu::java::security::hash::IMessageDigest * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mda;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_SRP__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h b/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h
new file mode 100644
index 000000000..630c80efa
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SRPAuthInfoProvider.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
+#define __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class PasswordFile;
+              class SRPAuthInfoProvider;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SRPAuthInfoProvider : public ::java::lang::Object
+{
+
+public:
+  SRPAuthInfoProvider();
+  virtual void activate(::java::util::Map *);
+  virtual void passivate();
+  virtual jboolean contains(::java::lang::String *);
+  virtual ::java::util::Map * lookup(::java::util::Map *);
+  virtual void update(::java::util::Map *);
+  virtual ::java::util::Map * getConfiguration(::java::lang::String *);
+private:
+  ::gnu::javax::crypto::sasl::srp::PasswordFile * __attribute__((aligned(__alignof__( ::java::lang::Object)))) passwordFile;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_SRPAuthInfoProvider__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h b/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h
new file mode 100644
index 000000000..ec13be653
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SRPClient.h
@@ -0,0 +1,129 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SRPClient__
+#define __gnu_javax_crypto_sasl_srp_SRPClient__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ClientMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IKeyAgreementParty;
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class CALG;
+              class IALG;
+              class SRP;
+              class SRPClient;
+          }
+        }
+      }
+      namespace security
+      {
+        namespace auth
+        {
+            class Password;
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SRPClient : public ::gnu::javax::crypto::sasl::ClientMechanism
+{
+
+public:
+  SRPClient();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual jboolean hasInitialResponse();
+  virtual JArray< jbyte > * evaluateChallenge(JArray< jbyte > *);
+public: // actually protected
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+  virtual ::java::lang::String * getNegotiatedQOP();
+  virtual ::java::lang::String * getNegotiatedStrength();
+  virtual ::java::lang::String * getNegotiatedRawSendSize();
+  virtual ::java::lang::String * getReuse();
+private:
+  JArray< jbyte > * sendIdentities();
+  JArray< jbyte > * sendPublicKey(JArray< jbyte > *);
+  JArray< jbyte > * receiveEvidence(JArray< jbyte > *);
+  void getUsernameAndPassword();
+  ::java::lang::String * createO(::java::lang::String *);
+  void setupSecurityServices(jboolean);
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+  static ::java::util::logging::Logger * log;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ClientMechanism)))) uid;
+  ::java::lang::String * U;
+public: // actually package-private
+  ::java::math::BigInteger * N;
+  ::java::math::BigInteger * g;
+  ::java::math::BigInteger * A;
+  ::java::math::BigInteger * B;
+private:
+  ::gnu::javax::security::auth::Password * password;
+  JArray< jbyte > * s;
+  JArray< jbyte > * cIV;
+  JArray< jbyte > * sIV;
+  JArray< jbyte > * M1;
+  JArray< jbyte > * M2;
+  JArray< jbyte > * cn;
+  JArray< jbyte > * sn;
+  ::gnu::javax::crypto::sasl::srp::SRP * srp;
+  JArray< jbyte > * sid;
+  jint ttl;
+  JArray< jbyte > * sCB;
+  ::java::lang::String * L;
+  ::java::lang::String * o;
+  ::java::lang::String * chosenIntegrityAlgorithm;
+  ::java::lang::String * chosenConfidentialityAlgorithm;
+  jint rawSendSize;
+  JArray< jbyte > * K;
+  jboolean replayDetection;
+  jint inCounter;
+  jint outCounter;
+  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
+  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
+  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
+  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
+  ::gnu::javax::crypto::key::IKeyAgreementParty * clientHandler;
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_SRPClient__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h b/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h
new file mode 100644
index 000000000..22cd5d9e4
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SRPRegistry.h
@@ -0,0 +1,92 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SRPRegistry__
+#define __gnu_javax_crypto_sasl_srp_SRPRegistry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SRPRegistry;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SRPRegistry : public ::java::lang::Object
+{
+
+public:
+  static ::java::lang::String * N_2048_BITS;
+  static ::java::lang::String * N_1536_BITS;
+  static ::java::lang::String * N_1280_BITS;
+  static ::java::lang::String * N_1024_BITS;
+  static ::java::lang::String * N_768_BITS;
+  static ::java::lang::String * N_640_BITS;
+  static ::java::lang::String * N_512_BITS;
+  static JArray< ::java::lang::String * > * SRP_ALGORITHMS;
+  static ::java::lang::String * SRP_DEFAULT_DIGEST_NAME;
+  static ::java::lang::String * SRP_DIGEST_NAME;
+  static ::java::lang::String * SHARED_MODULUS;
+  static ::java::lang::String * FIELD_GENERATOR;
+  static ::java::lang::String * AVAILABLE_OPTIONS;
+  static ::java::lang::String * CHOSEN_OPTIONS;
+  static ::java::lang::String * USER_NAME;
+  static ::java::lang::String * USER_ROLE;
+  static ::java::lang::String * USER_SALT;
+  static ::java::lang::String * PASSWORD_VERIFIER;
+  static ::java::lang::String * CLIENT_PUBLIC_KEY;
+  static ::java::lang::String * SERVER_PUBLIC_KEY;
+  static ::java::lang::String * CLIENT_EVIDENCE;
+  static ::java::lang::String * SERVER_EVIDENCE;
+  static ::java::lang::String * SRP_HASH;
+  static ::java::lang::String * SRP_MANDATORY;
+  static ::java::lang::String * SRP_REPLAY_DETECTION;
+  static ::java::lang::String * SRP_INTEGRITY_PROTECTION;
+  static ::java::lang::String * SRP_CONFIDENTIALITY;
+  static ::java::lang::String * PASSWORD_FILE;
+  static ::java::lang::String * PASSWORD_DB;
+  static ::java::lang::String * DEFAULT_PASSWORD_FILE;
+  static const jboolean DEFAULT_REPLAY_DETECTION = 1;
+  static const jboolean DEFAULT_INTEGRITY = 1;
+  static const jboolean DEFAULT_CONFIDENTIALITY = 0;
+  static ::java::lang::String * HMAC_SHA1;
+  static ::java::lang::String * HMAC_MD5;
+  static ::java::lang::String * HMAC_RIPEMD_160;
+  static JArray< ::java::lang::String * > * INTEGRITY_ALGORITHMS;
+  static ::java::lang::String * AES;
+  static ::java::lang::String * BLOWFISH;
+  static JArray< ::java::lang::String * > * CONFIDENTIALITY_ALGORITHMS;
+  static ::java::lang::String * OPTION_MANDATORY;
+  static ::java::lang::String * OPTION_SRP_DIGEST;
+  static ::java::lang::String * OPTION_REPLAY_DETECTION;
+  static ::java::lang::String * OPTION_INTEGRITY;
+  static ::java::lang::String * OPTION_CONFIDENTIALITY;
+  static ::java::lang::String * OPTION_MAX_BUFFER_SIZE;
+  static ::java::lang::String * MANDATORY_NONE;
+  static ::java::lang::String * DEFAULT_MANDATORY;
+  static ::java::lang::String * MD_NAME_FIELD;
+  static ::java::lang::String * USER_VERIFIER_FIELD;
+  static ::java::lang::String * SALT_FIELD;
+  static ::java::lang::String * CONFIG_NDX_FIELD;
+  static const jint MINIMUM_MODULUS_BITLENGTH = 512;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __gnu_javax_crypto_sasl_srp_SRPRegistry__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h b/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h
new file mode 100644
index 000000000..b78a26bca
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SRPServer.h
@@ -0,0 +1,115 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SRPServer__
+#define __gnu_javax_crypto_sasl_srp_SRPServer__
+
+#pragma interface
+
+#include <gnu/javax/crypto/sasl/ServerMechanism.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace java
+    {
+      namespace security
+      {
+        namespace util
+        {
+            class PRNG;
+        }
+      }
+    }
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace key
+        {
+            class IKeyAgreementParty;
+        }
+        namespace sasl
+        {
+          namespace srp
+          {
+              class CALG;
+              class IALG;
+              class SRP;
+              class SRPServer;
+          }
+        }
+      }
+    }
+  }
+  namespace java
+  {
+    namespace math
+    {
+        class BigInteger;
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SRPServer : public ::gnu::javax::crypto::sasl::ServerMechanism
+{
+
+public:
+  SRPServer();
+public: // actually protected
+  virtual void initMechanism();
+  virtual void resetMechanism();
+public:
+  virtual JArray< jbyte > * evaluateResponse(JArray< jbyte > *);
+public: // actually protected
+  virtual JArray< jbyte > * engineUnwrap(JArray< jbyte > *, jint, jint);
+  virtual JArray< jbyte > * engineWrap(JArray< jbyte > *, jint, jint);
+  virtual ::java::lang::String * getNegotiatedQOP();
+  virtual ::java::lang::String * getNegotiatedStrength();
+  virtual ::java::lang::String * getNegotiatedRawSendSize();
+  virtual ::java::lang::String * getReuse();
+private:
+  JArray< jbyte > * sendProtocolElements(JArray< jbyte > *);
+  JArray< jbyte > * sendEvidence(JArray< jbyte > *);
+  ::java::lang::String * createL();
+  void parseO(::java::lang::String *);
+  void setupSecurityServices(jboolean);
+  ::gnu::java::security::util::PRNG * getDefaultPRNG();
+  static ::java::util::logging::Logger * log;
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::gnu::javax::crypto::sasl::ServerMechanism)))) U;
+  ::java::math::BigInteger * N;
+  ::java::math::BigInteger * g;
+  ::java::math::BigInteger * A;
+  ::java::math::BigInteger * B;
+  JArray< jbyte > * s;
+  JArray< jbyte > * cIV;
+  JArray< jbyte > * sIV;
+  JArray< jbyte > * cn;
+  JArray< jbyte > * sn;
+  ::gnu::javax::crypto::sasl::srp::SRP * srp;
+  JArray< jbyte > * sid;
+  jint ttl;
+  JArray< jbyte > * cCB;
+  ::java::lang::String * mandatory;
+  ::java::lang::String * L;
+  ::java::lang::String * o;
+  ::java::lang::String * chosenIntegrityAlgorithm;
+  ::java::lang::String * chosenConfidentialityAlgorithm;
+  jint rawSendSize;
+  JArray< jbyte > * K;
+  jboolean replayDetection;
+  jint inCounter;
+  jint outCounter;
+  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
+  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
+  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
+  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
+  ::gnu::javax::crypto::key::IKeyAgreementParty * serverHandler;
+  ::gnu::java::security::util::PRNG * prng;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_SRPServer__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h b/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h
new file mode 100644
index 000000000..b4b4a222e
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/SecurityContext.h
@@ -0,0 +1,68 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_SecurityContext__
+#define __gnu_javax_crypto_sasl_srp_SecurityContext__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class CALG;
+              class IALG;
+              class SecurityContext;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::SecurityContext : public ::java::lang::Object
+{
+
+public: // actually package-private
+  SecurityContext(::java::lang::String *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, JArray< jbyte > *, jboolean, jint, jint, ::gnu::javax::crypto::sasl::srp::IALG *, ::gnu::javax::crypto::sasl::srp::IALG *, ::gnu::javax::crypto::sasl::srp::CALG *, ::gnu::javax::crypto::sasl::srp::CALG *);
+  virtual ::java::lang::String * getMdName();
+  virtual JArray< jbyte > * getSID();
+  virtual JArray< jbyte > * getK();
+  virtual JArray< jbyte > * getClientIV();
+  virtual JArray< jbyte > * getServerIV();
+  virtual jboolean hasReplayDetection();
+  virtual jint getInCounter();
+  virtual jint getOutCounter();
+  virtual ::gnu::javax::crypto::sasl::srp::IALG * getInMac();
+  virtual ::gnu::javax::crypto::sasl::srp::IALG * getOutMac();
+  virtual ::gnu::javax::crypto::sasl::srp::CALG * getInCipher();
+  virtual ::gnu::javax::crypto::sasl::srp::CALG * getOutCipher();
+private:
+  ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) mdName;
+  JArray< jbyte > * sid;
+  JArray< jbyte > * K;
+  JArray< jbyte > * cIV;
+  JArray< jbyte > * sIV;
+  jboolean replayDetection;
+  jint inCounter;
+  jint outCounter;
+  ::gnu::javax::crypto::sasl::srp::IALG * inMac;
+  ::gnu::javax::crypto::sasl::srp::IALG * outMac;
+  ::gnu::javax::crypto::sasl::srp::CALG * inCipher;
+  ::gnu::javax::crypto::sasl::srp::CALG * outCipher;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_SecurityContext__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h b/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h
new file mode 100644
index 000000000..f93429bee
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/ServerStore.h
@@ -0,0 +1,54 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_ServerStore__
+#define __gnu_javax_crypto_sasl_srp_ServerStore__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class SecurityContext;
+              class ServerStore;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::ServerStore : public ::java::lang::Object
+{
+
+  ServerStore();
+public: // actually package-private
+  static ::gnu::javax::crypto::sasl::srp::ServerStore * instance();
+  static JArray< jbyte > * getNewSessionID();
+  virtual jboolean isAlive(JArray< jbyte > *);
+  virtual void cacheSession(jint, ::gnu::javax::crypto::sasl::srp::SecurityContext *);
+  virtual ::gnu::javax::crypto::sasl::srp::SecurityContext * restoreSession(JArray< jbyte > *);
+  virtual void invalidateSession(JArray< jbyte > *);
+private:
+  static ::gnu::javax::crypto::sasl::srp::ServerStore * singleton;
+  static ::java::util::HashMap * sid2ssc;
+  static ::java::util::HashMap * sid2ttl;
+  static ::java::lang::Object * lock;
+  static jint counter;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_ServerStore__
diff --git a/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h b/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h
new file mode 100644
index 000000000..19203bcd0
--- /dev/null
+++ b/libjava/gnu/javax/crypto/sasl/srp/StoreEntry.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __gnu_javax_crypto_sasl_srp_StoreEntry__
+#define __gnu_javax_crypto_sasl_srp_StoreEntry__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace gnu
+  {
+    namespace javax
+    {
+      namespace crypto
+      {
+        namespace sasl
+        {
+          namespace srp
+          {
+              class StoreEntry;
+          }
+        }
+      }
+    }
+  }
+}
+
+class gnu::javax::crypto::sasl::srp::StoreEntry : public ::java::lang::Object
+{
+
+public: // actually package-private
+  StoreEntry(jint);
+  virtual jboolean isAlive();
+private:
+  jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) perenial;
+  jlong timeToDie;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __gnu_javax_crypto_sasl_srp_StoreEntry__