# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: ssl,v 1.7 2006/06/28 21:34:18 mlhuang Exp $
+# $Id$
#
# Source function library and configuration
ssl_cname ()
{
openssl x509 -noout -in $1 -subject | \
- sed -n -e 's@.*/CN=\([^/]*\).*@\1@p'
-}
-
-# Print the emailAddress of an SSL certificate
-ssl_email ()
-{
- openssl x509 -noout -in $1 -subject | \
- sed -n -e 's@.*/emailAddress=\([^/]*\).*@\1@p'
+ sed -n -e 's@.*/CN=\([^/]*\).*@\1@p' | \
+ lower
}
# Verify a certificate. If invalid, generate a new self-signed
crt=$1
key=$2
ca=$3
- cname=$4
- email=$5
+ cname=$(lower $4)
+
+ # If the CA certificate does not exist, assume that the
+ # certificate is self-signed.
+ if [ ! -f $ca ] ; then
+ cp -a $crt $ca
+ fi
if [ -f $crt ] ; then
# Check if certificate is valid
verify=$(openssl verify -CAfile $ca $crt)
# Delete if invalid or if the subject has changed
if grep -q "error" <<<$verify || \
- [ "$(ssl_cname $crt)" != "$cname" ] || \
- [ "$(ssl_email $crt)" != "$email" ] ; then
+ [ "$(ssl_cname $crt)" != "$cname" ] ; then
rm -f $crt $ca
fi
fi
if [ -n "$cname" ] ; then
subj="$subj/CN=$cname"
fi
- if [ -n "$email" ] ; then
- subj="$subj/emailAddress=$email"
- fi
# Generate new self-signed certificate
mkdir -p $(dirname $crt)
-batch -subj "$subj" \
-nodes -keyout $key -out $crt
check
- chmod 644 $crt
- fi
- if [ ! -f $ca ] ; then
- # The certificate it self-signed, so it is its own CA
+ # The certificate it self-signed, so it is its own CA
cp -a $crt $ca
fi
+
+ # Fix permissions
+ chmod 644 $crt $ca
}
case "$1" in
MESSAGE=$"Generating SSL certificates"
dialog "$MESSAGE"
- # Verify or generate MA/SA certificate if necessary. This
- # self-signed certificate may be overridden later.
- verify_or_generate_certificate \
- $PLC_MA_SA_SSL_CRT $PLC_MA_SA_SSL_KEY $PLC_MA_SA_CA_SSL_CRT \
- "$PLC_NAME Management and Slice Authority" \
- $PLC_MAIL_SUPPORT_ADDRESS
-
- # Make MA/SA key readable by apache so that the API can sign
- # certificates
- chown apache $PLC_MA_SA_SSL_KEY
- chmod 600 $PLC_MA_SA_SSL_KEY
-
- # Extract the public key of the root CA (if any) that signed
- # the MA/SA certificate.
- openssl x509 -in $PLC_MA_SA_CA_SSL_CRT -noout -pubkey >$PLC_MA_SA_CA_SSL_KEY_PUB
- check
- chmod 644 $PLC_MA_SA_CA_SSL_KEY_PUB
-
# Generate HTTPS certificates if necessary. We generate a
# certificate for each enabled server with a different
# hostname. These self-signed certificates may be overridden
verify_or_generate_certificate \
${!ssl_crt} ${!ssl_key} ${!ca_ssl_crt} \
- ${!hostname} $PLC_MAIL_SUPPORT_ADDRESS
-
+ ${!hostname}
done
# Install HTTPS certificates into both /etc/pki (Fedora Core