summaryrefslogtreecommitdiffstats
path: root/security/src
diff options
context:
space:
mode:
Diffstat (limited to 'security/src')
-rwxr-xr-xsecurity/src/main/files/certimport.sh36
1 files changed, 32 insertions, 4 deletions
diff --git a/security/src/main/files/certimport.sh b/security/src/main/files/certimport.sh
index c021a10..ca36a70 100755
--- a/security/src/main/files/certimport.sh
+++ b/security/src/main/files/certimport.sh
@@ -7,12 +7,40 @@ set -e
CERTSTORE=cacerts.bks
+# put required 1.6 VM at head of PATH
+JDK6PATH=/usr/lib/jvm/java-6-sun/bin
+if [ ! -e $JDK6PATH/java ] ; then
+ set +x
+ echo
+ echo "WARNING: could not find $JDK6PATH/java but continuing anyway."
+ echo " you might consider making sure the expected JDK is installed"
+ echo " or updating its location in this script."
+ echo
+ set -x
+fi
+export PATH=$JDK6PATH:$PATH
+
# Check java version.
JAVA_VERSION=`java -version 2>&1 | head -1`
JAVA_VERSION_MINOR=`expr match "$JAVA_VERSION" "java version \"[1-9]\.\([0-9]\).*\""`
if [ $JAVA_VERSION_MINOR -lt 6 ]; then
- echo "java version 1.6 or greater required for keytool usage"
- exit 255
+ set +x
+ echo
+ echo "ERROR: java version 1.6 or greater required for keytool usage"
+ echo
+ exit 1
+fi
+
+PROVIDER_CLASS=org.bouncycastle.jce.provider.BouncyCastleProvider
+PROVIDER_PATH=/usr/share/java/bcprov.jar
+
+if [ ! -e $PROVIDER_PATH ] ; then
+ set +x
+ echo
+ echo "ERROR: could not find provider path $PROVIDER_PATH. Try installing with:"
+ echo " sudo apt-get install libbcprov-java"
+ echo
+ exit 1
fi
if [ -a $CERTSTORE ]; then
@@ -34,8 +62,8 @@ for cert in `ls -1 cacerts`
-file <(openssl x509 -in cacerts/$cert) \
-keystore $CERTSTORE \
-storetype BKS \
- -provider org.bouncycastle.jce.provider.BouncyCastleProvider \
- -providerpath /usr/share/java/bcprov.jar \
+ -provider $PROVIDER_CLASS \
+ -providerpath $PROVIDER_PATH \
-storepass $STOREPASS
let "COUNTER=$COUNTER + 1"
done