|
|
@@ -13,7 +13,7 @@ def generate_secret_label(raw_data: str):
|
|
|
:return: 指定格式密码标签字符串
|
|
|
"""
|
|
|
sign_data, public_key = sign_verify.get_sign(raw_data)
|
|
|
- secret_label = json.dumps({'data': raw_data, 'sign': sign_data})
|
|
|
+ secret_label = f"{raw_data}.{sign_data}"
|
|
|
return secret_label, public_key
|
|
|
|
|
|
|
|
|
@@ -24,8 +24,10 @@ def verify_secret_label(secret_label: str, public_key: str) -> bool:
|
|
|
:param public_key: 签名公钥
|
|
|
:return: 密码标签验证结果
|
|
|
"""
|
|
|
- dict_data = json.loads(secret_label)
|
|
|
- raw_data = dict_data.get("data")
|
|
|
- sign_data = dict_data.get("sign")
|
|
|
+ parts = secret_label.split('.')
|
|
|
+ if len(parts) != 2:
|
|
|
+ return False
|
|
|
+ raw_data = parts[0]
|
|
|
+ sign_data = parts[1]
|
|
|
verify_result = sign_verify.verify_sign(raw_data, sign_data, public_key)
|
|
|
return verify_result
|
