aboutsummaryrefslogtreecommitdiff
path: root/libjava/java/security/SecureRandom.h
diff options
context:
space:
mode:
authorAndrew John Hughes <gandalf@gcc.gnu.org>2009-02-25 21:40:28 +0000
committerAndrew John Hughes <gandalf@gcc.gnu.org>2009-02-25 21:40:28 +0000
commitdc6a0b2d949256fbdcdc7301044067e2cf45289f (patch)
tree2c27a4aaca5b8d4062c3ad863f71e3765d25905e /libjava/java/security/SecureRandom.h
parenta16b68bb66854ca9bbe5e11a8ddda7dcde3744e9 (diff)
downloadgcc-dc6a0b2d949256fbdcdc7301044067e2cf45289f.zip
gcc-dc6a0b2d949256fbdcdc7301044067e2cf45289f.tar.gz
gcc-dc6a0b2d949256fbdcdc7301044067e2cf45289f.tar.bz2
Sync libgcj with GNU Classpath 0.98.
2009-02-13 Andrew John Hughes <ahughes@redhat.com> Import GNU Classpath (classpath-0_98-release). * Makefile.am: Add natVMSecureRandom.cc. * Makefile.in: Regenerated. * classpath/ChangeLog, * classpath/Makefile.am: Merged. * classpath/Makefile.in: Regenerated. * classpath/NEWS: Merged. * classpath/config.guess, * classpath/config.sub, * classpath/configure: Regenerated. * classpath/configure.ac: Merged. * classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java, * classpath/gnu/java/security/jce/prng/SecureRandomAdapter.java, * classpath/gnu/javax/crypto/jce/prng/ARCFourRandomSpi.java, * classpath/gnu/javax/crypto/jce/prng/CSPRNGSpi.java, * classpath/gnu/javax/crypto/jce/prng/FortunaImpl.java, * classpath/gnu/javax/crypto/jce/prng/ICMRandomSpi.java, * classpath/gnu/javax/crypto/jce/prng/UMacRandomSpi.java, * classpath/gnu/javax/crypto/prng/ICMGenerator.java, * classpath/gnu/xml/stream/XMLParser.java, * classpath/java/security/SecureRandom.java, * classpath/native/jni/native-lib/cpproc.c, * classpath/native/plugin/gcjwebplugin.cc, * classpath/tools/gnu/classpath/tools/gjdoc/Main.java: Merged. * configure: Regenerated. * configure.ac: Add symlink for natVMSecureRandomPosix.cc to natVMSecureRandom.cc * gnu/classpath/Configuration.java: Change version to 0.98. * gnu/java/security/jce/prng/SecureRandomAdapter.h: Regenerated. * gnu/java/security/jce/prng/VMSecureRandom.h: Generated. * gnu/java/security/jce/prng/VMSecureRandom.java: Added native implementation. * gnu/java/security/jce/prng/natVMSecureRandomPosix.cc: Wrapper around /dev/random. * gnu/javax/crypto/jce/prng/CSPRNGSpi.h, * gnu/javax/crypto/jce/prng/FortunaImpl.h, * java/security/SecureRandom.h: Regenerated. * java/security/VMSecureRandom$Spinner.h, * java/security/VMSecureRandom.h, * java/security/VMSecureRandom.java: Removed. * sources.am: Move VMSecureRandom to gnu.java.security.jce.prng. From-SVN: r144434
Diffstat (limited to 'libjava/java/security/SecureRandom.h')
-rw-r--r--libjava/java/security/SecureRandom.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/libjava/java/security/SecureRandom.h b/libjava/java/security/SecureRandom.h
index 58561ab..b54318c 100644
--- a/libjava/java/security/SecureRandom.h
+++ b/libjava/java/security/SecureRandom.h
@@ -47,8 +47,6 @@ public:
static JArray< jbyte > * getSeed(jint);
virtual JArray< jbyte > * generateSeed(jint);
private:
- static jint generateSeed(JArray< jbyte > *);
- static jint generateSeed(JArray< jbyte > *, jint, jint);
static ::java::lang::String * SECURE_RANDOM;
static const jlong serialVersionUID = 4940670005562187LL;
public: // actually package-private
@@ -61,9 +59,6 @@ public: // actually package-private
private:
::java::lang::String * algorithm;
jboolean isSeeded;
- static ::java::lang::String * SECURERANDOM_SOURCE;
- static ::java::lang::String * JAVA_SECURITY_EGD;
- static ::java::util::logging::Logger * logger;
public:
static ::java::lang::Class class$;
};