Repository: commons-crypto Updated Branches: refs/heads/master e22c4288c -> 6cbf4e90e
Javadoc fixes (fallback no longer used) Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/6cbf4e90 Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/6cbf4e90 Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/6cbf4e90 Branch: refs/heads/master Commit: 6cbf4e90ee58f8ee1b64f7cb8033b987d5ca610d Parents: e22c428 Author: Sebb <s...@apache.org> Authored: Wed Jun 29 21:35:16 2016 +0100 Committer: Sebb <s...@apache.org> Committed: Wed Jun 29 21:35:16 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/crypto/cipher/CryptoCipherFactory.java | 7 +++---- .../org/apache/commons/crypto/random/CryptoRandomFactory.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/6cbf4e90/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java index 2c3b645..7c5c558 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java +++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java @@ -92,12 +92,11 @@ public class CryptoCipherFactory { /** * Gets a cipher instance for specified algorithm/mode/padding. * - * @param props the configuration properties - * (uses ConfigurationKeys.ENABLE_FALLBACK_ON_NATIVE_FAILED_KEY and ConfigurationKeys.CIPHER_CLASSES_KEY) + * @param props the configuration properties (uses ConfigurationKeys.CIPHER_CLASSES_KEY) * @param transformation algorithm/mode/padding - * @return CryptoCipher the cipher (defaults to OpensslCipher if available, else JceCipher) + * @return CryptoCipher the cipher (defaults to OpensslCipher) * @throws GeneralSecurityException if cipher initialize failed - * @throws IllegalArgumentException if no classname(s) are provided and fallback is disabled + * @throws IllegalArgumentException if no classname(s) */ public static CryptoCipher getInstance(String transformation, Properties props) throws GeneralSecurityException { http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/6cbf4e90/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java index b5d8c2e..81c18aa 100644 --- a/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java +++ b/src/main/java/org/apache/commons/crypto/random/CryptoRandomFactory.java @@ -79,7 +79,7 @@ public class CryptoRandomFactory { } /** - * The default value (OpensslCipher) for crypto cipher. + * The default value (OpensslCryptoRandom,JavaCryptoRandom) for crypto cipher. */ private static final String SECURE_RANDOM_CLASSES_DEFAULT = RandomProvider .OPENSSL.getClassName().concat(",").concat(RandomProvider.JCE @@ -96,13 +96,13 @@ public class CryptoRandomFactory { * Uses the SECURE_RANDOM_CLASSES_KEY from the provided * properties. * If it is not set, then it checks the System properties. - * Failing that, it defaults to {@link JavaCryptoRandom} + * Failing that, it defaults to OpensslCryptoRandom,JavaCryptoRandom * The properties are passed to the generated class. * * @param props the configuration properties. * @return CryptoRandom the cryptoRandom object. * @throws GeneralSecurityException if cannot create the {@link CryptoRandom} class - * @throws IllegalArgumentException if no classname(s) are provided and fallback is disabled + * @throws IllegalArgumentException if no classname(s) are provided */ public static CryptoRandom getCryptoRandom(Properties props) throws GeneralSecurityException {
