Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Acme.Sh
Commits
95e06de5
Commit
95e06de5
authored
Nov 09, 2016
by
neilpang
Browse files
fix for shellcheck
parent
f530a507
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
95e06de5
...
@@ -119,7 +119,7 @@ _dlg_versions() {
...
@@ -119,7 +119,7 @@ _dlg_versions() {
_log
()
{
_log
()
{
[
-z
"
$LOG_FILE
"
]
&&
return
[
-z
"
$LOG_FILE
"
]
&&
return
_printargs
"
$@
"
>>
$LOG_FILE
_printargs
"
$@
"
>>
"
$LOG_FILE
"
}
}
_info
()
{
_info
()
{
...
@@ -229,12 +229,12 @@ _getfield() {
...
@@ -229,12 +229,12 @@ _getfield() {
_ffi
=
$_findex
_ffi
=
$_findex
while
[
"
$_ffi
"
-gt
"0"
]
;
do
while
[
"
$_ffi
"
-gt
"0"
]
;
do
_fv
=
"
$(
echo
"
$_str
"
|
cut
-d
$_sep
-f
$_ffi
)
"
_fv
=
"
$(
echo
"
$_str
"
|
cut
-d
$_sep
-f
"
$_ffi
"
)
"
if
[
"
$_fv
"
]
;
then
if
[
"
$_fv
"
]
;
then
printf
--
"%s"
"
$_fv
"
printf
--
"%s"
"
$_fv
"
return
0
return
0
fi
fi
_ffi
=
"
$(
_math
$_ffi
- 1
)
"
_ffi
=
"
$(
_math
"
$_ffi
"
- 1
)
"
done
done
printf
--
"%s"
"
$_str
"
printf
--
"%s"
"
$_str
"
...
@@ -312,21 +312,21 @@ _h2b() {
...
@@ -312,21 +312,21 @@ _h2b() {
fi
fi
printf
"
\x
$h
"
printf
"
\x
$h
"
else
else
ic
=
"
$(
printf
$hex
|
cut
-c
$i
)
"
ic
=
"
$(
printf
"%s"
"
$hex
"
|
cut
-c
$i
)
"
jc
=
"
$(
printf
$hex
|
cut
-c
$j
)
"
jc
=
"
$(
printf
"%s"
"
$hex
"
|
cut
-c
$j
)
"
if
[
-z
"
$ic$jc
"
]
;
then
if
[
-z
"
$ic$jc
"
]
;
then
break
break
fi
fi
ic
=
"
$(
_h_char_2_dec
"
$ic
"
)
"
ic
=
"
$(
_h_char_2_dec
"
$ic
"
)
"
jc
=
"
$(
_h_char_2_dec
"
$jc
"
)
"
jc
=
"
$(
_h_char_2_dec
"
$jc
"
)
"
printf
'\'
"
$(
printf
%o
"
$(
_math
$ic
\*
16 +
$jc
)
"
)
"
printf
'\'
"
$(
printf
"
%o
"
"
$(
_math
"
$ic
"
\*
16 +
$jc
)
"
)
"
fi
fi
if
[
"
$uselet
"
]
;
then
if
[
"
$uselet
"
]
;
then
let
"i+=2"
>
/dev/null
let
"i+=2"
>
/dev/null
let
"j+=2"
>
/dev/null
let
"j+=2"
>
/dev/null
else
else
i
=
"
$(
_math
$i
+ 2
)
"
i
=
"
$(
_math
"
$i
"
+ 2
)
"
j
=
"
$(
_math
$j
+ 2
)
"
j
=
"
$(
_math
"
$j
"
+ 2
)
"
fi
fi
done
done
}
}
...
@@ -419,9 +419,9 @@ _digest() {
...
@@ -419,9 +419,9 @@ _digest() {
if
[
"
$alg
"
=
"sha256"
]
||
[
"
$alg
"
=
"sha1"
]
;
then
if
[
"
$alg
"
=
"sha256"
]
||
[
"
$alg
"
=
"sha1"
]
;
then
if
[
"
$outputhex
"
]
;
then
if
[
"
$outputhex
"
]
;
then
openssl dgst -
$alg
-hex
|
cut
-d
=
-f
2 |
tr
-d
' '
openssl dgst -
"
$alg
"
-hex
|
cut
-d
=
-f
2 |
tr
-d
' '
else
else
openssl dgst -
$alg
-binary
| _base64
openssl dgst -
"
$alg
"
-binary
| _base64
fi
fi
else
else
_err
"
$alg
is not supported yet"
_err
"
$alg
is not supported yet"
...
@@ -444,9 +444,9 @@ _hmac() {
...
@@ -444,9 +444,9 @@ _hmac() {
if
[
"
$alg
"
=
"sha256"
]
||
[
"
$alg
"
=
"sha1"
]
;
then
if
[
"
$alg
"
=
"sha256"
]
||
[
"
$alg
"
=
"sha1"
]
;
then
if
[
"
$outputhex
"
]
;
then
if
[
"
$outputhex
"
]
;
then
openssl dgst -
$alg
-hmac
"
$hmac_sec
"
|
cut
-d
=
-f
2 |
tr
-d
' '
openssl dgst -
"
$alg
"
-hmac
"
$hmac_sec
"
|
cut
-d
=
-f
2 |
tr
-d
' '
else
else
openssl dgst -
$alg
-hmac
"
$hmac_sec
"
-binary
| _base64
openssl dgst -
"
$alg
"
-hmac
"
$hmac_sec
"
-binary
| _base64
fi
fi
else
else
_err
"
$alg
is not supported yet"
_err
"
$alg
is not supported yet"
...
@@ -516,7 +516,7 @@ _createkey() {
...
@@ -516,7 +516,7 @@ _createkey() {
f
=
"
$2
"
f
=
"
$2
"
eccname
=
"
$length
"
eccname
=
"
$length
"
if
_startswith
"
$length
"
"ec-"
;
then
if
_startswith
"
$length
"
"ec-"
;
then
length
=
$(
printf
$length
|
cut
-d
'-'
-f
2-100
)
length
=
$(
printf
"
$length
"
|
cut
-d
'-'
-f
2-100
)
if
[
"
$length
"
=
"256"
]
;
then
if
[
"
$length
"
=
"256"
]
;
then
eccname
=
"prime256v1"
eccname
=
"prime256v1"
...
@@ -962,22 +962,22 @@ _calcjwk() {
...
@@ -962,22 +962,22 @@ _calcjwk() {
pubtext
=
"
$(
openssl ec
-in
$keyfile
-noout
-text
2>/dev/null |
sed
-n
"
$pubi
,
${
pubj
}
p"
|
tr
-d
"
\n\r
"
)
"
pubtext
=
"
$(
openssl ec
-in
$keyfile
-noout
-text
2>/dev/null |
sed
-n
"
$pubi
,
${
pubj
}
p"
|
tr
-d
"
\n\r
"
)
"
_debug3 pubtext
"
$pubtext
"
_debug3 pubtext
"
$pubtext
"
xlen
=
"
$(
printf
"
$pubtext
"
|
tr
-d
':'
|
wc
-c
)
"
xlen
=
"
$(
printf
"%s"
"
$pubtext
"
|
tr
-d
':'
|
wc
-c
)
"
xlen
=
$(
_math
$xlen
/ 4
)
xlen
=
$(
_math
$xlen
/ 4
)
_debug3 xlen
"
$xlen
"
_debug3 xlen
"
$xlen
"
xend
=
$(
_math
"
$xlen
"
+ 1
)
xend
=
$(
_math
"
$xlen
"
+ 1
)
x
=
"
$(
printf
$pubtext
|
cut
-d
:
-f
2-
$xend
)
"
x
=
"
$(
printf
"%s"
"
$pubtext
"
|
cut
-d
:
-f
2-
$xend
)
"
_debug3 x
"
$x
"
_debug3 x
"
$x
"
x64
=
"
$(
printf
$x
|
tr
-d
: | _h2b | _base64 | _urlencode
)
"
x64
=
"
$(
printf
"%s"
"
$x
"
|
tr
-d
: | _h2b | _base64 | _urlencode
)
"
_debug3 x64
"
$x64
"
_debug3 x64
"
$x64
"
xend
=
$(
_math
"
$xend
"
+ 1
)
xend
=
$(
_math
"
$xend
"
+ 1
)
y
=
"
$(
printf
$pubtext
|
cut
-d
:
-f
$xend
-10000
)
"
y
=
"
$(
printf
"%s"
"
$pubtext
"
|
cut
-d
:
-f
$xend
-10000
)
"
_debug3 y
"
$y
"
_debug3 y
"
$y
"
y64
=
"
$(
printf
$y
|
tr
-d
: | _h2b | _base64 | _urlencode
)
"
y64
=
"
$(
printf
"%s"
"
$y
"
|
tr
-d
: | _h2b | _base64 | _urlencode
)
"
_debug3 y64
"
$y64
"
_debug3 y64
"
$y64
"
jwk
=
'{"crv": "'
$crv
'", "kty": "EC", "x": "'
$x64
'", "y": "'
$y64
'"}'
jwk
=
'{"crv": "'
$crv
'", "kty": "EC", "x": "'
$x64
'", "y": "'
$y64
'"}'
...
@@ -1240,7 +1240,7 @@ _send_signed_request() {
...
@@ -1240,7 +1240,7 @@ _send_signed_request() {
protected
=
"
$JWK_HEADERPLACE_PART1$nonce$JWK_HEADERPLACE_PART2
"
protected
=
"
$JWK_HEADERPLACE_PART1$nonce$JWK_HEADERPLACE_PART2
"
_debug3 protected
"
$protected
"
_debug3 protected
"
$protected
"
protected64
=
"
$(
printf
"
$protected
"
| _base64 | _urlencode
)
"
protected64
=
"
$(
printf
"%s"
"
$protected
"
| _base64 | _urlencode
)
"
_debug3 protected64
"
$protected64
"
_debug3 protected64
"
$protected64
"
if
!
_sig_t
=
"
$(
printf
"%s"
"
$protected64
.
$payload64
"
| _sign
"
$keyfile
"
"sha256"
)
"
;
then
if
!
_sig_t
=
"
$(
printf
"%s"
"
$protected64
.
$payload64
"
| _sign
"
$keyfile
"
"sha256"
)
"
;
then
...
@@ -2392,7 +2392,7 @@ issue() {
...
@@ -2392,7 +2392,7 @@ issue() {
if
[
-f
"
$DOMAIN_CONF
"
]
;
then
if
[
-f
"
$DOMAIN_CONF
"
]
;
then
Le_NextRenewTime
=
$(
_readdomainconf Le_NextRenewTime
)
Le_NextRenewTime
=
$(
_readdomainconf Le_NextRenewTime
)
_debug Le_NextRenewTime
"
$Le_NextRenewTime
"
_debug Le_NextRenewTime
"
$Le_NextRenewTime
"
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
$(
_time
)
-lt
$Le_NextRenewTime
]
;
then
if
[
-z
"
$FORCE
"
]
&&
[
"
$Le_NextRenewTime
"
]
&&
[
"
$(
_time
)
"
-lt
"
$Le_NextRenewTime
"
]
;
then
_saved_domain
=
$(
_readdomainconf Le_Domain
)
_saved_domain
=
$(
_readdomainconf Le_Domain
)
_debug _saved_domain
"
$_saved_domain
"
_debug _saved_domain
"
$_saved_domain
"
_saved_alt
=
$(
_readdomainconf Le_Alt
)
_saved_alt
=
$(
_readdomainconf Le_Alt
)
...
@@ -2529,7 +2529,7 @@ issue() {
...
@@ -2529,7 +2529,7 @@ issue() {
keyauthorization
=
"
$token
.
$thumbprint
"
keyauthorization
=
"
$token
.
$thumbprint
"
_debug keyauthorization
"
$keyauthorization
"
_debug keyauthorization
"
$keyauthorization
"
if
printf
"
$response
"
|
grep
'"status":"valid"'
>
/dev/null 2>&1
;
then
if
printf
"%s"
"
$response
"
|
grep
'"status":"valid"'
>
/dev/null 2>&1
;
then
_info
"
$d
is already verified, skip."
_info
"
$d
is already verified, skip."
keyauthorization
=
$STATE_VERIFIED
keyauthorization
=
$STATE_VERIFIED
_debug keyauthorization
"
$keyauthorization
"
_debug keyauthorization
"
$keyauthorization
"
...
...
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