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
63031fb2
Commit
63031fb2
authored
May 19, 2020
by
Maarten den Braber
Browse files
bugfixes
parent
5d277763
Changes
2
Hide whitespace changes
Inline
Side-by-side
acme.sh
View file @
63031fb2
...
@@ -1003,7 +1003,7 @@ _sign() {
...
@@ -1003,7 +1003,7 @@ _sign() {
_sign_openssl="${ACME_OPENSSL_BIN:-openssl} dgst -sign $keyfile "
_sign_openssl="${ACME_OPENSSL_BIN:-openssl} dgst -sign $keyfile "
if
grep
"BEGIN RSA PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
||
if
grep
"BEGIN PRIVATE KEY"
"
$keyfile
"
>
/dev/null 2>&1
;
then
if grep "BEGIN RSA PRIVATE KEY" "$keyfile" >/dev/null 2>&1 || grep "BEGIN PRIVATE KEY" "$keyfile" >/dev/null 2>&1; then
$_sign_openssl -$alg | _base64
$_sign_openssl -$alg | _base64
elif grep "BEGIN EC PRIVATE KEY" "$keyfile" >/dev/null 2>&1; then
elif grep "BEGIN EC PRIVATE KEY" "$keyfile" >/dev/null 2>&1; then
if ! _signedECText="$($_sign_openssl -sha$__ECC_KEY_LEN | ${ACME_OPENSSL_BIN:-openssl} asn1parse -inform DER)"; then
if ! _signedECText="$($_sign_openssl -sha$__ECC_KEY_LEN | ${ACME_OPENSSL_BIN:-openssl} asn1parse -inform DER)"; then
...
...
dnsapi/dns_transip.sh
View file @
63031fb2
...
@@ -94,6 +94,10 @@ _transip_rest() {
...
@@ -94,6 +94,10 @@ _transip_rest() {
_transip_get_token
()
{
_transip_get_token
()
{
nonce
=
$(
echo
"TRANSIP
$(
_time
)
"
| _digest sha1 hex
)
nonce
=
$(
echo
"TRANSIP
$(
_time
)
"
| _digest sha1 hex
)
nonce_old
=
$(
openssl rand
-hex
12
)
nonce
=
${
nonce
:0:32
}
_debug nonce
"
$nonce
"
_debug nonce_old
"
$nonce_old
"
data
=
"{
\"
login
\"
:
\"
${
TRANSIP_Username
}
\"
,
\"
nonce
\"
:
\"
${
nonce
}
\"
,
\"
read_only
\"
:
\"
${
TRANSIP_Token_Read_Only
}
\"
,
\"
expiration_time
\"
:
\"
${
TRANSIP_Token_Expiration
}
\"
,
\"
label
\"
:
\"
${
TRANSIP_Token_Label
}
\"
,
\"
global_key
\"
:
\"
${
TRANSIP_Token_Global_Key
}
\"
}"
data
=
"{
\"
login
\"
:
\"
${
TRANSIP_Username
}
\"
,
\"
nonce
\"
:
\"
${
nonce
}
\"
,
\"
read_only
\"
:
\"
${
TRANSIP_Token_Read_Only
}
\"
,
\"
expiration_time
\"
:
\"
${
TRANSIP_Token_Expiration
}
\"
,
\"
label
\"
:
\"
${
TRANSIP_Token_Label
}
\"
,
\"
global_key
\"
:
\"
${
TRANSIP_Token_Global_Key
}
\"
}"
_debug data
"
$data
"
_debug data
"
$data
"
...
...
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