1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
From 05495d8cad3752f5bf357dfd878a1090fd2b191b Mon Sep 17 00:00:00 2001
From: liheavy <lihaiwei8@huawei.com>
Date: Wed, 8 Feb 2023 17:42:40 +0800
Subject: [PATCH] fix discarded-qualifiers-error
diff -Nur a/utils/crypto_adapter/hks_client_service_adapter.c b/utils/crypto_adapter/hks_client_service_adapter.c
--- a/utils/crypto_adapter/hks_client_service_adapter.c 2022-07-28 15:16:34.000000000 +0800
+++ b/utils/crypto_adapter/hks_client_service_adapter.c 2023-02-09 10:28:07.858448659 +0800
@@ -447,7 +447,7 @@
#ifdef HKS_SUPPORT_RSA_C
static int32_t X509PublicKeyToRsa(EVP_PKEY *pkey, struct HksBlob *rsaPublicKey)
{
- RSA *rsa = EVP_PKEY_get0_RSA(pkey);
+ const RSA *rsa = EVP_PKEY_get0_RSA(pkey);
if (rsa == NULL) {
HKS_LOG_E("EVP_PKEY_get1_RSA error %s", ERR_reason_error_string(ERR_get_error()));
return HKS_ERROR_NULL_POINTER;
@@ -488,7 +488,7 @@
#endif
#ifdef HKS_SUPPORT_ECC_C
-static int32_t EcKeyToPublicKey(EC_KEY *ecKey, struct HksBlob *eccPublicKey)
+static int32_t EcKeyToPublicKey(const EC_KEY *ecKey, struct HksBlob *eccPublicKey)
{
BIGNUM *x = BN_new();
BIGNUM *y = BN_new();
@@ -546,7 +546,7 @@
static int32_t X509PublicKeyToEcc(EVP_PKEY *pkey, struct HksBlob *eccPublicKey)
{
- EC_KEY *ecKey = EVP_PKEY_get0_EC_KEY(pkey);
+ const EC_KEY *ecKey = EVP_PKEY_get0_EC_KEY(pkey);
if (ecKey == NULL) {
HKS_LOG_E("EVP_PKEY_get1_EC_KEY error %s", ERR_reason_error_string(ERR_get_error()));
return HKS_ERROR_NULL_POINTER;
@@ -559,7 +559,7 @@
#ifdef HKS_SUPPORT_DSA_C
static int32_t X509PublicKeyToDsa(EVP_PKEY *pkey, struct HksBlob *dsaPublicKey)
{
- DSA *dsa = EVP_PKEY_get0_DSA(pkey);
+ const DSA *dsa = EVP_PKEY_get0_DSA(pkey);
if (dsa == NULL) {
HKS_LOG_E("EVP_PKEY_get1_DSA error %s", ERR_reason_error_string(ERR_get_error()));
return HKS_ERROR_NULL_POINTER;
@@ -615,7 +615,7 @@
#ifdef HKS_SUPPORT_DH_C
static int32_t X509PublicKeyToDh(EVP_PKEY *pkey, struct HksBlob *dhPublicKey)
{
- DH *dh = EVP_PKEY_get0_DH(pkey);
+ const DH *dh = EVP_PKEY_get0_DH(pkey);
if (dh == NULL) {
HKS_LOG_E("EVP_PKEY_get0_DH error %s", ERR_reason_error_string(ERR_get_error()));
return HKS_ERROR_NULL_POINTER;
|
