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/4ca3724b Tree: http://git-wip-us.apache.org/repos/asf/commons-crypto/tree/4ca3724b Diff: http://git-wip-us.apache.org/repos/asf/commons-crypto/diff/4ca3724b Branch: refs/heads/master Commit: 4ca3724bc02489b8d9ac9d49132d3a4d3fbc5ca5 Parents: 4d49af4 a289ecd Author: ggregory <[email protected]> Authored: Mon Jun 6 17:44:21 2016 -0700 Committer: ggregory <[email protected]> Committed: Mon Jun 6 17:44:21 2016 -0700 ---------------------------------------------------------------------- Makefile.common | 14 +++--- README.md | 28 +++++++++++ pom.xml | 49 ++++++++++++++++++++ src/changes/changes.xml | 6 ++- src/main/java/org/apache/commons/crypto/VERSION | 17 ------- .../commons/crypto/cipher/CryptoCipher.java | 4 ++ .../commons/crypto/cipher/OpensslNative.java | 2 +- .../crypto/random/OpensslCryptoRandom.java | 10 ++-- .../resources/org/apache/commons/crypto/VERSION | 17 +++++++ .../crypto/random/AbstractRandomTest.java | 32 ++++++++++++- 10 files changed, 146 insertions(+), 33 deletions(-) ----------------------------------------------------------------------
