From b6b3bc474a0de08014c5d201082bb1211caf9d7e Mon Sep 17 00:00:00 2001 From: Francis Dong Date: Thu, 16 Mar 2023 14:31:47 +0800 Subject: [PATCH] Support HMAC algorithm functions #470 --- .../java/com/fizzgate/fizz/function/CodecFunc.java | 12 ++++++------ .../com/fizzgate/fizz/function/CodecFuncTests.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java b/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java index 8044e04..23553cc 100644 --- a/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java +++ b/fizz-core/src/main/java/com/fizzgate/fizz/function/CodecFunc.java @@ -189,27 +189,27 @@ public class CodecFunc implements IFunc { } } - public String hmacMd5(String secretKey, String data) { + public String hmacMd5(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_MD5, secretKey).hmacHex(data); } - public String hmacSha1(String secretKey, String data) { + public String hmacSha1(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_SHA_1, secretKey).hmacHex(data); } - public String hmacSha224(String secretKey, String data) { + public String hmacSha224(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_SHA_224, secretKey).hmacHex(data); } - public String hmacSha256(String secretKey, String data) { + public String hmacSha256(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_SHA_256, secretKey).hmacHex(data); } - public String hmacSha384(String secretKey, String data) { + public String hmacSha384(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_SHA_384, secretKey).hmacHex(data); } - public String hmacSha512(String secretKey, String data) { + public String hmacSha512(String data, String secretKey) { return new HmacUtils(HmacAlgorithms.HMAC_SHA_512, secretKey).hmacHex(data); } diff --git a/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java b/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java index 4c79872..0c1609b 100644 --- a/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java +++ b/fizz-core/src/test/java/com/fizzgate/fizz/function/CodecFuncTests.java @@ -125,7 +125,7 @@ class CodecFuncTests { @Test void testHmacSha256() { - String funcExpression = "fn.codec.hmacSha256(\"635e8562b968bc05bb80cacf124ebd53285280ee6845df0000faa33acafc38f0\", \"12345678123456781234567812345678\")"; + String funcExpression = "fn.codec.hmacSha256(\"12345678123456781234567812345678\", \"635e8562b968bc05bb80cacf124ebd53285280ee6845df0000faa33acafc38f0\")"; Object result = FuncExecutor.getInstance().exec(null, funcExpression); assertEquals("c61be0237ec186df1c5f51425e607093b260a76e5de43a62cb3e821103303990", result.toString()); }