HADOOP-13911. Remove TRUSTSTORE_PASSWORD related scripts from KMS. Contributed by John Zhuge.

(cherry picked from commit 30f85d7a88a110637757cf7a1f4cdc9ed40f59fb)

Conflicts:
	hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh
	hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml

hadoop-common-project/hadoop-kms/src/main/sbin/kms.sh

@@ -45,9 +45,6 @@ fi
 # it is used in Tomcat's server.xml configuration file
 #
 
-# Mask the trustStorePassword
-KMS_SSL_TRUSTSTORE_PASS=`echo $CATALINA_OPTS | grep -o 'trustStorePassword=[^ ]*' | awk -F'=' '{print $2}'`
-CATALINA_OPTS_DISP=`echo ${CATALINA_OPTS} | sed -e 's/trustStorePassword=[^ ]*/trustStorePassword=***/'`
 print "Using   CATALINA_OPTS:       ${CATALINA_OPTS_DISP}"
 
 catalina_opts="-Dproc_kms"
@@ -97,8 +94,6 @@ if [[ "${1}" = "start" || "${1}" = "run" ]]; then
   KMS_SSL_KEYSTORE_PASS=${KMS_SSL_KEYSTORE_PASS:-password}
   catalina_set_property "kms.ssl.keystore.pass" \
     "${KMS_SSL_KEYSTORE_PASS}" "<redacted>"
-  catalina_set_property "kms.ssl.truststore.pass" \
-    "${KMS_SSL_TRUSTSTORE_PASS}" "<redacted>"
 fi
 
 # A bug in catalina.sh script does not use CATALINA_OPTS for stopping the server

hadoop-common-project/hadoop-kms/src/main/tomcat/ssl-server.xml

@@ -76,7 +76,6 @@
                clientAuth="${kms.ssl.client.auth}"
                sslEnabledProtocols="${kms.ssl.enabled.protocols}"
                ciphers="${kms.ssl.ciphers}"
-               truststorePass="${kms.ssl.truststore.pass}"
                keystoreFile="${kms.ssl.keystore.file}"
                keystorePass="${kms.ssl.keystore.pass}"/>