TOOLS-1334: (TOOLS) Remove SSLv3 support.

aerospike · May 10, 2019 · 94ebb2f · 94ebb2f
1 parent 9cf617d
commit 94ebb2f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ __Options__:
 -ec,--abort-Error-Count<arg>    Abort when error occurs more than this value (default: 0 (don`t abort))
 -wa,--write-Action <arg>        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
@@ -16,7 +16,7 @@
 | -ec <abort-error-count>   | Error threshold to determine when the loader should stop loading data. Set it to 0 to ignore the threshold.                                                                                                                                                                                                                                                                                                                                                                                                        | 0                   |
 | -wa <write-action>        | 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 <tls-enable>              | Use TLS/SSL sockets                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            | False               |                                                                        
-| -tp <tls-protocols>            | Allow TLS protocols. Values:  SSLv3,TLSv1,TLSv1.1,TLSv1.2 separated by comma                                                                                                                                                                                                                                                                                                                                                                                                                                   | TLSv1.2)            |
+| -tp <tls-protocols>            | Allow TLS protocols. Values:  TLSv1,TLSv1.1,TLSv1.2 separated by comma                                                                                                                                                                                                                                                                                                                                                                                                                                   | TLSv1.2)            |
 | -tlsCiphers <tls-cipher-suite>  | Allow TLS cipher suites. Values:  cipher names defined by JVM separated by comma                                                                                                                                                                                                                                                                                                                                                                                                                               | null (default cipher list provided by JVM)|
 | -tr <tls-revoke>               | Revoke certificates identified by their serial number. Values:  serial numbers separated by comma                                                                                                                                                                                                                                                                                                                                                                                                              | null (Do not revoke certificates)|
 | -te <tls-encrypt-only>          | Enable TLS encryption and disable TLS certificate validation

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
 		<dependency>
 			<groupId>com.aerospike</groupId>
 			<artifactId>aerospike-client</artifactId>
-			<version>4.3.0</version>
+			<version>4.4.0</version>
 		</dependency>
 		<!-- Apache command line parser. -->
 		<dependency>

diff --git 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<arg>		Abort when error occurs more than this value(default: 0(don't abort))
  * -wa,--write-Action <arg>			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,