yacloud/acme.sh
1
0
Fork 0
mirror of https://github.com/acmesh-official/acme.sh.git synced 2025-05-07 02:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge f69525589c50547daf3a60f5cbbdda868c8275a2 into 7c488b5913f47aecfcc61d8e6d329a4b374387c3

Browse Source
This commit is contained in:
Karsten Sperling 2017-02-10 05:18:01 +00:00 committed by GitHub
commit 3a04929760
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
acme.sh
View File

@ -711,10 +711,19 @@ _hmac() {
fi
if [ "$alg" = "sha256" ] || [ "$alg" = "sha1" ]; then
if [ "$outputhex" ]; then
$OPENSSL_BIN dgst -"$alg" -mac HMAC -macopt "hexkey:$secret_hex" | cut -d = -f 2 | tr -d ' '
# OpenSSL only support -macopt from version 1.0. OS X ships version 0.9
if echo -n "" | $OPENSSL_BIN dgst -sha1 -mac HMAC -macopt hexkey:00 >/dev/null 2>&1; then
if [ "$outputhex" ]; then
$OPENSSL_BIN dgst -"$alg" -mac HMAC -macopt "hexkey:$secret_hex" | cut -d = -f 2 | tr -d ' '
else
$OPENSSL_BIN dgst -"$alg" -mac HMAC -macopt "hexkey:$secret_hex" -binary
fi
else
$OPENSSL_BIN dgst -"$alg" -mac HMAC -macopt "hexkey:$secret_hex" -binary
# Try to fall back to python's built-in hmac/hashlib modules
[ -n "$outputhex" ] && outputhex=hex
python -u -c \
'import sys,binascii,hmac,hashlib;sys.stdout.write(getattr(hmac.new(binascii.unhexlify(sys.argv[3]),sys.stdin.read(),getattr(hashlib,sys.argv[1])),sys.argv[2])())' \
"$alg" "${outputhex}digest" "$secret_hex"
fi
else
_err "$alg is not supported yet"