bugfixes

diff --git a/acme.sh b/acme.sh
index d3c357fcd5efd4229b633d53b5a174dfaf1c2687..8a29cebf05e339dbf5dd45bb5268d996c553462b 100755 (executable)
--- a/acme.sh
+++ b/acme.sh
@@ -1003,7 +1003,7 @@ _sign() {
 
   _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
   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

diff --git a/dnsapi/dns_transip.sh b/dnsapi/dns_transip.sh
index 8764c1c49e107b044bc74909cd4e8924a16d66db..36c48ce3d63e0bf54907d503da1603db110df45f 100644 (file)
--- a/dnsapi/dns_transip.sh
+++ b/dnsapi/dns_transip.sh
@@ -94,6 +94,10 @@ _transip_rest() {
 
 _transip_get_token() {
   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}\"}"
   _debug data "$data"