From 51820f23bf46130f35dd64303687099f29adc674 Mon Sep 17 00:00:00 2001 From: Aaron3S Date: Tue, 23 Aug 2022 20:19:53 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/common/sdk/gm/piico/device.py | 8 ++++---- apps/common/sdk/gm/piico/session.py | 6 +++--- apps/common/sdk/gm/piico/session_mixin.py | 18 +++++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/apps/common/sdk/gm/piico/device.py b/apps/common/sdk/gm/piico/device.py index 0d93f9e45..a5644bfee 100644 --- a/apps/common/sdk/gm/piico/device.py +++ b/apps/common/sdk/gm/piico/device.py @@ -10,7 +10,7 @@ class Device: _driver = None __device = None - def open(self, driver_path="./libpiico_ccmu"): + def open(self, driver_path="./libpiico_ccmu.so"): # load driver self.__load_driver(driver_path) # open device @@ -20,14 +20,14 @@ class Device: if self.__device is None: raise Exception("device not turned on") ret = self._driver.SDF_CloseDevice(self.__device) - if not ret == 0: + if ret != 0: raise Exception("turn off device failed") self.__device = None def new_session(self): session = c_void_p() ret = self._driver.SDF_OpenSession(self.__device, pointer(session)) - if not ret == 0: + if ret != 0: raise Exception("create session failed") return Session(self._driver, session) @@ -65,6 +65,6 @@ class Device: def __open_device(self): device = c_void_p() ret = self._driver.SDF_OpenDevice(pointer(device)) - if not ret == 0: + if ret != 0: raise PiicoError("open piico device failed", ret) self.__device = device diff --git a/apps/common/sdk/gm/piico/session.py b/apps/common/sdk/gm/piico/session.py index 63c5204b3..84b748f78 100644 --- a/apps/common/sdk/gm/piico/session.py +++ b/apps/common/sdk/gm/piico/session.py @@ -17,7 +17,7 @@ class Session(SM2Mixin, SM3Mixin, SM4Mixin): def generate_random(self, length=64): random_data = (c_ubyte * length)() ret = self._driver.SDF_GenerateRandom(self._session, c_int(length), random_data) - if not ret == 0: + if ret != 0: raise PiicoError("generate random error", ret) return bytes(random_data) @@ -26,11 +26,11 @@ class Session(SM2Mixin, SM3Mixin, SM4Mixin): private_key = ECCrefPrivateKey() ret = self._driver.SDF_GenerateKeyPair_ECC(self._session, c_int(alg_id), c_int(256), pointer(public_key), pointer(private_key)) - if not ret == 0: + if ret != 0: raise PiicoError("generate ecc key pair failed", ret) return ECCKeyPair(public_key.encode(), private_key.encode()) def close(self): ret = self._driver.SDF_CloseSession(self._session) - if not ret == 0: + if ret != 0: raise PiicoError("close session failed", ret) diff --git a/apps/common/sdk/gm/piico/session_mixin.py b/apps/common/sdk/gm/piico/session_mixin.py index ebefca8ac..d625f627f 100644 --- a/apps/common/sdk/gm/piico/session_mixin.py +++ b/apps/common/sdk/gm/piico/session_mixin.py @@ -25,7 +25,7 @@ class SM2Mixin(BaseMixin): ecc_data = new_ecc_cipher_cla(len(plain_text))() ret = self._driver.SDF_ExternalEncrypt_ECC(self._session, c_int(alg_id), pointer(pk), plain_text, c_int(len(plain_text)), pointer(ecc_data)) - if not ret == 0: + if ret != 0: raise Exception("ecc encrypt failed", ret) return ecc_data.encode() @@ -60,7 +60,7 @@ class SM2Mixin(BaseMixin): ret = self._driver.SDF_ExternalDecrypt_ECC(self._session, c_int(alg_id), pointer(vk), pointer(ecc_data), temp_data, pointer(temp_data_length)) - if not ret == 0: + if ret != 0: raise Exception("ecc decrypt failed", ret) return bytes(temp_data[:temp_data_length.value]) @@ -68,20 +68,20 @@ class SM2Mixin(BaseMixin): class SM3Mixin(BaseMixin): def hash_init(self, alg_id): ret = self._driver.SDF_HashInit(self._session, c_int(alg_id), None, None, c_int(0)) - if not ret == 0: + if ret != 0: raise PiicoError("hash init failed,alg id is {}".format(alg_id), ret) def hash_update(self, data): data = (c_ubyte * len(data))(*data) ret = self._driver.SDF_HashUpdate(self._session, data, c_int(len(data))) - if not ret == 0: + if ret != 0: raise PiicoError("hash update failed", ret) def hash_final(self): result_data = (c_ubyte * 32)() result_length = c_int() ret = self._driver.SDF_HashFinal(self._session, result_data, pointer(result_length)) - if not ret == 0: + if ret != 0: raise PiicoError("hash final failed", ret) return bytes(result_data[:result_length.value]) @@ -94,13 +94,13 @@ class SM4Mixin(BaseMixin): key = c_void_p() ret = self._driver.SDF_ImportKey(self._session, key_val, c_int(len(key_val)), pointer(key)) - if not ret == 0: + if ret != 0: raise PiicoError("import key failed", ret) return key def destroy_cipher_key(self, key): ret = self._driver.SDF_DestroyKey(self._session, key) - if not ret == 0: + if ret != 0: raise Exception("destroy key failed") def encrypt(self, plain_text, key, alg, iv=None): @@ -119,11 +119,11 @@ class SM4Mixin(BaseMixin): if encrypt: ret = self._driver.SDF_Encrypt(self._session, key, c_int(alg), iv, text, c_int(len(text)), temp_data, pointer(temp_data_length)) - if not ret == 0: + if ret != 0: raise PiicoError("encrypt failed", ret) else: ret = self._driver.SDF_Decrypt(self._session, key, c_int(alg), iv, text, c_int(len(text)), temp_data, pointer(temp_data_length)) - if not ret == 0: + if ret != 0: raise PiicoError("decrypt failed", ret) return temp_data[:temp_data_length.value]