diff options
| author | Ben Lipton <blipton@redhat.com> | 2017-02-08 20:56:37 -0500 |
|---|---|---|
| committer | Jan Cholasta <jcholast@redhat.com> | 2017-02-28 09:02:49 +0000 |
| commit | ada91c20588046bb147fc701718d3da4d2c080ca (patch) | |
| tree | 784918f31817c6bfea59230f1c106a05f7b9c733 /install | |
| parent | 4350dcdea22fd2284836315d0ae7d38733a7620e (diff) | |
| download | freeipa-ada91c20588046bb147fc701718d3da4d2c080ca.tar.gz freeipa-ada91c20588046bb147fc701718d3da4d2c080ca.tar.xz freeipa-ada91c20588046bb147fc701718d3da4d2c080ca.zip | |
csrgen: Support encrypted private keys
https://fedorahosted.org/freeipa/ticket/4899
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Diffstat (limited to 'install')
| -rw-r--r-- | install/share/csrgen/templates/openssl_base.tmpl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/install/share/csrgen/templates/openssl_base.tmpl b/install/share/csrgen/templates/openssl_base.tmpl index 2d6c0709d..22b16862e 100644 --- a/install/share/csrgen/templates/openssl_base.tmpl +++ b/install/share/csrgen/templates/openssl_base.tmpl @@ -3,15 +3,16 @@ {%- endraw %} #!/bin/bash -e -if [[ $# -ne 2 ]]; then -echo "Usage: $0 <outfile> <keyfile>" +if [[ $# -lt 2 ]]; then +echo "Usage: $0 <outfile> <keyfile> <other openssl arguments>" echo "Called as: $0 $@" exit 1 fi CONFIG="$(mktemp)" CSR="$1" -shift +KEYFILE="$2" +shift; shift echo \ {% raw %}{% filter quote %}{% endraw -%} @@ -30,5 +31,5 @@ req_extensions = {% call openssl.section() %}{{ rendered_extensions }}{% endcall {{ openssl.openssl_sections|join('\n\n') }} {% endfilter %}{%- endraw %} > "$CONFIG" -openssl req -new -config "$CONFIG" -out "$CSR" -key $1 +openssl req -new -config "$CONFIG" -out "$CSR" -key "$KEYFILE" "$@" rm "$CONFIG" |