diff options
author | Jonathan Rose <jrose@digium.com> | 2012-10-23 16:22:44 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2012-10-23 16:22:44 +0000 |
commit | 2c3638df989cb04339a3effce5e97fb1ba6fc213 (patch) | |
tree | d375b5f9e73a7dbe81ab6032cf338669bf8b9eb1 /contrib/scripts | |
parent | 3d540ef218a8d0a9a734bb7f84c9de428962ac1d (diff) |
ast_tls_cert script: Better response for various exit conditions to openssl
(closes issue ASTERISK-20260)
Reported by: Daniel O'Connor
Patches:
ast_tls_cert-update.diff uploaded by Daniel O'Connor (license 6419)
........
Merged revisions 375325 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 375326 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 375327 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@375328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'contrib/scripts')
-rwxr-xr-x | contrib/scripts/ast_tls_cert | 41 |
1 files changed, 36 insertions, 5 deletions
diff --git a/contrib/scripts/ast_tls_cert b/contrib/scripts/ast_tls_cert index 991352072..3c5363a00 100755 --- a/contrib/scripts/ast_tls_cert +++ b/contrib/scripts/ast_tls_cert @@ -30,20 +30,45 @@ EOF } create_ca () { - echo "Creating ${CAKEY}" + echo "Creating CA key ${CAKEY}" openssl genrsa -des3 -out ${CAKEY} 4096 > /dev/null - echo "Creating ${CACERT}" + if [ $? -ne 0 ]; + then + echo "Failed" + exit 1 + fi + echo "Creating CA certificate ${CACERT}" openssl req -new -config ${CACFG} -x509 -days 365 -key ${CAKEY} -out ${CACERT} > /dev/null + if [ $? -ne 0 ]; + then + echo "Failed" + exit 1 + fi } create_cert () { local base=${OUTPUT_DIR}/${OUTPUT_BASE} - echo "Creating ${base}.key" + echo "Creating certificate ${base}.key" openssl genrsa -out ${base}.key 1024 > /dev/null - echo "Creating signing request" + if [ $? -ne 0 ]; + then + echo "Failed" + exit 1 + fi + echo "Creating signing request ${base}.csr" openssl req -batch -new -config ${CONFIG_FILE} -key ${base}.key -out ${base}.csr > /dev/null - echo "Creating ${base}.crt" + if [ $? -ne 0 ]; + then + echo "Failed" + exit 1 + fi + echo "Creating certificate ${base}.crt" openssl x509 -req -days 365 -in ${base}.csr -CA ${CACERT} -CAkey ${CAKEY} -set_serial 01 -out ${base}.crt > /dev/null + if [ $? -ne 0 ]; + then + echo "Failed" + exit 1 + fi echo "Combining key and crt into ${base}.pem" cat ${base}.key > ${base}.pem cat ${base}.crt >> ${base}.pem @@ -181,6 +206,12 @@ then CACFG=${OUTPUT_DIR}/ca.cfg create_config ca "${CACFG}" "${DEFAULT_CA_CN}" "${DEFAULT_CA_ORG}" create_ca +else + if [ -z ${CAKEY} ] + then + echo "-k must be specified if -c is" + exit 1 + fi fi create_cert |