diff options
author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
---|---|---|
committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
commit | 5c7411981584e487ac41794feb98a66df9fd6fcb (patch) | |
tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/gnu | |
parent | 112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff) | |
download | gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.tar.gz |
Merge GNU Classpath 0.99 into libjava.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/gnu')
4 files changed, 9 insertions, 9 deletions
diff --git a/libjava/gnu/classpath/Configuration.java b/libjava/gnu/classpath/Configuration.java index b0c57332ddc..f91d837b2b6 100644 --- a/libjava/gnu/classpath/Configuration.java +++ b/libjava/gnu/classpath/Configuration.java @@ -66,7 +66,7 @@ public final class Configuration * It is set according to the value of 'version' in the configure[.in] file * and used to set the System property gnu.classpath.version. */ - public static final String CLASSPATH_VERSION = "0.98"; + public static final String CLASSPATH_VERSION = "0.99"; /** * The value of DEBUG is substituted according to whether the diff --git a/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h b/libjava/gnu/javax/crypto/key/dh/GnuDHKeyPairGenerator.h index aaab2bf5167..512560dc6b4 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 511b6de6596..a54ec5e5c44 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 7bb774beabf..cd28544ebe2 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$; }; |