From b114a045839c3e44605370171b01a7868a371835 Mon Sep 17 00:00:00 2001 From: fqliao Date: Wed, 21 Apr 2021 15:43:58 +0800 Subject: [PATCH] rename gmssl dir to gmssl_utils dir --- client/gm_account.py | 8 ++++---- client/signer_impl.py | 4 ++-- eth_utils/crypto.py | 2 +- {gmssl => gmssl_utils}/README.md | 4 ++-- {gmssl => gmssl_utils}/__init__.py | 0 {gmssl => gmssl_utils}/func.py | 0 {gmssl => gmssl_utils}/libsm3/LICENSE | 0 {gmssl => gmssl_utils}/libsm3/README.md | 0 {gmssl => gmssl_utils}/libsm3/__init__.py | 0 {gmssl => gmssl_utils}/libsm3/libsm3.py | 0 {gmssl => gmssl_utils}/libsm3/sm3.c | 0 {gmssl => gmssl_utils}/libsm3/sm3.h | 0 {gmssl => gmssl_utils}/libsm3/sm3.py | 0 {gmssl => gmssl_utils}/sm2.py | 0 {gmssl => gmssl_utils}/sm2_helper.py | 0 {gmssl => gmssl_utils}/sm2_integer.py | 0 {gmssl => gmssl_utils}/sm2_parameter.py | 0 {gmssl => gmssl_utils}/sm3.py | 0 {gmssl => gmssl_utils}/sm3_implement.py | 0 {gmssl => gmssl_utils}/sm4.py | 0 tests/test_sm2.py | 4 ++-- tests/test_sm3.py | 2 +- tests/test_sm4.py | 2 +- 23 files changed, 13 insertions(+), 13 deletions(-) rename {gmssl => gmssl_utils}/README.md (96%) rename {gmssl => gmssl_utils}/__init__.py (100%) rename {gmssl => gmssl_utils}/func.py (100%) rename {gmssl => gmssl_utils}/libsm3/LICENSE (100%) rename {gmssl => gmssl_utils}/libsm3/README.md (100%) rename {gmssl => gmssl_utils}/libsm3/__init__.py (100%) rename {gmssl => gmssl_utils}/libsm3/libsm3.py (100%) rename {gmssl => gmssl_utils}/libsm3/sm3.c (100%) rename {gmssl => gmssl_utils}/libsm3/sm3.h (100%) rename {gmssl => gmssl_utils}/libsm3/sm3.py (100%) rename {gmssl => gmssl_utils}/sm2.py (100%) rename {gmssl => gmssl_utils}/sm2_helper.py (100%) rename {gmssl => gmssl_utils}/sm2_integer.py (100%) rename {gmssl => gmssl_utils}/sm2_parameter.py (100%) rename {gmssl => gmssl_utils}/sm3.py (100%) rename {gmssl => gmssl_utils}/sm3_implement.py (100%) rename {gmssl => gmssl_utils}/sm4.py (100%) diff --git a/client/gm_account.py b/client/gm_account.py index 3d9aff02..85ab344b 100644 --- a/client/gm_account.py +++ b/client/gm_account.py @@ -18,13 +18,13 @@ # **原来已经实现的，使用ecdsa的account，暂时不做重构，保持其稳定性 import base64 import binascii -from gmssl import sm2, func -from gmssl import sm2_helper -from gmssl import sm3, func +from gmssl_utils import sm2, func +from gmssl_utils import sm2_helper +from gmssl_utils import sm3, func from eth_utils.hexadecimal import decode_hex from eth_utils import to_checksum_address from eth_utils.crypto import * -from gmssl.sm4 import CryptSM4, SM4_DECRYPT, SM4_ENCRYPT +from gmssl_utils.sm4 import CryptSM4, SM4_DECRYPT, SM4_ENCRYPT from client.bcoskeypair import BcosKeyPair import json import hmac diff --git a/client/signer_impl.py b/client/signer_impl.py index 3ac4f801..6a373e16 100644 --- a/client/signer_impl.py +++ b/client/signer_impl.py @@ -9,8 +9,8 @@ from eth_account.account import Account from eth_account.signers.local import LocalAccount from eth_utils import encode_hex -from gmssl import sm2 -from gmssl.sm2 import CryptSM2 +from gmssl_utils import sm2 +from gmssl_utils.sm2 import CryptSM2 class Signer_Impl: diff --git a/eth_utils/crypto.py b/eth_utils/crypto.py index 257aaf8b..efb953ea 100644 --- a/eth_utils/crypto.py +++ b/eth_utils/crypto.py @@ -4,7 +4,7 @@ from .conversions import to_bytes -from gmssl.sm3 import sm3_hash +from gmssl_utils.sm3 import sm3_hash from eth_utils.hexadecimal import decode_hex CRYPTO_TYPE = 'keccak' diff --git a/gmssl/README.md b/gmssl_utils/README.md similarity index 96% rename from gmssl/README.md rename to gmssl_utils/README.md index 7ffe28b6..b8179fcc 100644 --- a/gmssl/README.md +++ b/gmssl_utils/README.md @@ -21,7 +21,7 @@ gmssl是包含国密SM2算法的Python实现， 提供了 `encrypt`、 `decrypt` ```python import base64 import binascii -from gmssl import sm2, func +from gmssl_utils import sm2, func #16进制的公钥和私钥 private_key = '00B9AB0B828FF68872F21A837FC303668428DEA11DCD1B24429D0C99E24EED83D5' public_key = 'B9C9A6E04E9C91F7BA880429273747D7EF5DDEB0BB2FF6317EB00BEF331A83081A6994B8993F3F5D6EADDDB81872266C87C018FB4162F5AF347B483E24620207' @@ -58,7 +58,7 @@ gmssl是包含国密SM4算法的Python实现， 提供了 `encrypt_ecb`、 `decr #### 1. 初始化`CryptSM4` ```python -from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT +from gmssl_utils.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT key = b'3l5butlj26hvv313' value = b'111' # bytes类型 diff --git a/gmssl/__init__.py b/gmssl_utils/__init__.py similarity index 100% rename from gmssl/__init__.py rename to gmssl_utils/__init__.py diff --git a/gmssl/func.py b/gmssl_utils/func.py similarity index 100% rename from gmssl/func.py rename to gmssl_utils/func.py diff --git a/gmssl/libsm3/LICENSE b/gmssl_utils/libsm3/LICENSE similarity index 100% rename from gmssl/libsm3/LICENSE rename to gmssl_utils/libsm3/LICENSE diff --git a/gmssl/libsm3/README.md b/gmssl_utils/libsm3/README.md similarity index 100% rename from gmssl/libsm3/README.md rename to gmssl_utils/libsm3/README.md diff --git a/gmssl/libsm3/__init__.py b/gmssl_utils/libsm3/__init__.py similarity index 100% rename from gmssl/libsm3/__init__.py rename to gmssl_utils/libsm3/__init__.py diff --git a/gmssl/libsm3/libsm3.py b/gmssl_utils/libsm3/libsm3.py similarity index 100% rename from gmssl/libsm3/libsm3.py rename to gmssl_utils/libsm3/libsm3.py diff --git a/gmssl/libsm3/sm3.c b/gmssl_utils/libsm3/sm3.c similarity index 100% rename from gmssl/libsm3/sm3.c rename to gmssl_utils/libsm3/sm3.c diff --git a/gmssl/libsm3/sm3.h b/gmssl_utils/libsm3/sm3.h similarity index 100% rename from gmssl/libsm3/sm3.h rename to gmssl_utils/libsm3/sm3.h diff --git a/gmssl/libsm3/sm3.py b/gmssl_utils/libsm3/sm3.py similarity index 100% rename from gmssl/libsm3/sm3.py rename to gmssl_utils/libsm3/sm3.py diff --git a/gmssl/sm2.py b/gmssl_utils/sm2.py similarity index 100% rename from gmssl/sm2.py rename to gmssl_utils/sm2.py diff --git a/gmssl/sm2_helper.py b/gmssl_utils/sm2_helper.py similarity index 100% rename from gmssl/sm2_helper.py rename to gmssl_utils/sm2_helper.py diff --git a/gmssl/sm2_integer.py b/gmssl_utils/sm2_integer.py similarity index 100% rename from gmssl/sm2_integer.py rename to gmssl_utils/sm2_integer.py diff --git a/gmssl/sm2_parameter.py b/gmssl_utils/sm2_parameter.py similarity index 100% rename from gmssl/sm2_parameter.py rename to gmssl_utils/sm2_parameter.py diff --git a/gmssl/sm3.py b/gmssl_utils/sm3.py similarity index 100% rename from gmssl/sm3.py rename to gmssl_utils/sm3.py diff --git a/gmssl/sm3_implement.py b/gmssl_utils/sm3_implement.py similarity index 100% rename from gmssl/sm3_implement.py rename to gmssl_utils/sm3_implement.py diff --git a/gmssl/sm4.py b/gmssl_utils/sm4.py similarity index 100% rename from gmssl/sm4.py rename to gmssl_utils/sm4.py diff --git a/tests/test_sm2.py b/tests/test_sm2.py index b053cbbf..52653316 100644 --- a/tests/test_sm2.py +++ b/tests/test_sm2.py @@ -1,7 +1,7 @@ import base64 import binascii -from gmssl import sm2, func -from gmssl import sm2_helper +from gmssl_utils import sm2, func +from gmssl_utils import sm2_helper if __name__ == '__main__': diff --git a/tests/test_sm3.py b/tests/test_sm3.py index dea593d6..75db116b 100644 --- a/tests/test_sm3.py +++ b/tests/test_sm3.py @@ -1,4 +1,4 @@ -from gmssl import sm3, func +from gmssl_utils import sm3, func if __name__ == '__main__': y = sm3.sm3_hash(func.bytes_to_list(b"abc")) diff --git a/tests/test_sm4.py b/tests/test_sm4.py index 6cc66439..e78b099d 100644 --- a/tests/test_sm4.py +++ b/tests/test_sm4.py @@ -1,4 +1,4 @@ -from gmssl.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT +from gmssl_utils.sm4 import CryptSM4, SM4_ENCRYPT, SM4_DECRYPT key = b'3l5butlj26hvv313' value = b'111'