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.

47 files changed, 2618 insertions, 0 deletions

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__