diff --git a/doc/Changelog b/doc/Changelog index a1b0e66c2..aff0e741d 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,7 @@ +3 November 2015: Wouter + - Fix #718: Fix unbound-control-setup with support for env + without HEREDOC bash support. + 29 October 2015: Wouter - patch from Doug Hogan for SSL_OP_NO_SSLvx options. - Fix #716: nodata proof with empty non-terminals and wildcards. diff --git a/smallapp/unbound-control-setup.sh.in b/smallapp/unbound-control-setup.sh.in index 682ab260a..f99d7bcba 100644 --- a/smallapp/unbound-control-setup.sh.in +++ b/smallapp/unbound-control-setup.sh.in @@ -107,16 +107,15 @@ else fi # create self-signed cert for server -cat >request.cfg < request.cfg +echo "default_bits=$BITS\n" >> request.cfg +echo "default_md=$HASH\n" >> request.cfg +echo "prompt=no\n" >> request.cfg +echo "distinguished_name=req_distinguished_name\n" >> request.cfg +echo "\n" >> request.cfg +echo "[req_distinguished_name]\n" >> request.cfg +echo "commonName=$SERVERNAME\n" >> request.cfg -[req_distinguished_name] -commonName=$SERVERNAME -EOF test -f request.cfg || error "could not create request.cfg" echo "create $SVR_BASE.pem (self signed certificate)" @@ -125,16 +124,15 @@ openssl req -key $SVR_BASE.key -config request.cfg -new -x509 -days $DAYS -out openssl x509 -in $SVR_BASE.pem -addtrust serverAuth -out $SVR_BASE"_trust.pem" # create client request and sign it, piped -cat >request.cfg < request.cfg +echo "default_bits=$BITS\n" >> request.cfg +echo "default_md=$HASH\n" >> request.cfg +echo "prompt=no\n" >> request.cfg +echo "distinguished_name=req_distinguished_name\n" >> request.cfg +echo "\n" >> request.cfg +echo "[req_distinguished_name]\n" >> request.cfg +echo "commonName=$CLIENTNAME" >> request.cfg -[req_distinguished_name] -commonName=$CLIENTNAME -EOF test -f request.cfg || error "could not create request.cfg" echo "create $CTL_BASE.pem (signed client certificate)"