[commons-crypto] 01/01: Merge branch 'master' into sebb-docker
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git commit ec1d46d0e7fc77e394d91f65aa4a58e1e75c46f8 Merge: 335f964 e8677e9 Author: Sebb AuthorDate: Fri Jun 17 23:19:55 2022 +0100 Merge branch 'master' into sebb-docker BUILDING.txt| 8 src/site/xdoc/userguide.xml | 20 ++-- 2 files changed, 18 insertions(+), 10 deletions(-)
[commons-crypto] branch sebb-docker updated (335f964 -> ec1d46d)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git from 335f964 How to add items to build add e8677e9 Fix up some docs new ec1d46d Merge branch 'master' into sebb-docker The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: BUILDING.txt| 8 src/site/xdoc/userguide.xml | 20 ++-- 2 files changed, 18 insertions(+), 10 deletions(-)
[commons-crypto] branch master updated: Fix up some docs
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/master by this push: new e8677e9 Fix up some docs e8677e9 is described below commit e8677e989df5b8b1d688358de160cdb9b35ff193 Author: Sebb AuthorDate: Fri Jun 17 23:19:28 2022 +0100 Fix up some docs --- BUILDING.txt| 8 src/site/xdoc/userguide.xml | 20 ++-- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/BUILDING.txt b/BUILDING.txt index 6b5da97..d7a1c6d 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -8,9 +8,9 @@ Requirements: * Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files (if running unit tests) * export JAVA_HOME -* Maven 3.0 or above +* Maven 3.3.9 or above * Make -* OpenSSL devel 1.1.1 or above (OpenSSL library header files are required) +* OpenSSL devel 1.1.1 (OpenSSL library header files are required) * GCC * G++ @@ -46,7 +46,7 @@ Check OpenSSL version: $ openssl version -If it is not 1.0.1c or above, upgrade OpenSSL version to 1.0.1c or above: +If it is not 1.1.1, upgrade OpenSSL version to 1.1.1: Upgrade OpenSSL in Linux: @@ -54,7 +54,7 @@ You can follow your OS distribution instructions to upgrade OpenSSL to a proper Upgrade OpenSSL in Mac: - $ brew install openssl101 + $ brew install openssl111 $ brew link openssl --force Get OpenSSL headers: sudo apt -y install libssl-dev diff --git a/src/site/xdoc/userguide.xml b/src/site/xdoc/userguide.xml index 2755004..b99c1bd 100644 --- a/src/site/xdoc/userguide.xml +++ b/src/site/xdoc/userguide.xml @@ -20,8 +20,12 @@ (Advanced Encryption Standard New Instructions). It provides Java API for both cipher level and Java stream level. Developers can use it to implement high performance AES encryption/decryption with -the minimum code and effort. Please note that Apache Commons Crypto doesn't implement the cryptographic -algorithm such as AES directly. It wraps to Openssl or JCE which implement the algorithms. +the minimum code and effort. + + +Please note that Apache Commons Crypto doesn't implement the cryptographic +algorithm such as AES directly. It wraps Openssl or JCE which implement the algorithms. +OpenSSL 1.1.1 is required for building and running. Interfaces and classes used by the various implementation in the sub-packages. @@ -61,8 +65,12 @@ Prerequisites -Commons Crypto relies on standard JDK 1.7 (or above) and OpenSSL 1.0.1c (or above) for production -deployment. +Commons Crypto relies on standard JDK 1.8 (or above) and OpenSSL 1.1.1 for production +deployment. +If it is installed, the command openssl version can be used to show the version. + + OpenSSL may already be installed on your system; if not, please visit +https://www.openssl.org/;>OpenSSL.org for information on installation. Using Commons Crypto in your Apache Maven build @@ -78,7 +86,7 @@ Usage of Random API CryptoRandom provides a cryptographically strong random number generators. - The default implementation will use Intel� Digital Random Number Generator (DRNG) + The default implementation will use Intel Digital Random Number Generator (DRNG) for accelerating the random generation. @@ -89,7 +97,7 @@ Cipher provides an cryptographic interface for encryption and decryption. We provide two kind of implementations: JCE Cipher and Openssl Cipher. The JCE implementation uses JCE provider and the Openssl implementation uses - Intel� AES New Instructions (Intel� AES NI). + Intel AES New Instructions (Intel AES NI). Usage of Byte Array Encryption/Decryption
[commons-crypto] branch sebb-docker updated: How to add items to build
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/sebb-docker by this push: new 335f964 How to add items to build 335f964 is described below commit 335f964f5618ce4311a5a55ad560bde26d7569ee Author: Sebb AuthorDate: Fri Jun 17 17:36:02 2022 +0100 How to add items to build --- src/docker/README.md | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/docker/README.md b/src/docker/README.md index bc57624..fb00d06 100644 --- a/src/docker/README.md +++ b/src/docker/README.md @@ -25,6 +25,12 @@ which are used to build Linux and Windows native code files (see build.sh for th The image uses virtual mounts for the source code and Maven repository, so the output of the build is available on the host system and can be included in a subsequent release build. + +The binary jar is built from the contents of target/classes, so any additional native objects can be added to the build by copying them to the appropriate directory under +target/classes/org/apache/commons/crypto/native before creating the release. +For example, the macOS object can be added as +target/classes/org/apache/commons/crypto/native/Mac/x86_64/libcommons-crypto.jnilib + # Building with Docker ```
[commons-crypto] branch sebb-docker updated: No longer needed
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/sebb-docker by this push: new b2212c4 No longer needed b2212c4 is described below commit b2212c47cb6fe9e018268af7a8a5bb529e3d4ccf Author: Sebb AuthorDate: Fri Jun 17 17:27:22 2022 +0100 No longer needed --- src/conf/Docker/Dockerfile-luw | 50 -- src/conf/Docker/readme.txt | 1 - 2 files changed, 51 deletions(-) diff --git a/src/conf/Docker/Dockerfile-luw b/src/conf/Docker/Dockerfile-luw deleted file mode 100644 index cb771a4..000 --- a/src/conf/Docker/Dockerfile-luw +++ /dev/null @@ -1,50 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -FROM ubuntu:18.04 - -ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64/ -ENV PATH=$PATH:/opt/apache-maven-3.6.3/bin - -RUN pwd ; uname -a && \ -apt-get update -y && \ -apt-get install build-essential -y && \ -apt-get install software-properties-common -y && \ -apt-get update -y && \ -add-apt-repository ppa:openjdk-r/ppa -y && \ -apt-get update -y && \ -apt-get install openjdk-8-jdk -y && \ -apt-get install g++-mingw-w64 -y && \ -apt-get install gcc-multilib -y && \ -apt-get install libssl-dev -y && \ -ln -s /usr/include/x86_64-linux-gnu /usr/include/i386-linux-gnu && \ -ln -s /usr/include/x86_64-linux-gnu/openssl/opensslconf.h /usr/include/openssl/opensslconf.h && \ -apt-get install git -y && \ -apt-get install wget -y && \ -cd ~ && \ -wget https://dlcdn.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz && \ -cd /opt && \ -tar -zxf ~/apache-maven-3.6.3-bin.tar.gz && \ -dpkg --purge --force-depends ca-certificates-java && \ -apt-get install ca-certificates-java -y && \ -apt-get install g++-multilib -y && \ -export OPENSSL_HOME=/usr && \ -cd ~ - - -CMD /bin/bash diff --git a/src/conf/Docker/readme.txt b/src/conf/Docker/readme.txt deleted file mode 100644 index d06c97a..000 --- a/src/conf/Docker/readme.txt +++ /dev/null @@ -1 +0,0 @@ -Dockerfile-luw: A Dockerfile for Linux and Windows.
[commons-parent] branch master updated: Add minimalMavenBuildVersion to silence complaints
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-parent.git The following commit(s) were added to refs/heads/master by this push: new 3a08dad Add minimalMavenBuildVersion to silence complaints 3a08dad is described below commit 3a08dad84cec51580dfcd57860315dd752d35d98 Author: Sebb AuthorDate: Fri Jun 17 14:10:59 2022 +0100 Add minimalMavenBuildVersion to silence complaints --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 8d878d8..e75c2d2 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,8 @@ + +3.3.9 2022-04-06T22:10:39Z
[commons-csv] branch dependabot/maven/com.h2database-h2-2.1.214 created (now 16f72f2e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/com.h2database-h2-2.1.214 in repository https://gitbox.apache.org/repos/asf/commons-csv.git at 16f72f2e Bump h2 from 2.1.212 to 2.1.214 No new revisions were added by this update.
[commons-jexl] branch dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.17.0 created (now e0ed3005)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.maven.plugins-maven-pmd-plugin-3.17.0 in repository https://gitbox.apache.org/repos/asf/commons-jexl.git at e0ed3005 Bump maven-pmd-plugin from 3.16.0 to 3.17.0 No new revisions were added by this update.
[commons-parent] branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.11.0 created (now 9969d8a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.codehaus.mojo-versions-maven-plugin-2.11.0 in repository https://gitbox.apache.org/repos/asf/commons-parent.git at 9969d8a Bump versions-maven-plugin from 2.10.0 to 2.11.0 No new revisions were added by this update.
[commons-crypto] branch sebb-docker updated: Keep Docker files together; add some docn
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/sebb-docker by this push: new 0caf57d Keep Docker files together; add some docn 0caf57d is described below commit 0caf57deb0ca4a879a981efafe5cd445065d3854 Author: Sebb AuthorDate: Fri Jun 17 11:33:35 2022 +0100 Keep Docker files together; add some docn --- src/docker/Dockerfile | 2 ++ src/docker/README.md| 14 -- build.sh => src/docker/build.sh | 0 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile index 3e01a5d..a6c529d 100644 --- a/src/docker/Dockerfile +++ b/src/docker/Dockerfile @@ -48,9 +48,11 @@ RUN dpkg --add-architecture i386 && apt-get update \ && apt-get --assume-yes install gcc-arm-linux-gnueabihf \ && apt-get --assume-yes install g++-arm-linux-gnueabihf +# Do this separately to make upgrades easier RUN wget https://dlcdn.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz \ && tar xf apache-maven-*.tar.gz -C /opt && ln -s /opt/apache-maven-3.6.3 /opt/maven +# Ensure we are in the correct directory (this will be overlaid by the virtual mount) WORKDIR /home/crypto CMD /bin/bash diff --git a/src/docker/README.md b/src/docker/README.md index 15f3784..bc57624 100644 --- a/src/docker/README.md +++ b/src/docker/README.md @@ -15,6 +15,16 @@ See the License for the specific language governing permissions and limitations under the License. --> + +# About + +This directory contains scripts needed to build Crypto native code using a Docker image. + +The Docker image runs on Ubuntu and includes Maven and cross-compilation tools +which are used to build Linux and Windows native code files (see build.sh for the list). +The image uses virtual mounts for the source code and Maven repository, so the output +of the build is available on the host system and can be included in a subsequent release +build. # Building with Docker ``` @@ -26,7 +36,7 @@ ``` cd src/docker - docker compose run crypto # run shell + docker compose run crypto # run shell; can then use Maven to do builds OR - docker compose run --entrypoint ./build.sh crypto # run build + docker compose run --entrypoint src/docker/build.sh crypto # run full build ``` \ No newline at end of file diff --git a/build.sh b/src/docker/build.sh similarity index 100% rename from build.sh rename to src/docker/build.sh
[commons-crypto] 01/01: Merge branch 'master' into sebb-docker
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git commit d58e77881132075651e81a95dff856b24f3f9407 Merge: 2c59385 ab2f444 Author: Sebb AuthorDate: Fri Jun 17 11:28:44 2022 +0100 Merge branch 'master' into sebb-docker Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[commons-crypto] branch sebb-docker updated (2c59385 -> d58e778)
This is an automated email from the ASF dual-hosted git repository. sebb pushed a change to branch sebb-docker in repository https://gitbox.apache.org/repos/asf/commons-crypto.git from 2c59385 Don't copy build script add ab2f444 Missing path separator new d58e778 Merge branch 'master' into sebb-docker The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[commons-crypto] branch master updated: Missing path separator
This is an automated email from the ASF dual-hosted git repository. sebb pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-crypto.git The following commit(s) were added to refs/heads/master by this push: new ab2f444 Missing path separator ab2f444 is described below commit ab2f4447aab9eb2764969893e71c2856108780cd Author: Sebb AuthorDate: Fri Jun 17 11:26:20 2022 +0100 Missing path separator --- Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index eb866d3..9c2068e 100644 --- a/Makefile.common +++ b/Makefile.common @@ -154,8 +154,8 @@ SunOS-x86_64_COMMONS_CRYPTO_FLAGS := Linux-arm_CC:= $(CROSS_PREFIX)gcc Linux-arm_CXX := $(CROSS_PREFIX)g++ Linux-arm_STRIP := $(CROSS_PREFIX)strip -Linux-arm_CFLAGS:= -Ilib/inc_linux -I"$(JAVA_HOME)include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=softfp -Linux-arm_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=softfp +Linux-arm_CFLAGS:= -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=softfp +Linux-arm_CXXFLAGS := -Ilib/inc_linux -I"$(JAVA_HOME)/include" -O2 -fPIC -fvisibility=hidden -mfloat-abi=softfp Linux-arm_LINKFLAGS := -shared -static-libgcc Linux-arm_LIBNAME := libcommons-crypto.so Linux-arm_COMMONS_CRYPTO_FLAGS:=
[commons-release-plugin] branch master updated: Bump maven.dependency.version from 3.8.5 to 3.8.6
This is an automated email from the ASF dual-hosted git repository. kinow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git The following commit(s) were added to refs/heads/master by this push: new a60d641 Bump maven.dependency.version from 3.8.5 to 3.8.6 a60d641 is described below commit a60d641cb5f94e7b32b19956929604c88eee0407 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Fri Jun 17 08:03:23 2022 + Bump maven.dependency.version from 3.8.5 to 3.8.6 Bumps `maven.dependency.version` from 3.8.5 to 3.8.6. Updates `maven-core` from 3.8.5 to 3.8.6 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.5...maven-3.8.6) Updates `maven-plugin-api` from 3.8.5 to 3.8.6 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.5...maven-3.8.6) Updates `maven-artifact` from 3.8.5 to 3.8.6 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.5...maven-3.8.6) Updates `maven-compat` from 3.8.5 to 3.8.6 - [Release notes](https://github.com/apache/maven/releases) - [Commits](https://github.com/apache/maven/compare/maven-3.8.5...maven-3.8.6) --- updated-dependencies: - dependency-name: org.apache.maven:maven-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-plugin-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-artifact dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.maven:maven-compat dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- src/changes/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f370568..f1252d2 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ 1.8 -3.8.5 +3.8.6 release-plugin commons-release-plugin COMMONSSITE diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 8a17aa8..1850e1a 100755 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -36,6 +36,7 @@ Bump spotbugs-maven-plugin from 4.6.0 to 4.7.0 #114. Bump plexus-velocity from 1.3 to 2.0 #116. Bump maven-scm.version from 1.12.2 to 1.13.0 #117. + Bump maven.dependency.version from 3.8.5 to 3.8.6 #120. Create signature validation script for releases.
[commons-release-plugin] branch dependabot/maven/maven.dependency.version-3.8.6 updated (54b146b -> 72a4f55)
This is an automated email from the ASF dual-hosted git repository. kinow pushed a change to branch dependabot/maven/maven.dependency.version-3.8.6 in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git discard 54b146b Bump maven.dependency.version from 3.8.5 to 3.8.6 add 72a4f55 Bump maven.dependency.version from 3.8.5 to 3.8.6 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (54b146b) \ N -- N -- N refs/heads/dependabot/maven/maven.dependency.version-3.8.6 (72a4f55) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: src/changes/changes.xml | 1 + 1 file changed, 1 insertion(+)
[commons-release-plugin] branch dependabot/maven/maven.dependency.version-3.8.6 created (now 54b146b)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/maven.dependency.version-3.8.6 in repository https://gitbox.apache.org/repos/asf/commons-release-plugin.git at 54b146b Bump maven.dependency.version from 3.8.5 to 3.8.6 No new revisions were added by this update.
[commons-jcs] branch dependabot/maven/org.apache.derby-derby-10.16.1.1 created (now da5fb32e)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/maven/org.apache.derby-derby-10.16.1.1 in repository https://gitbox.apache.org/repos/asf/commons-jcs.git at da5fb32e Bump derby from 10.11.1.1 to 10.16.1.1 No new revisions were added by this update.
