Skip to content

Commit

Permalink
Merge branch 'release/anemone'
Browse files Browse the repository at this point in the history
  • Loading branch information
dhedey committed Feb 15, 2024
2 parents 1701e88 + b450ba0 commit cf626fd
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ RUN apt-get update -y \
# Fixes CVE-2023-4911 can be removed when we update the base OS image to include this fix
# docker run -it debian:12.1-slim ldd --version
# This fix can be removed as long as the version printed in the above command is 2.36-9+deb12u3 or above
libc6=2.36-9+deb12u3 \
libc6=2.36-9+deb12u4 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
8 changes: 3 additions & 5 deletions common/src/main/java/com/radixdlt/crypto/RadixKeyStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,9 @@
* store,
*
* <p><b>Implementation note:</b><br>
* This store uses a PKCS#12 representation for the underlying storage, and the store requires a
* non-empty password to protect it. In order to ease unattended use, note that where a password is
* required, a {@code null}, or zero length password may be provided, in which case the default 5
* character password, "radix" is used. Clearly this is insecure, and clients should make an effort
* to specify passwords in a secure way.
* This store uses a PKCS#12 representation for the underlying storage. It's required to supply a
* non-null password for the keystore, but it can be empty. An empty password will be used as-is,
* without any replacement default.
*/
@SecurityCritical(SecurityKind.KEY_STORE)
public final class RadixKeyStore implements Closeable {
Expand Down
5 changes: 5 additions & 0 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ dependencies {
implementation project(':olympia-engine')
implementation project(':common')
implementation project(':core-rust-bridge')
implementation project(':keygen')
implementation 'com.fasterxml.jackson.core:jackson-databind'

implementation 'io.swagger:swagger-annotations:1.5.0'
Expand Down Expand Up @@ -377,3 +378,7 @@ task deb4docker(dependsOn: buildDeb) {
println "SUCCESS: deb package copied for the docker build to: $destinationLocation"
}
}

applicationDistribution.from(new File(project(':keygen').buildDir, "scripts")) {
into "bin"
}

0 comments on commit cf626fd

Please sign in to comment.