Repository: commons-crypto Updated Branches: refs/heads/master 1d40a4955 -> 49c8053f5
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/49c8053f Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/49c8053f Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/49c8053f Branch: refs/heads/master Commit: 49c8053f51e1e384c229ffd62c4f82c8029eabf4 Parents: 1d40a49 Author: Sebb <s...@apache.org> Authored: Mon Jun 27 19:11:21 2016 +0100 Committer: Sebb <s...@apache.org> Committed: Mon Jun 27 19:11:21 2016 +0100 ---------------------------------------------------------------------- .../org/apache/commons/crypto/cipher/CryptoCipherFactory.java | 5 +++-- src/main/java/org/apache/commons/crypto/cipher/JceCipher.java | 4 ++-- .../java/org/apache/commons/crypto/cipher/OpensslCipher.java | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/49c8053f/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 4cb3788..8ab761c 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java +++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipherFactory.java @@ -44,8 +44,9 @@ public class CryptoCipherFactory { /** * Gets a cipher instance for specified algorithm/mode/padding. * - * @param props the configuration properties - * @param transformation algorithm/mode/padding + * @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. Null value will be returned if no cipher * classes with transformation configured. * @throws GeneralSecurityException if cipher initialize failed http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/49c8053f/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java index b76b635..d418470 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java +++ b/src/main/java/org/apache/commons/crypto/cipher/JceCipher.java @@ -42,8 +42,8 @@ class JceCipher implements CryptoCipher { /** * Constructs a {@link CryptoCipher} based on JCE Cipher {@link Cipher}. * - * @param props properties for JCE cipher - * @param transformation transformation for JCE cipher + * @param props properties for JCE cipher (only uses ConfigurationKeys.CIPHER_JCE_PROVIDER_KEY) + * @param transformation transformation for JCE cipher (algorithm/mode/padding) * @throws GeneralSecurityException if JCE cipher initialize failed */ public JceCipher(Properties props, String transformation) http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/49c8053f/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java b/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java index 0dc34fe..b4366ab 100644 --- a/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java +++ b/src/main/java/org/apache/commons/crypto/cipher/OpensslCipher.java @@ -46,8 +46,8 @@ class OpensslCipher implements CryptoCipher { /** * Constructs a {@link CryptoCipher} using JNI into OpenSSL * - * @param props properties for OpenSSL cipher - * @param transformation transformation for OpenSSL cipher + * @param props properties for OpenSSL cipher (unused) + * @param transformation transformation for OpenSSL cipher (algorithm/mode/padding) * @throws GeneralSecurityException if OpenSSL cipher initialize failed */ public OpensslCipher(Properties props, String transformation) // NOPMD
