Repository: commons-crypto Updated Branches: refs/heads/master 6ea9d3d89 -> 8feb4adad
Javadoc Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/8feb4ada Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/8feb4ada Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/8feb4ada Branch: refs/heads/master Commit: 8feb4adade36c9d35fc318c10445ef71c1cab25e Parents: 6ea9d3d Author: Sebb <s...@apache.org> Authored: Tue Jun 28 01:34:07 2016 +0100 Committer: Sebb <s...@apache.org> Committed: Tue Jun 28 01:34:07 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/crypto/cipher/CryptoCipherFactory.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/8feb4ada/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 7285c45..55a3203 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java +++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java @@ -30,7 +30,7 @@ import org.apache.commons.crypto.utils.Utils; public class CryptoCipherFactory { /** - * The default value for crypto cipher. + * The default value (OpensslCipher) for crypto cipher. */ private static final String CIPHER_CLASSES_DEFAULT = OpensslCipher.class.getName(); @@ -47,7 +47,7 @@ public class CryptoCipherFactory { * @param props the configuration properties * (uses ConfigurationKeys.ENABLE_FALLBACK_ON_NATIVE_FAILED_KEY and ConfigurationKeys.CIPHER_CLASSES_KEY) * @param transformation algorithm/mode/padding - * @return CryptoCipher the cipher + * @return CryptoCipher the cipher (defaults to OpensslCipher if available, else JceCipher) * @throws GeneralSecurityException if cipher initialize failed * @throws IllegalArgumentException if no classname(s) are provided and fallback is disabled */ @@ -92,8 +92,7 @@ public class CryptoCipherFactory { * <i>AES/CBC/PKCS5Padding</i>. * See the Java Cryptography Architecture Standard Algorithm Name Documentation * for information about standard transformation names. - * @return CryptoCipher the cipher object Null value will be returned if no - * cipher classes with transformation configured. + * @return CryptoCipher the cipher object (defaults to OpensslCipher if available, else JceCipher) * @throws GeneralSecurityException if JCE cipher initialize failed */ public static CryptoCipher getInstance(String transformation)
