From 94ebb2f3958cbdb6c00371a8618f0f4f30d8513b Mon Sep 17 00:00:00 2001 From: hbpatre Date: Fri, 10 May 2019 13:58:53 +0530 Subject: [PATCH] TOOLS-1334: (TOOLS) Remove SSLv3 support. --- README.md | 2 +- doc/options.md | 2 +- pom.xml | 2 +- src/main/java/com/aerospike/load/AerospikeLoad.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 257f258..11a6844 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ __Options__: -ec,--abort-Error-Count Abort when error occurs more than this value (default: 0 (don`t abort)) -wa,--write-Action Write action if key already exists (default: update) -tls,--tls-enable Use TLS/SSL sockets(default: False) --tp,--tls-protocols Allow TLS protocols. Values: SSLv3,TLSv1,TLSv1.1,TLSv1.2 separated by comma (default: TLSv1.2) +-tp,--tls-protocols Allow TLS protocols. Values: TLSv1,TLSv1.1,TLSv1.2 separated by comma (default: TLSv1.2) -tlsCiphers,--tls-cipher-suite Allow TLS cipher suites. Values: cipher names defined by JVM separated by comma (default: null (default cipher list provided by JVM)) -tr,--tls-revoke Revoke certificates identified by their serial number. Values: serial numbers separated by comma (default: null (Do not revoke certificates)) -te,--tls-encrypt-only Enable TLS encryption and disable TLS certificate validation diff --git a/doc/options.md b/doc/options.md index 98e953e..49a4f00 100644 --- a/doc/options.md +++ b/doc/options.md @@ -16,7 +16,7 @@ | -ec | Error threshold to determine when the loader should stop loading data. Set it to 0 to ignore the threshold. | 0 | | -wa | The possible values are: 1) UPDATE - Create or update records. Merge incoming bin values with existing ones, 2) UPDATE_ONLY - Update existing records. Fail if record does not exist. Merge incoming bin values with existing ones, 3) REPLACE - Create or replace existing records, 4) REPLACE_ONLY - Replace existing records. Fail if record does not exist, 5) CREATE_ONLY - Create new records. Fail if record already exists. | UPDATE | | -tls | Use TLS/SSL sockets | False | -| -tp | Allow TLS protocols. Values: SSLv3,TLSv1,TLSv1.1,TLSv1.2 separated by comma | TLSv1.2) | +| -tp | Allow TLS protocols. Values: TLSv1,TLSv1.1,TLSv1.2 separated by comma | TLSv1.2) | | -tlsCiphers | Allow TLS cipher suites. Values: cipher names defined by JVM separated by comma | null (default cipher list provided by JVM)| | -tr | Revoke certificates identified by their serial number. Values: serial numbers separated by comma | null (Do not revoke certificates)| | -te | Enable TLS encryption and disable TLS certificate validation diff --git a/pom.xml b/pom.xml index b76b3e3..3b852cb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ com.aerospike aerospike-client - 4.3.0 + 4.4.0 diff --git a/src/main/java/com/aerospike/load/AerospikeLoad.java b/src/main/java/com/aerospike/load/AerospikeLoad.java index 418ade0..9fa8675 100644 --- a/src/main/java/com/aerospike/load/AerospikeLoad.java +++ b/src/main/java/com/aerospike/load/AerospikeLoad.java @@ -75,7 +75,7 @@ * -ec,--abort-Error-Count Abort when error occurs more than this value(default: 0(don't abort)) * -wa,--write-Action Write action if key already exists (default: update) * -tls,--tls-enable Use TLS/SSL sockets(default: False) - * -tp,--tls-protocols Allow TLS protocols. Values: SSLv3,TLSv1,TLSv1.1,TLSv1.2 separated by comma (default: TLSv1.2) + * -tp,--tls-protocols Allow TLS protocols. Values: TLSv1,TLSv1.1,TLSv1.2 separated by comma (default: TLSv1.2) * -tlsCiphers,--tls-cipher-suite Allow TLS cipher suites. Values: cipher names defined by JVM separated by comma (default: null (default cipher list provided by JVM)) * -tr,--tls-revoke Revoke certificates identified by their serial number. Values: serial numbers separated by comma (default: null (Do not revoke certificates)) * -uk,--send-user-key Send user defined key in addition to hash digest to store on the server. (default: userKey is not sent to reduce meta-data overhead) @@ -166,7 +166,7 @@ public static void main(String[] args) throws IOException { options.addOption("tls", "tls-enable", false, "Use TLS/SSL sockets"); options.addOption("tp", "tls-protocols", true, "Allow TLS protocols\n" + - "Values: SSLv3,TLSv1,TLSv1.1,TLSv1.2 separated by comma\n" + + "Values: TLSv1,TLSv1.1,TLSv1.2 separated by comma\n" + "Default: TLSv1.2" ); options.addOption("tlsCiphers", "tls-cipher-suite", true,