psi-jack/ca-scripts
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2 bug fixes for ca-functions -- make CA_NAME unconfigurable and fix templating.

Browse source
This commit is contained in:
Alex Bramley 2010-03-13 15:13:52 +00:00
parent ad1e8a6ca8
commit 3886d28224
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ca-scripts.conf
View file

@ -1,18 +1,15 @@
# example ca-scripts configuration file # example ca-scripts configuration file
# see ca-scripts.conf(5) for details
# REQUIRED: CA_HOME provides the path to the root of the CA directory tree # REQUIRED: CA_HOME provides the path to the root of the CA directory tree
# this directory must exist and be writeable # this directory must exist and be writeable
#CA_HOME="/etc/ssl/ca" #CA_HOME="/etc/ssl/ca-scripts"
CA_HOME="/tmp/ca" CA_HOME="/tmp/ca"
# REQUIRED: CA_DOMAIN provides a template for other optional variables and # REQUIRED: CA_DOMAIN provides a template for other optional variables and
# the filenames that are generated within the directory tree # the filenames that are generated within the directory tree
CA_DOMAIN="example.com" CA_DOMAIN="example.com"
# OPTIONAL: CA_NAME is the internal templating variable for filenames etc
# Defaults to:
# CA_NAME="$( echo $CA_DOMAIN | tr 'A-Z' 'a-z' | tr -c '-a-z0-9' '_' )"
# REQUIRED: CA_DN_* configures the Distinguished Name fields present in the # REQUIRED: CA_DN_* configures the Distinguished Name fields present in the
# CA certificate generated by ca-init # CA certificate generated by ca-init
CA_DN_C="GB" CA_DN_C="GB"

6
lib/ca-functions
View file

@ -94,7 +94,8 @@ __TESTS__
# we need to do these first to use them in other default defs # we need to do these first to use them in other default defs
# NOTE: bash's here-string syntax appends \n which tr turns to _ :( # NOTE: bash's here-string syntax appends \n which tr turns to _ :(
ca_set_default CA_NAME "$( echo -n "$CA_DOMAIN" | tr -c '[:alnum:]@-' _ )" # CA_NAME is NOT configurable, due to the breakage this could cause.
CA_NAME="$( echo -n "$CA_DOMAIN" | tr -c '[:alnum:]@-' _ )"
ca_set_default CA_EMAIL "ca@$CA_DOMAIN" ca_set_default CA_EMAIL "ca@$CA_DOMAIN"
while read varname vardef; do while read varname vardef; do
@ -121,8 +122,9 @@ __DEFAULTS__
ca_sed_cmd() { ca_sed_cmd() {
# MD5 in CA_CR[TL]_MD5_FP has a non alphabetic character :( # MD5 in CA_CR[TL]_MD5_FP has a non alphabetic character :(
# XXX: pretty sure this is a dirty and wrong way of templating vars # XXX: pretty sure this is a dirty and wrong way of templating vars
# but we can hope that there's no ascii 001 in the values...
set | awk -F\= '/^CA_[A-Z5_]*=/{print $1}' | while read ca_var; do set | awk -F\= '/^CA_[A-Z5_]*=/{print $1}' | while read ca_var; do
echo "s#%$ca_var%#${!ca_var}#;" echo -e "s\001%$ca_var%\001${!ca_var}\001g;"
done done
} }