Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
7b40cbe8
Commit
7b40cbe8
authored
Apr 08, 2017
by
neil
Committed by
GitHub
Apr 08, 2017
Browse files
Merge pull request #778 from Neilpang/dev
Dev
parents
96f79475
0933929c
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
7b40cbe8
...
...
@@ -1105,10 +1105,10 @@ _readKeyLengthFromCSR() {
_debug2 _outcsr "$_outcsr"
if _contains "$_outcsr" "Public Key Algorithm: id-ecPublicKey"; then
_debug "ECC CSR"
echo
"
$_outcsr
"
| _egrep_o
"^ *ASN1 OID:.*"
|
cut
-d
':'
-f
2 |
tr
-d
' '
echo "$_outcsr" |
tr "\t" " " |
_egrep_o "^ *ASN1 OID:.*" | cut -d ':' -f 2 | tr -d ' '
else
_debug "RSA CSR"
echo
"
$_outcsr
"
| _egrep_o
"(^ *|
^
RSA )Public.Key:.*"
|
cut
-d
'('
-f
2 |
cut
-d
' '
-f
1
echo "$_outcsr" |
tr "\t" " " |
_egrep_o "(^ *|RSA )Public.Key:.*" | cut -d '(' -f 2 | cut -d ' ' -f 1
fi
}
...
...
@@ -2565,7 +2565,7 @@ _checkConf() {
if [ ! -f "$2" ] && ! echo "$2" | grep '*$' >/dev/null && echo "$2" | grep '*' >/dev/null; then
_debug "wildcard"
for _w_f in $2; do
if
[
-f
"
$_w_f
"
]
&&
_checkConf
"
$1
"
"
$_w_f
"
;
then
if [ -f "$_w_f"
] && _checkConf "$1" "$_w_f"; then
return 0
fi
done
...
...
@@ -3865,7 +3865,7 @@ renewAll() {
return "$rc"
else
_ret="$rc"
_err
"Error renew
$d
, Go ahead to next one
."
_err "Error renew $d."
fi
fi
done
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment