summaryrefslogtreecommitdiff
path: root/gnu/java/security/jce/prng
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/java/security/jce/prng')
-rw-r--r--gnu/java/security/jce/prng/HavalRandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/MD2RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/MD4RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/MD5RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/RipeMD128RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/RipeMD160RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/SecureRandomAdapter.java14
-rw-r--r--gnu/java/security/jce/prng/Sha160RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/Sha256RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/Sha384RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/Sha512RandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/TigerRandomSpi.java4
-rw-r--r--gnu/java/security/jce/prng/WhirlpoolRandomSpi.java4
13 files changed, 43 insertions, 19 deletions
diff --git a/gnu/java/security/jce/prng/HavalRandomSpi.java b/gnu/java/security/jce/prng/HavalRandomSpi.java
index ebf80f2d7..bce621cc9 100644
--- a/gnu/java/security/jce/prng/HavalRandomSpi.java
+++ b/gnu/java/security/jce/prng/HavalRandomSpi.java
@@ -1,5 +1,5 @@
/* HavalRandomSpi.java --
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class HavalRandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -8063732691196112589L;
+
public HavalRandomSpi()
{
super(Registry.HAVAL_HASH);
diff --git a/gnu/java/security/jce/prng/MD2RandomSpi.java b/gnu/java/security/jce/prng/MD2RandomSpi.java
index 8b9abe4e9..96c6ef06d 100644
--- a/gnu/java/security/jce/prng/MD2RandomSpi.java
+++ b/gnu/java/security/jce/prng/MD2RandomSpi.java
@@ -1,5 +1,5 @@
/* MD2RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class MD2RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -4057743457589764490L;
+
public MD2RandomSpi()
{
super(Registry.MD2_HASH);
diff --git a/gnu/java/security/jce/prng/MD4RandomSpi.java b/gnu/java/security/jce/prng/MD4RandomSpi.java
index 2a71d6a0d..986905c0a 100644
--- a/gnu/java/security/jce/prng/MD4RandomSpi.java
+++ b/gnu/java/security/jce/prng/MD4RandomSpi.java
@@ -1,5 +1,5 @@
/* MD4RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class MD4RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -2812563232122795714L;
+
public MD4RandomSpi()
{
super(Registry.MD4_HASH);
diff --git a/gnu/java/security/jce/prng/MD5RandomSpi.java b/gnu/java/security/jce/prng/MD5RandomSpi.java
index 8fb50e16f..655e795e7 100644
--- a/gnu/java/security/jce/prng/MD5RandomSpi.java
+++ b/gnu/java/security/jce/prng/MD5RandomSpi.java
@@ -1,5 +1,5 @@
/* MD5RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class MD5RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -8922813416432084255L;
+
public MD5RandomSpi()
{
super(Registry.MD5_HASH);
diff --git a/gnu/java/security/jce/prng/RipeMD128RandomSpi.java b/gnu/java/security/jce/prng/RipeMD128RandomSpi.java
index 6f8dde0e0..0657ef5b8 100644
--- a/gnu/java/security/jce/prng/RipeMD128RandomSpi.java
+++ b/gnu/java/security/jce/prng/RipeMD128RandomSpi.java
@@ -1,5 +1,5 @@
/* RipeMD128RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class RipeMD128RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -5746104868781660155L;
+
public RipeMD128RandomSpi()
{
super(Registry.RIPEMD128_HASH);
diff --git a/gnu/java/security/jce/prng/RipeMD160RandomSpi.java b/gnu/java/security/jce/prng/RipeMD160RandomSpi.java
index 6bb4e2b50..3e64dcf71 100644
--- a/gnu/java/security/jce/prng/RipeMD160RandomSpi.java
+++ b/gnu/java/security/jce/prng/RipeMD160RandomSpi.java
@@ -1,5 +1,5 @@
/* RipeMD160RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class RipeMD160RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -1826833146069540489L;
+
public RipeMD160RandomSpi()
{
super(Registry.RIPEMD160_HASH);
diff --git a/gnu/java/security/jce/prng/SecureRandomAdapter.java b/gnu/java/security/jce/prng/SecureRandomAdapter.java
index 9307cfa7f..0d5b060ed 100644
--- a/gnu/java/security/jce/prng/SecureRandomAdapter.java
+++ b/gnu/java/security/jce/prng/SecureRandomAdapter.java
@@ -1,5 +1,5 @@
/* SecureRandomAdapter.java --
- Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -71,15 +71,13 @@ import java.net.URL;
public abstract class SecureRandomAdapter
extends SecureRandomSpi
{
+ private static final long serialVersionUID = 999603727925481878L;
private boolean isSeeded = false;
/** Our underlying prng instance. */
private MDGenerator adaptee = new MDGenerator();
- /** The name of the message digest algorithm used by the adaptee. */
- private String mdName;
-
private static final Logger logger =
Logger.getLogger(SecureRandom.class.getName());
@@ -95,8 +93,7 @@ public abstract class SecureRandomAdapter
{
super();
- this.mdName = mdName;
- adaptee.init (Collections.singletonMap (MDGenerator.MD_NAME, mdName));
+ adaptee.init (Collections.singletonMap (MDGenerator.MD_NAME, (Object) mdName));
}
public static final byte[] getSeed(int numBytes)
@@ -110,7 +107,7 @@ public abstract class SecureRandomAdapter
new GetSecurityPropertyAction(SECURERANDOM_SOURCE);
try
{
- urlStr = (String) AccessController.doPrivileged(action);
+ urlStr = AccessController.doPrivileged(action);
if (urlStr != null)
sourceUrl = new URL(urlStr);
}
@@ -156,11 +153,13 @@ public abstract class SecureRandomAdapter
return buffer;
}
+ @Override
public byte[] engineGenerateSeed(int numBytes)
{
return getSeed(numBytes);
}
+ @Override
public void engineNextBytes(byte[] bytes)
{
if (!isSeeded)
@@ -176,6 +175,7 @@ public abstract class SecureRandomAdapter
}
}
+ @Override
public void engineSetSeed(byte[] seed)
{
adaptee.addRandomBytes (seed);
diff --git a/gnu/java/security/jce/prng/Sha160RandomSpi.java b/gnu/java/security/jce/prng/Sha160RandomSpi.java
index ba4d22265..674a7095f 100644
--- a/gnu/java/security/jce/prng/Sha160RandomSpi.java
+++ b/gnu/java/security/jce/prng/Sha160RandomSpi.java
@@ -1,5 +1,5 @@
/* Sha160RandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class Sha160RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -225998056826896890L;
+
public Sha160RandomSpi()
{
super(Registry.SHA160_HASH);
diff --git a/gnu/java/security/jce/prng/Sha256RandomSpi.java b/gnu/java/security/jce/prng/Sha256RandomSpi.java
index a6ddb70af..0c8bd6916 100644
--- a/gnu/java/security/jce/prng/Sha256RandomSpi.java
+++ b/gnu/java/security/jce/prng/Sha256RandomSpi.java
@@ -1,5 +1,5 @@
/* Sha256RandomSpi.java --
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class Sha256RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -8748894083942397288L;
+
public Sha256RandomSpi()
{
super(Registry.SHA256_HASH);
diff --git a/gnu/java/security/jce/prng/Sha384RandomSpi.java b/gnu/java/security/jce/prng/Sha384RandomSpi.java
index 4954b1be7..e13d875ff 100644
--- a/gnu/java/security/jce/prng/Sha384RandomSpi.java
+++ b/gnu/java/security/jce/prng/Sha384RandomSpi.java
@@ -1,5 +1,5 @@
/* Sha384RandomSpi.java --
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class Sha384RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -5865689279889026842L;
+
public Sha384RandomSpi()
{
super(Registry.SHA384_HASH);
diff --git a/gnu/java/security/jce/prng/Sha512RandomSpi.java b/gnu/java/security/jce/prng/Sha512RandomSpi.java
index 27de7f319..8e9d378d4 100644
--- a/gnu/java/security/jce/prng/Sha512RandomSpi.java
+++ b/gnu/java/security/jce/prng/Sha512RandomSpi.java
@@ -1,5 +1,5 @@
/* Sha512RandomSpi.java --
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class Sha512RandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = 3471561597377786188L;
+
public Sha512RandomSpi()
{
super(Registry.SHA512_HASH);
diff --git a/gnu/java/security/jce/prng/TigerRandomSpi.java b/gnu/java/security/jce/prng/TigerRandomSpi.java
index 722ab3279..e6daac297 100644
--- a/gnu/java/security/jce/prng/TigerRandomSpi.java
+++ b/gnu/java/security/jce/prng/TigerRandomSpi.java
@@ -1,5 +1,5 @@
/* TigerRandomSpi.java --
- Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class TigerRandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -4562391018186836733L;
+
public TigerRandomSpi()
{
super(Registry.TIGER_HASH);
diff --git a/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java b/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
index 5da43d77e..1e423d712 100644
--- a/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
+++ b/gnu/java/security/jce/prng/WhirlpoolRandomSpi.java
@@ -1,5 +1,5 @@
/* WhirlpoolRandomSpi.java --
- Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2002, 2006, 2014 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -47,6 +47,8 @@ import gnu.java.security.Registry;
public class WhirlpoolRandomSpi
extends SecureRandomAdapter
{
+ private static final long serialVersionUID = -3118094409789615934L;
+
public WhirlpoolRandomSpi()
{
super(Registry.WHIRLPOOL_HASH);
View Lorry Controller Status