提交 8b7c351f authored 作者: Brian West's avatar Brian West

FS-5719 --resolve

上级 bf2fc31a
...@@ -87,8 +87,9 @@ setup_ca() { ...@@ -87,8 +87,9 @@ setup_ca() {
"${CONFDIR}/CA/config.tpl" \ "${CONFDIR}/CA/config.tpl" \
> "${TMPFILE}.cfg" || exit 1 > "${TMPFILE}.cfg" || exit 1
openssl ecparam -name secp160r2 -out CA_CURVE.pem
openssl req -out "${CONFDIR}/CA/cacert.pem" \ openssl req -out "${CONFDIR}/CA/cacert.pem" \
-new -x509 -keyout "${CONFDIR}/CA/cakey.pem" \ -new -x509 -keyout "${CONFDIR}/CA/cakey.pem" -newkey ec:CA_CURVE.pem \
-config "${TMPFILE}.cfg" -nodes -days ${DAYS} -sha1 >/dev/null || exit 1 -config "${TMPFILE}.cfg" -nodes -days ${DAYS} -sha1 >/dev/null || exit 1
cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem" cat "${CONFDIR}/CA/cacert.pem" > "${CONFDIR}/cafile.pem"
cp $TMPFILE.cfg /tmp/ssl.cfg cp $TMPFILE.cfg /tmp/ssl.cfg
...@@ -130,7 +131,7 @@ generate_cert() { ...@@ -130,7 +131,7 @@ generate_cert() {
> "${TMPFILE}.cfg" || exit 1 > "${TMPFILE}.cfg" || exit 1
openssl req -new -out "${TMPFILE}.req" \ openssl req -new -out "${TMPFILE}.req" \
-newkey rsa:${KEY_SIZE} -keyout "${TMPFILE}.key" \ -newkey ec:CA_CURVE.pem -keyout "${TMPFILE}.key" \
-config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1 -config "${TMPFILE}.cfg" -nodes -sha1 >/dev/null || exit 1
openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \ openssl x509 -req -CAkey "${CONFDIR}/CA/cakey.pem" -CA "${CONFDIR}/CA/cacert.pem" -CAcreateserial \
...@@ -156,7 +157,6 @@ remove_ca() { ...@@ -156,7 +157,6 @@ remove_ca() {
} }
OUTFILESET="0" OUTFILESET="0"
command="$1" command="$1"
shift
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case $1 in case $1 in
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论