diff options
author | David Hook <dgh@cryptoworkshop.com> | 2013-05-11 04:43:05 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2013-05-11 04:43:05 +0400 |
commit | 6a5a73bc8648e8ce7f311d19be32b9a3366d3f4c (patch) | |
tree | 22bf2cc11b8385eb1a4f88b6b11cffc4d963d7dc | |
parent | c5bb1a5fdc5cc68a650d97e86039823560525197 (diff) |
further adjustments.
4 files changed, 14 insertions, 7 deletions
diff --git a/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java b/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java index 6d342309..11bdf963 100644 --- a/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java +++ b/src/main/java/org/bouncycastle/crypto/prng/drbg/HMacSP800DRBG.java @@ -26,10 +26,10 @@ public class HMacSP800DRBG * @param hMac Hash MAC to base the DRBG on. * @param securityStrength security strength required (in bits) * @param entropySource source of entropy to use for seeding/reseeding. - * @param personalisationString personalization string to distinguish this DRBG (may be null). + * @param personalizationString personalization string to distinguish this DRBG (may be null). * @param nonce nonce to further distinguish this DRBG (may be null). */ - public HMacSP800DRBG(Mac hMac, int securityStrength, EntropySource entropySource, byte[] personalisationString, byte[] nonce) + public HMacSP800DRBG(Mac hMac, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce) { if (securityStrength > Utils.getMaxSecurityStrength(hMac)) { @@ -45,7 +45,7 @@ public class HMacSP800DRBG _hMac = hMac; byte[] entropy = entropySource.getEntropy(); - byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalisationString); + byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalizationString); _K = new byte[hMac.getMacSize()]; _V = new byte[_K.length]; diff --git a/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java b/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java index f0c6ead7..9a318ed1 100644 --- a/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java +++ b/src/main/java/org/bouncycastle/crypto/prng/drbg/HashSP800DRBG.java @@ -45,10 +45,10 @@ public class HashSP800DRBG * @param digest source digest to use for DRB stream. * @param securityStrength security strength required (in bits) * @param entropySource source of entropy to use for seeding/reseeding. - * @param personalisationString personalization string to distinguish this DRBG (may be null). + * @param personalizationString personalization string to distinguish this DRBG (may be null). * @param nonce nonce to further distinguish this DRBG (may be null). */ - public HashSP800DRBG(Digest digest, int securityStrength, EntropySource entropySource, byte[] personalisationString, byte[] nonce) + public HashSP800DRBG(Digest digest, int securityStrength, EntropySource entropySource, byte[] personalizationString, byte[] nonce) { if (securityStrength > Utils.getMaxSecurityStrength(digest)) { @@ -74,7 +74,7 @@ public class HashSP800DRBG // 6. Return V, C, and reseed_counter as the initial_working_state byte[] entropy = entropySource.getEntropy(); - byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalisationString); + byte[] seedMaterial = Arrays.concatenate(entropy, nonce, personalizationString); byte[] seed = hash_df(seedMaterial, _seedLength); _V = seed; diff --git a/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java b/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java index 8a132708..93bc8945 100644 --- a/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java +++ b/src/main/java/org/bouncycastle/crypto/prng/drbg/SP80090DRBG.java @@ -1,8 +1,10 @@ package org.bouncycastle.crypto.prng.drbg; +/** + * Interface to SP800-90A deterministic random bit generators. + */ public interface SP80090DRBG { - /** * Populate a passed in array with random data. * diff --git a/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html b/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html new file mode 100644 index 00000000..b86c2064 --- /dev/null +++ b/src/main/java/org/bouncycastle/crypto/prng/drbg/package.html @@ -0,0 +1,5 @@ +<html> +<body bgcolor="#ffffff"> +SP800-90A deterministic random bit generators. +</body> +</html> |