Merge GNU Classpath 0.99 into libjava.

From-SVN: r185741

3 files changed, 8 insertions, 8 deletions

diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
index aaab2bf..512560d 100644
--- a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
+++ b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h
@@ -17,10 +17,6 @@ extern "Java"
     {
       namespace security
       {
-        namespace hash
-        {
-            class Sha160;
-        }
         namespace util
         {
             class PRNG;
@@ -77,8 +73,7 @@ public:
   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;
+  ::java::security::SecureRandom * __attribute__((aligned(__alignof__( ::java::lang::Object)))) rnd;
   jint l;
   jint m;
   ::java::math::BigInteger * seed;
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherSuite.h b/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
index 511b6de..a54ec5e 100644
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
+++ b/libjava/gnu/javax/net/ssl/provider/CipherSuite.h
@@ -52,8 +52,8 @@ extern "Java"
 class gnu::javax::net::ssl::provider::CipherSuite : public ::java::lang::Object
 {
 
-  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *);
-  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, jboolean, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *);
+  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *, jboolean);
+  CipherSuite(::gnu::javax::net::ssl::provider::CipherAlgorithm *, ::gnu::javax::net::ssl::provider::KeyExchangeAlgorithm *, jboolean, ::gnu::javax::net::ssl::provider::SignatureAlgorithm *, ::gnu::javax::net::ssl::provider::MacAlgorithm *, jint, jint, jint, ::java::lang::String *, jboolean);
   CipherSuite(JArray< jbyte > *);
 public:
   static ::gnu::javax::net::ssl::provider::CipherSuite * forName(::java::lang::String *);
@@ -79,6 +79,7 @@ public:
   jint hashCode();
   ::java::lang::String * toString(::java::lang::String *);
   ::java::lang::String * toString();
+  jboolean isCBCMode();
 private:
   static ::java::util::List * tlsSuiteNames;
   static ::java::util::HashMap * namesToSuites;
@@ -134,6 +135,7 @@ private:
   jboolean ephemeralDH;
   jboolean exportable;
   jboolean isStream;
+  jboolean isCBCMode__;
   jint keyLength__;
   JArray< jbyte > * id__;
   ::java::lang::String * name;
diff --git a/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h b/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
index 7bb774be..cd28544 100644
--- a/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
+++ b/libjava/gnu/javax/net/ssl/provider/OutputSecurityParameters.h
@@ -62,6 +62,7 @@ public:
   virtual JArray< jint > * encrypt(JArray< ::java::nio::ByteBuffer * > *, jint, jint, ::gnu::javax::net::ssl::provider::ContentType *, ::java::nio::ByteBuffer *);
 public: // actually package-private
   virtual ::gnu::javax::net::ssl::provider::CipherSuite * suite();
+  virtual jboolean needToSplitPayload();
 private:
   static ::gnu::classpath::debug::SystemLogger * logger;
   ::javax::crypto::Cipher * __attribute__((aligned(__alignof__( ::java::lang::Object)))) cipher;
@@ -70,6 +71,8 @@ private:
   ::gnu::javax::net::ssl::provider::SessionImpl * session;
   ::gnu::javax::net::ssl::provider::CipherSuite * suite__;
   jlong sequence;
+public: // actually package-private
+  static jboolean enableCBCProtection;
 public:
   static ::java::lang::Class class$;
 };