You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2016/06/30 19:09:25 UTC

[1/2] commons-crypto git commit: Bad line break

Repository: commons-crypto
Updated Branches:
  refs/heads/master 2e3939f2f -> cc3a0651d


Bad line break

Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/907b4d26
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/907b4d26
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/907b4d26

Branch: refs/heads/master
Commit: 907b4d26e27c784b4d2834232a29e861c488be36
Parents: 0c1f065
Author: Sebb <se...@apache.org>
Authored: Thu Jun 30 20:08:41 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Thu Jun 30 20:08:41 2016 +0100

----------------------------------------------------------------------
 src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/commons-crypto/blob/907b4d26/src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java
index 941c452..6cd83b5 100644
--- a/src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java
+++ b/src/main/java/org/apache/commons/crypto/cipher/CryptoCipher.java
@@ -63,8 +63,8 @@ public interface CryptoCipher extends Closeable {
     /**
      * Initializes the cipher with mode, key and iv.
      *
-     * @param mode {@link javax.crypto.Cipher#ENCRYPT_MODE} or {@link javax
-     * .crypto.Cipher#DECRYPT_MODE}
+     * @param mode {@link javax.crypto.Cipher#ENCRYPT_MODE} or 
+     *             {@link javax.crypto.Cipher#DECRYPT_MODE}
      * @param key crypto key for the cipher
      * @param params the algorithm parameters
      * @throws InvalidKeyException if the given key is inappropriate for


[2/2] commons-crypto git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/commons-crypto.git

Posted by se...@apache.org.
Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/commons-crypto.git

Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/cc3a0651
Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/cc3a0651
Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/cc3a0651

Branch: refs/heads/master
Commit: cc3a0651d614807d77ef00f6110b6c1e96fca2b3
Parents: 907b4d2 2e3939f
Author: Sebb <se...@apache.org>
Authored: Thu Jun 30 20:08:58 2016 +0100
Committer: Sebb <se...@apache.org>
Committed: Thu Jun 30 20:09:21 2016 +0100

----------------------------------------------------------------------
 .../commons/crypto/jna/OpenSslJnaCipher.java    | 28 +++++++++-----------
 .../crypto/jna/OpenSslJnaCryptoRandom.java      |  4 +--
 2 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------