michaelsembwever commented on code in PR #2505:
URL: https://github.com/apache/cassandra/pull/2505#discussion_r1270646348
##########
src/java/org/apache/cassandra/security/DefaultCryptoProvider.java:
##########
@@ -39,11 +39,20 @@ public void installProvider()
{
try
{
- AmazonCorrettoCryptoProvider.install();
+
Class.forName("com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider");
Review Comment:
what if we want something completely different? (like we load other things…)
##########
src/java/org/apache/cassandra/security/DefaultCryptoProvider.java:
##########
@@ -39,11 +39,20 @@ public void installProvider()
{
try
{
- AmazonCorrettoCryptoProvider.install();
+
Class.forName("com.amazon.corretto.crypto.provider.AmazonCorrettoCryptoProvider");
Review Comment:
what if we want something completely different? (like we load other things…)
##########
.build/parent-pom-template.xml:
##########
@@ -239,6 +239,40 @@
<developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree</url>
</scm>
+
+ <profiles>
+ <profile>
+ <id>x86_64</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
Review Comment:
how will this not be enabled when `aarch64` is …? (profiles are not
exclusive)
##########
.build/parent-pom-template.xml:
##########
@@ -239,6 +239,40 @@
<developerConnection>scm:https://gitbox.apache.org/repos/asf/cassandra.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=cassandra.git;a=tree</url>
</scm>
+
+ <profiles>
+ <profile>
+ <id>x86_64</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
Review Comment:
how will this not be enabled when `aarch64` is …? (profiles are not
exclusive)
##########
.build/build-resolver.xml:
##########
@@ -279,6 +288,15 @@
<url
url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
<url
url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
</get>
+
+
+ <!-- Amazon Corretto Crypto Providers for various architectures -->
+ <get
src="${artifact.github.release}/corretto/amazon-corretto-crypto-provider/releases/download/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
+
dest="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
+ usetimestamp="true" quiet="true" skipexisting="true"/>
+ <get
src="${artifact.github.release}/corretto/amazon-corretto-crypto-provider/releases/download/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
+
dest="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
+ usetimestamp="true" quiet="true" skipexisting="true"/>
Review Comment:
can we not resolve and pull by maven coordinates ?
##########
.build/build-resolver.xml:
##########
@@ -246,6 +247,14 @@
<file
file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
<file
file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
</copy>
+
+ <copy todir="${build.lib}/corretto" quiet="true">
+ <file
file="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"/>
+ <file
file="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"/>
+ </copy>
+
+ <delete
file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
failonerror="false"/>
+ <delete
file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
failonerror="false"/>
Review Comment:
why the two deletes?
##########
.build/build-resolver.xml:
##########
@@ -279,6 +288,15 @@
<url
url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-linux.so"/>
<url
url="${lib.download.base.url}/lib/sigar-bin/libsigar-x86-solaris.so"/>
</get>
+
+
+ <!-- Amazon Corretto Crypto Providers for various architectures -->
+ <get
src="${artifact.github.release}/corretto/amazon-corretto-crypto-provider/releases/download/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
+
dest="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
+ usetimestamp="true" quiet="true" skipexisting="true"/>
+ <get
src="${artifact.github.release}/corretto/amazon-corretto-crypto-provider/releases/download/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
+
dest="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
+ usetimestamp="true" quiet="true" skipexisting="true"/>
Review Comment:
can we not resolve and pull by maven coordinates ?
##########
.build/build-resolver.xml:
##########
@@ -246,6 +247,14 @@
<file
file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-linux.so"/>
<file
file="${local.repository}/org/apache/cassandra/deps/sigar-bin/libsigar-x86-solaris.so"/>
</copy>
+
+ <copy todir="${build.lib}/corretto" quiet="true">
+ <file
file="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"/>
+ <file
file="${local.repository}/software/amazon/cryptools/AmazonCorrettoCryptoProvider/2.2.0/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"/>
+ </copy>
+
+ <delete
file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-x86_64.jar"
failonerror="false"/>
+ <delete
file="${build.lib}/AmazonCorrettoCryptoProvider-2.2.0-linux-aarch_64.jar"
failonerror="false"/>
Review Comment:
why the two deletes?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
