Revert changes from FS-5719, You'll have to make these changes yourself locally if you want these types of certificates
This commit is contained in:
parent
6a3bf7c4a7
commit
86f9029b98
|
@ -87,9 +87,8 @@ 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" -newkey ec:CA_CURVE.pem \
|
-new -x509 -keyout "${CONFDIR}/CA/cakey.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
|
||||||
|
@ -131,7 +130,7 @@ generate_cert() {
|
||||||
> "${TMPFILE}.cfg" || exit 1
|
> "${TMPFILE}.cfg" || exit 1
|
||||||
|
|
||||||
openssl req -new -out "${TMPFILE}.req" \
|
openssl req -new -out "${TMPFILE}.req" \
|
||||||
-newkey ec:CA_CURVE.pem -keyout "${TMPFILE}.key" \
|
-newkey rsa:${KEY_SIZE} -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 \
|
||||||
|
@ -157,6 +156,7 @@ 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
|
||||||
|
|
Loading…
Reference in New Issue