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
18256c49
Commit
18256c49
authored
Oct 29, 2016
by
neilpang
Browse files
fix issue cache jwk for ecc key only
parent
5dbf664a
Changes
1
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
18256c49
...
@@ -834,15 +834,18 @@ _calcjwk() {
...
@@ -834,15 +834,18 @@ _calcjwk() {
return
1
return
1
fi
fi
if
[
"
$JWK_HEADER
"
]
&&
[
"
$__CACHED_JWK_KEY_FILE
"
=
"
$keyfile
"
]
;
then
_debug2
"Use cached jwk for file:
$__CACHED_JWK_KEY_FILE
"
return
0
fi
EC_SIGN
=
""
EC_SIGN
=
""
if
grep
"BEGIN RSA PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
then
if
grep
"BEGIN RSA PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
then
_debug
"RSA key"
_debug
"RSA key"
if
[
"
$JWK_HEADER
"
]
&&
[
"
$__CACHED_JWK_KEY_FILE
"
=
"
$keyfile
"
]
;
then
_debug2
"Use cached jwk for file:
$__CACHED_JWK_KEY_FILE
"
return
0
fi
pub_exp
=
$(
openssl rsa
-in
$keyfile
-noout
-text
|
grep
"^publicExponent:"
|
cut
-d
'('
-f
2 |
cut
-d
'x'
-f
2 |
cut
-d
')'
-f
1
)
pub_exp
=
$(
openssl rsa
-in
$keyfile
-noout
-text
|
grep
"^publicExponent:"
|
cut
-d
'('
-f
2 |
cut
-d
'x'
-f
2 |
cut
-d
')'
-f
1
)
if
[
"
${#
pub_exp
}
"
=
"5"
]
;
then
if
[
"
${#
pub_exp
}
"
=
"5"
]
;
then
pub_exp
=
0
$pub_exp
pub_exp
=
0
$pub_exp
...
@@ -861,6 +864,7 @@ _calcjwk() {
...
@@ -861,6 +864,7 @@ _calcjwk() {
JWK_HEADER
=
'{"alg": "RS256", "jwk": '
$jwk
'}'
JWK_HEADER
=
'{"alg": "RS256", "jwk": '
$jwk
'}'
JWK_HEADERPLACE_PART1
=
'{"nonce": "'
JWK_HEADERPLACE_PART1
=
'{"nonce": "'
JWK_HEADERPLACE_PART2
=
'", "alg": "RS256", "jwk": '
$jwk
'}'
JWK_HEADERPLACE_PART2
=
'", "alg": "RS256", "jwk": '
$jwk
'}'
__CACHED_JWK_KEY_FILE
=
"
$keyfile
"
elif
grep
"BEGIN EC PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
then
elif
grep
"BEGIN EC PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
then
_debug
"EC key"
_debug
"EC key"
EC_SIGN
=
"1"
EC_SIGN
=
"1"
...
@@ -908,7 +912,7 @@ _calcjwk() {
...
@@ -908,7 +912,7 @@ _calcjwk() {
fi
fi
_debug3 JWK_HEADER
"
$JWK_HEADER
"
_debug3 JWK_HEADER
"
$JWK_HEADER
"
__CACHED_JWK_KEY_FILE
=
"
$keyfile
"
}
}
_time
()
{
_time
()
{
...
...
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