90 lines
3.3 KiB
Diff
Executable File
90 lines
3.3 KiB
Diff
Executable File
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' openGauss-server-5.0.1/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp openGauss-server-5.0.1-edit/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp
|
|
*** openGauss-server-5.0.1/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp 2024-05-07 20:16:39.548798239 +0800
|
|
--- openGauss-server-5.0.1-edit/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp 2024-05-07 20:17:58.813382746 +0800
|
|
***************
|
|
*** 152,165 ****
|
|
EVP_PKEY_free(public_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
!
|
|
ret = EVP_PKEY_set_alias_type(public_evp_key, EVP_PKEY_SM2);
|
|
if (ret != 1) {
|
|
cmkem_errmsg("EVP_PKEY_set_alias_type to EVP_PKEY_SM2 failed!");
|
|
EVP_PKEY_free(public_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
!
|
|
/* do cipher. */
|
|
ctx = EVP_PKEY_CTX_new(public_evp_key, NULL);
|
|
EVP_PKEY_free(public_evp_key);
|
|
--- 152,165 ----
|
|
EVP_PKEY_free(public_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
! #ifndef WITH_OPENEULER_OS
|
|
ret = EVP_PKEY_set_alias_type(public_evp_key, EVP_PKEY_SM2);
|
|
if (ret != 1) {
|
|
cmkem_errmsg("EVP_PKEY_set_alias_type to EVP_PKEY_SM2 failed!");
|
|
EVP_PKEY_free(public_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
! #endif
|
|
/* do cipher. */
|
|
ctx = EVP_PKEY_CTX_new(public_evp_key, NULL);
|
|
EVP_PKEY_free(public_evp_key);
|
|
***************
|
|
*** 242,255 ****
|
|
EVP_PKEY_free(private_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
!
|
|
ret = EVP_PKEY_set_alias_type(private_evp_key, EVP_PKEY_SM2);
|
|
if (ret != 1) {
|
|
cmkem_errmsg("EVP_PKEY_set_alias_type to EVP_PKEY_SM2 failed!");
|
|
EVP_PKEY_free(private_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
!
|
|
/* do cipher. */
|
|
ctx = EVP_PKEY_CTX_new(private_evp_key, NULL);
|
|
EVP_PKEY_free(private_evp_key);
|
|
--- 242,255 ----
|
|
EVP_PKEY_free(private_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
! #ifndef WITH_OPENEULER_OS
|
|
ret = EVP_PKEY_set_alias_type(private_evp_key, EVP_PKEY_SM2);
|
|
if (ret != 1) {
|
|
cmkem_errmsg("EVP_PKEY_set_alias_type to EVP_PKEY_SM2 failed!");
|
|
EVP_PKEY_free(private_evp_key);
|
|
return CMKEM_EVP_ERR;
|
|
}
|
|
! #endif
|
|
/* do cipher. */
|
|
ctx = EVP_PKEY_CTX_new(private_evp_key, NULL);
|
|
EVP_PKEY_free(private_evp_key);
|
|
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' openGauss-server-5.0.1/src/include/gs_policy/policy_common.h openGauss-server-5.0.1-edit/src/include/gs_policy/policy_common.h
|
|
*** openGauss-server-5.0.1/src/include/gs_policy/policy_common.h 2024-05-07 20:16:40.004801601 +0800
|
|
--- openGauss-server-5.0.1-edit/src/include/gs_policy/policy_common.h 2024-05-08 15:15:54.570657064 +0800
|
|
***************
|
|
*** 22,27 ****
|
|
--- 22,28 ----
|
|
*/
|
|
#ifndef _GS_POLICY_COMMON_H
|
|
#define _GS_POLICY_COMMON_H
|
|
+ #include <vector>
|
|
#include "nodes/parsenodes.h"
|
|
#include "nodes/plannodes.h"
|
|
|
|
***************
|
|
*** 31,36 ****
|
|
--- 32,39 ----
|
|
#include "gs_vector.h"
|
|
#include "pgaudit.h"
|
|
|
|
+ using std::vector;
|
|
+
|
|
struct GsPolicyFQDN {
|
|
GsPolicyFQDN():m_value_schema(0), m_value_object(0), is_function(false){}
|
|
Oid m_value_schema; /* schema */
|