changeset 1380:04482e2a6ca3

fix ssl
author Franklin Schmidt <fschmidt@gmail.com>
date Sun, 28 Jul 2019 11:06:37 -0600
parents 87a3738d7cc5
children 8d7a39ca2c0c
files scripts/build-luan.sh scripts/install.sh scripts/jvm.java.security src/luan/modules/Rpc.luan
diffstat 4 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/build-luan.sh	Wed Jul 24 11:43:04 2019 -0600
+++ b/scripts/build-luan.sh	Sun Jul 28 11:06:37 2019 -0600
@@ -15,6 +15,7 @@
 cp scripts/install.sh build/luan
 chmod +x build/luan/install.sh
 cp scripts/uninstall.sh build/luan
+cp scripts/jvm.java.security build/luan
 
 cd build
 VERSION=`java -classpath $CLASSPATH luan.Luan classpath:luan/version.luan`
--- a/scripts/install.sh	Wed Jul 24 11:43:04 2019 -0600
+++ b/scripts/install.sh	Sun Jul 28 11:06:37 2019 -0600
@@ -6,8 +6,9 @@
 
 cat >/usr/local/bin/luan <<End
 for i in `pwd`/jars/* ; do CLASSPATH=\$CLASSPATH:\$i ; done
+SECURITY=`pwd`/jvm.java.security;
 
-java -classpath \$CLASSPATH luan.Luan "\$@"
+java -classpath \$CLASSPATH -Djava.security.properties="\$SECURITY" luan.Luan "\$@"
 End
 
 chmod +x /usr/local/bin/luan
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/scripts/jvm.java.security	Sun Jul 28 11:06:37 2019 -0600
@@ -0,0 +1,2 @@
+jdk.tls.disabledAlgorithms=SSLv3, RC4, DES, MD5withRSA, DH keySize < 1024, \
+    EC keySize < 224, 3DES_EDE_CBC
--- a/src/luan/modules/Rpc.luan	Wed Jul 24 11:43:04 2019 -0600
+++ b/src/luan/modules/Rpc.luan	Sun Jul 28 11:06:37 2019 -0600
@@ -33,7 +33,6 @@
 
 Rpc.port = 9101
 
---[[
 Rpc.cipher_suites = {
 	"TLS_DH_anon_WITH_AES_128_GCM_SHA256"
 	"TLS_DH_anon_WITH_AES_128_CBC_SHA256"
@@ -47,7 +46,6 @@
 	"SSL_DH_anon_EXPORT_WITH_DES40_CBC_SHA"
 	"SSL_DH_anon_EXPORT_WITH_RC4_40_MD5"
 }
-]]
 
 local function java_args(list)
 	for i,v in ipairs(list) do