diff --git a/common/inc/params_parser.h b/common/inc/params_parser.h index 4bb3f4562c1d205eb681d9bc960f51ced2e14408..e29f3256da4813ad362464df4126248a92e6582b 100644 --- a/common/inc/params_parser.h +++ b/common/inc/params_parser.h @@ -1,5 +1,5 @@ /* -* Copyright (C) 2021 Huawei Device Co., Ltd. +* Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -40,7 +40,7 @@ typedef enum { HCF_ALG_ECC_224 = 1, HCF_ALG_ECC_256, HCF_ALG_ECC_384, - HCF_ALG_ECC_512, + HCF_ALG_ECC_521, HCF_ALG_AES_128, HCF_ALG_AES_192, diff --git a/common/src/params_parser.c b/common/src/params_parser.c index 74d45e1d8352d35c9b976f403c3e884cc4969e5a..8aa0ccd14a722ed2e1d4aa2e01c64ce0348394e2 100644 --- a/common/src/params_parser.c +++ b/common/src/params_parser.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -24,7 +24,7 @@ static const HcfParaConfig PARAM_CONFIG[] = { {"ECC224", HCF_ALG_KEY_TYPE, HCF_ALG_ECC_224}, {"ECC256", HCF_ALG_KEY_TYPE, HCF_ALG_ECC_256}, {"ECC384", HCF_ALG_KEY_TYPE, HCF_ALG_ECC_384}, - {"ECC512", HCF_ALG_KEY_TYPE, HCF_ALG_ECC_512}, + {"ECC521", HCF_ALG_KEY_TYPE, HCF_ALG_ECC_521}, {"AES128", HCF_ALG_KEY_TYPE, HCF_ALG_AES_128}, {"AES192", HCF_ALG_KEY_TYPE, HCF_ALG_AES_192}, diff --git a/frameworks/crypto_operation/key_agreement.c b/frameworks/crypto_operation/key_agreement.c index cb01ad2263761195f245581db8032523090ec8ea..5a49e3b6c46204caf19601b7d3648619efc72f7d 100644 --- a/frameworks/crypto_operation/key_agreement.c +++ b/frameworks/crypto_operation/key_agreement.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -62,7 +62,7 @@ static void SetKeyType(HCF_ALG_PARA_VALUE value, HcfKeyAgreementParams *paramsOb case HCF_ALG_ECC_224: case HCF_ALG_ECC_256: case HCF_ALG_ECC_384: - case HCF_ALG_ECC_512: + case HCF_ALG_ECC_521: paramsObj->keyLen = value; paramsObj->algo = HCF_ALG_ECC; break; diff --git a/frameworks/crypto_operation/signature.c b/frameworks/crypto_operation/signature.c index 0be85017c5299a36c933ea9b06837913e2f04889..d5fbedf807f7df494c3de4d95fecdf1cd8d66860 100644 --- a/frameworks/crypto_operation/signature.c +++ b/frameworks/crypto_operation/signature.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -95,7 +95,7 @@ static void SetKeyType(HCF_ALG_PARA_VALUE value, HcfSignatureParams *paramsObj) case HCF_ALG_ECC_224: case HCF_ALG_ECC_256: case HCF_ALG_ECC_384: - case HCF_ALG_ECC_512: + case HCF_ALG_ECC_521: paramsObj->keyLen = value; paramsObj->algo = HCF_ALG_ECC; break; diff --git a/frameworks/key/asy_key_generator.c b/frameworks/key/asy_key_generator.c index d0eab93263e232d0dbac91aa49972db7230a616f..878eeede0f780ab837d5b81ba6cfe3125da7ae70 100644 --- a/frameworks/key/asy_key_generator.c +++ b/frameworks/key/asy_key_generator.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -91,7 +91,7 @@ static void SetKeyType(HCF_ALG_PARA_VALUE value, HcfAsyKeyGenParams *params) case HCF_ALG_ECC_224: case HCF_ALG_ECC_256: case HCF_ALG_ECC_384: - case HCF_ALG_ECC_512: + case HCF_ALG_ECC_521: params->bits = value; params->algo = HCF_ALG_ECC; break; diff --git a/plugin/openssl_plugin/common/src/openssl_common.c b/plugin/openssl_plugin/common/src/openssl_common.c index 6dbc36e5be5f10366cb47e0056b1213ac9224801..9cc6165b6ff2eaccd6c2921a270db939013f8b8c 100644 --- a/plugin/openssl_plugin/common/src/openssl_common.c +++ b/plugin/openssl_plugin/common/src/openssl_common.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -77,7 +77,7 @@ int32_t GetOpensslCurveId(int32_t keyLen, int32_t *returnCurveId) case HCF_ALG_ECC_384: *returnCurveId = NID_secp384r1; break; - case HCF_ALG_ECC_512: + case HCF_ALG_ECC_521: *returnCurveId = NID_secp521r1; break; default: diff --git a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp index 9a018590d377e59bde68708736517b9a8ec101a5..3800651492daff6339e5ec622057518ba3c5a9f7 100644 --- a/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp +++ b/test/unittest/src/crypto_ecc_asy_key_generator_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -46,8 +46,8 @@ const int ECC256_PUB_KEY_LEN = 91; const int ECC256_PRI_KEY_LEN = 51; const int ECC384_PUB_KEY_LEN = 120; const int ECC384_PRI_KEY_LEN = 64; -const int ECC512_PUB_KEY_LEN = 158; -const int ECC512_PRI_KEY_LEN = 82; +const int ECC521_PUB_KEY_LEN = 158; +const int ECC521_PRI_KEY_LEN = 82; uint8_t g_mockEcc224PubKeyBlobData[ECC224_PUB_KEY_LEN] = { 48, 78, 48, 16, 6, 7, 42, 134, 72, 206, 61, 2, 1, 6, 5, 43, 129, 4, 0, 33, 3, 58, 0, 4, 252, 171, 11, 115, 79, 252, 109, 120, 46, 97, 131, 145, 207, 141, 146, @@ -80,7 +80,7 @@ uint8_t g_mockEcc384PriKeyBlobData[ECC384_PRI_KEY_LEN] = { 48, 62, 2, 1, 1, 4, 4 217, 176, 121, 155, 225, 222, 134, 155, 241, 59, 16, 253, 237, 158, 11, 221, 252, 58, 251, 160, 7, 6, 5, 43, 129, 4, 0, 34 }; -uint8_t g_mockEcc512PubKeyBlobData[ECC512_PUB_KEY_LEN] = { 48, 129, 155, 48, 16, 6, 7, 42, 134, 72, 206, +uint8_t g_mockEcc521PubKeyBlobData[ECC521_PUB_KEY_LEN] = { 48, 129, 155, 48, 16, 6, 7, 42, 134, 72, 206, 61, 2, 1, 6, 5, 43, 129, 4, 0, 35, 3, 129, 134, 0, 4, 0, 149, 60, 46, 252, 220, 227, 253, 219, 250, 60, 232, 80, 190, 119, 38, 79, 202, 173, 35, 126, 228, 244, 207, 174, 191, 250, 147, 188, 22, 132, 125, 44, 26, 57, 242, 203, 192, 100, 65, 185, 250, 80, 246, 76, 37, 242, 78, 64, 152, 47, 172, 165, 229, 99, 247, 61, 91, 152, 144, @@ -88,7 +88,7 @@ uint8_t g_mockEcc512PubKeyBlobData[ECC512_PUB_KEY_LEN] = { 48, 129, 155, 48, 16, 207, 159, 210, 113, 194, 174, 170, 194, 129, 215, 209, 50, 217, 204, 48, 53, 92, 231, 57, 179, 170, 6, 26, 77, 187, 181, 35, 254, 17, 216, 205, 118, 104, 89, 155, 145, 28, 61, 169, 113, 195, 55, 13, 125, 6, 168, 156 }; -uint8_t g_mockEcc512PriKeyBlobData[ECC512_PRI_KEY_LEN] = { 48, 80, 2, 1, 1, 4, 66, 0, 210, 135, 140, 70, +uint8_t g_mockEcc521PriKeyBlobData[ECC521_PRI_KEY_LEN] = { 48, 80, 2, 1, 1, 4, 66, 0, 210, 135, 140, 70, 98, 28, 121, 169, 5, 202, 132, 165, 11, 56, 9, 110, 32, 9, 146, 185, 239, 69, 113, 79, 213, 24, 165, 194, 147, 209, 223, 187, 100, 6, 149, 4, 56, 235, 120, 152, 146, 252, 92, 21, 222, 3, 182, 68, 39, 222, 49, 192, 154, 126, 126, 243, 18, 99, 136, 199, 234, 134, 232, 13, 128, 160, 7, 6, 5, 43, 129, 4, 0, 35 }; @@ -123,14 +123,14 @@ HcfBlob g_mockEcc384PriKeyBlob = { .len = ECC384_PRI_KEY_LEN }; -HcfBlob g_mockEcc512PubKeyBlob = { - .data = g_mockEcc512PubKeyBlobData, - .len = ECC512_PUB_KEY_LEN +HcfBlob g_mockEcc521PubKeyBlob = { + .data = g_mockEcc521PubKeyBlobData, + .len = ECC521_PUB_KEY_LEN }; -HcfBlob g_mockEcc512PriKeyBlob = { - .data = g_mockEcc512PriKeyBlobData, - .len = ECC512_PRI_KEY_LEN +HcfBlob g_mockEcc521PriKeyBlob = { + .data = g_mockEcc521PriKeyBlobData, + .len = ECC521_PRI_KEY_LEN }; static const char *GetMockClass(void) @@ -185,7 +185,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest003, TestSize HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest004, TestSize.Level0) { HcfAsyKeyGenerator *generator = nullptr; - int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); + int32_t res = HcfAsyKeyGeneratorCreate("ECC521", &generator); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); @@ -381,7 +381,7 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest203, TestSize HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest204, TestSize.Level0) { HcfAsyKeyGenerator *generator = nullptr; - int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); + int32_t res = HcfAsyKeyGeneratorCreate("ECC521", &generator); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator, nullptr); @@ -1174,10 +1174,10 @@ HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest403, TestSize HWTEST_F(CryptoEccAsyKeyGeneratorTest, CryptoEccAsyKeyGeneratorTest404, TestSize.Level0) { HcfAsyKeyGenerator *generator = nullptr; - int32_t res = HcfAsyKeyGeneratorCreate("ECC512", &generator); + int32_t res = HcfAsyKeyGeneratorCreate("ECC521", &generator); HcfKeyPair *outKeyPair = nullptr; - res = generator->convertKey(generator, nullptr, &g_mockEcc512PubKeyBlob, &g_mockEcc512PriKeyBlob, &outKeyPair); + res = generator->convertKey(generator, nullptr, &g_mockEcc521PubKeyBlob, &g_mockEcc521PriKeyBlob, &outKeyPair); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(outKeyPair, nullptr); diff --git a/test/unittest/src/crypto_ecc_key_agreement_test.cpp b/test/unittest/src/crypto_ecc_key_agreement_test.cpp index 843d3c3c270813306476022e54061e196ba6fb29..f1657373bfb9e24813f41adbb78b536ff60a909c 100644 --- a/test/unittest/src/crypto_ecc_key_agreement_test.cpp +++ b/test/unittest/src/crypto_ecc_key_agreement_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -37,13 +37,13 @@ public: static HcfKeyPair *ecc224KeyPair_; static HcfKeyPair *ecc256KeyPair_; static HcfKeyPair *ecc384KeyPair_; - static HcfKeyPair *ecc512KeyPair_; + static HcfKeyPair *ecc521KeyPair_; }; HcfKeyPair *CryptoEccKeyAgreementTest::ecc224KeyPair_ = nullptr; HcfKeyPair *CryptoEccKeyAgreementTest::ecc256KeyPair_ = nullptr; HcfKeyPair *CryptoEccKeyAgreementTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *CryptoEccKeyAgreementTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccKeyAgreementTest::ecc521KeyPair_ = nullptr; void CryptoEccKeyAgreementTest::SetUp() {} void CryptoEccKeyAgreementTest::TearDown() {} @@ -93,7 +93,7 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = nullptr; - res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); + res = HcfAsyKeyGeneratorCreate("ECC521", &generator4); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator4, nullptr); @@ -102,7 +102,7 @@ void CryptoEccKeyAgreementTest::SetUpTestCase() ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair4, nullptr); - ecc512KeyPair_ = keyPair4; + ecc521KeyPair_ = keyPair4; HcfObjDestroy(generator4); } @@ -112,7 +112,7 @@ void CryptoEccKeyAgreementTest::TearDownTestCase() HcfObjDestroy(ecc224KeyPair_); HcfObjDestroy(ecc256KeyPair_); HcfObjDestroy(ecc384KeyPair_); - HcfObjDestroy(ecc512KeyPair_); + HcfObjDestroy(ecc521KeyPair_); } static const char *GetMockClass(void) @@ -161,7 +161,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest003, TestSize.Level HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest004, TestSize.Level0) { HcfKeyAgreement *keyAgreement = nullptr; - int32_t res = HcfKeyAgreementCreate("ECC512", &keyAgreement); + int32_t res = HcfKeyAgreementCreate("ECC521", &keyAgreement); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); @@ -370,7 +370,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest203, TestSize.Level HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest204, TestSize.Level0) { HcfKeyAgreement *keyAgreement = nullptr; - int32_t res = HcfKeyAgreementCreate("ECC512", &keyAgreement); + int32_t res = HcfKeyAgreementCreate("ECC521", &keyAgreement); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyAgreement, nullptr); @@ -379,7 +379,7 @@ HWTEST_F(CryptoEccKeyAgreementTest, CryptoEccKeyAgreementTest204, TestSize.Level .data = nullptr, .len = 0 }; - res = keyAgreement->generateSecret(keyAgreement, ecc512KeyPair_->priKey, ecc512KeyPair_->pubKey, &out); + res = keyAgreement->generateSecret(keyAgreement, ecc521KeyPair_->priKey, ecc521KeyPair_->pubKey, &out); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(out.data, nullptr); diff --git a/test/unittest/src/crypto_ecc_sign_test.cpp b/test/unittest/src/crypto_ecc_sign_test.cpp index 279bd56c3128e3a617bfa4c702254aec0e6ec3a6..d35b7ad0f1987f109308af996dcf281a84df69cd 100644 --- a/test/unittest/src/crypto_ecc_sign_test.cpp +++ b/test/unittest/src/crypto_ecc_sign_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,13 +39,13 @@ public: static HcfKeyPair *ecc224KeyPair_; static HcfKeyPair *ecc256KeyPair_; static HcfKeyPair *ecc384KeyPair_; - static HcfKeyPair *ecc512KeyPair_; + static HcfKeyPair *ecc521KeyPair_; }; HcfKeyPair *CryptoEccSignTest::ecc224KeyPair_ = nullptr; HcfKeyPair *CryptoEccSignTest::ecc256KeyPair_ = nullptr; HcfKeyPair *CryptoEccSignTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *CryptoEccSignTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccSignTest::ecc521KeyPair_ = nullptr; static const char *MOCK_MESSAGE = "hello world"; static HcfBlob g_mockInput = { @@ -101,7 +101,7 @@ void CryptoEccSignTest::SetUpTestCase() HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = nullptr; - res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); + res = HcfAsyKeyGeneratorCreate("ECC521", &generator4); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator4, nullptr); @@ -110,7 +110,7 @@ void CryptoEccSignTest::SetUpTestCase() ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair4, nullptr); - ecc512KeyPair_ = keyPair4; + ecc521KeyPair_ = keyPair4; HcfObjDestroy(generator4); } @@ -120,7 +120,7 @@ void CryptoEccSignTest::TearDownTestCase() HcfObjDestroy(ecc224KeyPair_); HcfObjDestroy(ecc256KeyPair_); HcfObjDestroy(ecc384KeyPair_); - HcfObjDestroy(ecc512KeyPair_); + HcfObjDestroy(ecc521KeyPair_); } static const char *GetMockClass(void) @@ -301,7 +301,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest015, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest016, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); @@ -312,7 +312,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest016, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest017, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); @@ -323,7 +323,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest017, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest018, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); @@ -334,7 +334,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest018, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest019, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); @@ -345,7 +345,7 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest019, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest020, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); @@ -740,12 +740,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest215, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest216, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -755,12 +755,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest216, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest217, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -770,12 +770,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest217, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest218, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -785,12 +785,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest218, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest219, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -800,12 +800,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest219, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest220, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1179,12 +1179,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest315, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest316, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1198,12 +1198,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest316, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest317, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1217,12 +1217,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest317, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest318, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1236,12 +1236,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest318, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest319, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1255,12 +1255,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest319, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest320, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1842,12 +1842,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest415, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest416, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1872,12 +1872,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest416, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest417, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1902,12 +1902,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest417, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest418, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1932,12 +1932,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest418, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest419, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1962,12 +1962,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest419, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest420, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2382,12 +2382,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest435, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest436, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2408,12 +2408,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest436, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest437, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2434,12 +2434,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest437, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest438, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2460,12 +2460,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest438, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest439, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2486,12 +2486,12 @@ HWTEST_F(CryptoEccSignTest, CryptoEccSignTest439, TestSize.Level0) HWTEST_F(CryptoEccSignTest, CryptoEccSignTest440, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); diff --git a/test/unittest/src/crypto_ecc_verify_test.cpp b/test/unittest/src/crypto_ecc_verify_test.cpp index ea4e249468f50d308ddfd0028536dd91e98d45e4..de53a21ab0ec3363a23c682d1da2d501e8a1d4a6 100644 --- a/test/unittest/src/crypto_ecc_verify_test.cpp +++ b/test/unittest/src/crypto_ecc_verify_test.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Huawei Device Co., Ltd. + * Copyright (C) 2022-2023 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -39,13 +39,13 @@ public: static HcfKeyPair *ecc224KeyPair_; static HcfKeyPair *ecc256KeyPair_; static HcfKeyPair *ecc384KeyPair_; - static HcfKeyPair *ecc512KeyPair_; + static HcfKeyPair *ecc521KeyPair_; }; HcfKeyPair *CryptoEccVerifyTest::ecc224KeyPair_ = nullptr; HcfKeyPair *CryptoEccVerifyTest::ecc256KeyPair_ = nullptr; HcfKeyPair *CryptoEccVerifyTest::ecc384KeyPair_ = nullptr; -HcfKeyPair *CryptoEccVerifyTest::ecc512KeyPair_ = nullptr; +HcfKeyPair *CryptoEccVerifyTest::ecc521KeyPair_ = nullptr; static const char *MOCK_MESSAGE = "hello world"; static HcfBlob g_mockInput = { @@ -101,7 +101,7 @@ void CryptoEccVerifyTest::SetUpTestCase() HcfObjDestroy(generator3); HcfAsyKeyGenerator *generator4 = nullptr; - res = HcfAsyKeyGeneratorCreate("ECC512", &generator4); + res = HcfAsyKeyGeneratorCreate("ECC521", &generator4); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(generator4, nullptr); @@ -110,7 +110,7 @@ void CryptoEccVerifyTest::SetUpTestCase() ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(keyPair4, nullptr); - ecc512KeyPair_ = keyPair4; + ecc521KeyPair_ = keyPair4; HcfObjDestroy(generator4); } @@ -120,7 +120,7 @@ void CryptoEccVerifyTest::TearDownTestCase() HcfObjDestroy(ecc224KeyPair_); HcfObjDestroy(ecc256KeyPair_); HcfObjDestroy(ecc384KeyPair_); - HcfObjDestroy(ecc512KeyPair_); + HcfObjDestroy(ecc521KeyPair_); } static const char *GetMockClass(void) @@ -301,7 +301,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest015, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest016, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA1", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); @@ -312,7 +312,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest016, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest017, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA224", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); @@ -323,7 +323,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest017, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest018, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA256", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); @@ -334,7 +334,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest018, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest019, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA384", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); @@ -345,7 +345,7 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest019, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest020, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA512", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); @@ -740,12 +740,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest215, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest216, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA1", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -755,12 +755,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest216, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest217, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA224", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -770,12 +770,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest217, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest218, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA256", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -785,12 +785,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest218, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest219, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA384", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -800,12 +800,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest219, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest220, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA512", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1179,12 +1179,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest315, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest316, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA1", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA1", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1198,12 +1198,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest316, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest317, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA224", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA224", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1217,12 +1217,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest317, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest318, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA256", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA256", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1236,12 +1236,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest318, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest319, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA384", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA384", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -1255,12 +1255,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest319, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest320, TestSize.Level0) { HcfVerify *verify = nullptr; - int32_t res = HcfVerifyCreate("ECC512|SHA512", &verify); + int32_t res = HcfVerifyCreate("ECC521|SHA512", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2127,12 +2127,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest415, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2151,12 +2151,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA1", &verify); + res = HcfVerifyCreate("ECC521|SHA1", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2176,12 +2176,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest416, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2200,12 +2200,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA224", &verify); + res = HcfVerifyCreate("ECC521|SHA224", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2225,12 +2225,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest417, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2249,12 +2249,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA256", &verify); + res = HcfVerifyCreate("ECC521|SHA256", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2274,12 +2274,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest418, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2298,12 +2298,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA384", &verify); + res = HcfVerifyCreate("ECC521|SHA384", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2323,12 +2323,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest419, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest420, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2347,12 +2347,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest420, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA512", &verify); + res = HcfVerifyCreate("ECC521|SHA512", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -2987,12 +2987,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest435, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA1", &sign); + int32_t res = HcfSignCreate("ECC521|SHA1", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3007,12 +3007,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA1", &verify); + res = HcfVerifyCreate("ECC521|SHA1", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3028,12 +3028,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest436, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA224", &sign); + int32_t res = HcfSignCreate("ECC521|SHA224", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3048,12 +3048,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA224", &verify); + res = HcfVerifyCreate("ECC521|SHA224", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3069,12 +3069,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest437, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA256", &sign); + int32_t res = HcfSignCreate("ECC521|SHA256", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3089,12 +3089,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA256", &verify); + res = HcfVerifyCreate("ECC521|SHA256", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3110,12 +3110,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest438, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA384", &sign); + int32_t res = HcfSignCreate("ECC521|SHA384", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3130,12 +3130,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA384", &verify); + res = HcfVerifyCreate("ECC521|SHA384", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3151,12 +3151,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest439, TestSize.Level0) HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest440, TestSize.Level0) { HcfSign *sign = nullptr; - int32_t res = HcfSignCreate("ECC512|SHA512", &sign); + int32_t res = HcfSignCreate("ECC521|SHA512", &sign); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(sign, nullptr); - res = sign->init(sign, nullptr, ecc512KeyPair_->priKey); + res = sign->init(sign, nullptr, ecc521KeyPair_->priKey); ASSERT_EQ(res, HCF_SUCCESS); @@ -3171,12 +3171,12 @@ HWTEST_F(CryptoEccVerifyTest, CryptoEccVerifyTest440, TestSize.Level0) ASSERT_NE(out.len, (const unsigned int)0); HcfVerify *verify = nullptr; - res = HcfVerifyCreate("ECC512|SHA512", &verify); + res = HcfVerifyCreate("ECC521|SHA512", &verify); ASSERT_EQ(res, HCF_SUCCESS); ASSERT_NE(verify, nullptr); - res = verify->init(verify, nullptr, ecc512KeyPair_->pubKey); + res = verify->init(verify, nullptr, ecc521KeyPair_->pubKey); ASSERT_EQ(res, HCF_SUCCESS);