Merge branch 'CRYPTO-82'
Project: http://git-wip-us.apache.org/repos/asf/commons-crypto/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-crypto/commit/6ac3e74f Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/6ac3e74f Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/6ac3e74f Branch: refs/heads/master Commit: 6ac3e74faef0d4f0fb92786d540505bcd2a808b4 Parents: 6529207 9f1e201 Author: Sun Dapeng <[email protected]> Authored: Fri Jun 24 16:10:59 2016 +0800 Committer: Sun Dapeng <[email protected]> Committed: Fri Jun 24 16:10:59 2016 +0800 ---------------------------------------------------------------------- .../crypto/cipher/CipherTransformation.java | 98 -------------------- .../commons/crypto/cipher/CryptoCipher.java | 18 +++- .../crypto/cipher/CryptoCipherFactory.java | 11 ++- .../apache/commons/crypto/cipher/JceCipher.java | 32 +++++-- .../commons/crypto/cipher/OpensslCipher.java | 32 +++++-- .../crypto/examples/CipherByteArrayExample.java | 3 +- .../examples/CipherByteBufferExample.java | 3 +- .../commons/crypto/examples/StreamExample.java | 3 +- .../crypto/stream/CTRCryptoInputStream.java | 10 +- .../crypto/stream/CTRCryptoOutputStream.java | 10 +- .../crypto/stream/CryptoInputStream.java | 17 ++-- .../crypto/stream/CryptoOutputStream.java | 17 ++-- .../stream/PositionedCryptoInputStream.java | 6 +- .../org/apache/commons/crypto/utils/Utils.java | 15 +-- src/site/xdoc/userguide.xml | 8 +- .../crypto/cipher/AbstractCipherTest.java | 20 ++-- .../crypto/cipher/CryptoCipherFactoryTest.java | 8 +- .../commons/crypto/cipher/JceCipherTest.java | 8 +- .../crypto/cipher/OpensslCipherTest.java | 16 ++-- .../apache/commons/crypto/cipher/TestData.java | 10 +- .../crypto/stream/AbstractCipherStreamTest.java | 3 +- .../stream/CBCNoPaddingCipherStreamTest.java | 4 +- .../stream/CBCPKCS5PaddingCipherStreamTest.java | 4 +- .../crypto/stream/CTRCryptoStreamTest.java | 3 +- .../stream/CTRNoPaddingCipherStreamTest.java | 4 +- .../stream/PositionedCryptoInputStreamTest.java | 3 +- 26 files changed, 153 insertions(+), 213 deletions(-) ----------------------------------------------------------------------
