100 lines
3.6 KiB
Diff
Executable File
100 lines
3.6 KiB
Diff
Executable File
diff -crN '--exclude=.git' openGauss-server-2.1.0/build/script/gauss.spec openGauss-server-2.1.0-edit/build/script/gauss.spec
|
|
*** openGauss-server-2.1.0/build/script/gauss.spec 2021-12-13 16:23:09.000000000 +0800
|
|
--- openGauss-server-2.1.0-edit/build/script/gauss.spec 2023-02-11 14:44:29.667973775 +0800
|
|
***************
|
|
*** 1,2 ****
|
|
! PRODUCT=GaussDB Kernel
|
|
! VERSION=V500R002C00
|
|
--- 1,2 ----
|
|
! PRODUCT=openGauss
|
|
! VERSION=2.1.0
|
|
diff -crN '--exclude=.git' openGauss-server-2.1.0/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp openGauss-server-2.1.0-edit/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp
|
|
*** openGauss-server-2.1.0/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp 2021-12-13 16:23:09.000000000 +0800
|
|
--- openGauss-server-2.1.0-edit/src/common/interfaces/libpq/client_logic_hooks/encryption_hooks/sm2_enc_key.cpp 2023-02-11 14:29:21.000000000 +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' openGauss-server-2.1.0/src/include/gs_policy/policy_common.h openGauss-server-2.1.0-edit/src/include/gs_policy/policy_common.h
|
|
*** openGauss-server-2.1.0/src/include/gs_policy/policy_common.h 2021-12-13 16:23:09.000000000 +0800
|
|
--- openGauss-server-2.1.0-edit/src/include/gs_policy/policy_common.h 2023-02-11 15:46:27.722886953 +0800
|
|
***************
|
|
*** 22,27 ****
|
|
--- 22,28 ----
|
|
*/
|
|
#ifndef _GS_POLICY_COMMON_H
|
|
#define _GS_POLICY_COMMON_H
|
|
+ #include <vector>
|
|
#include "nodes/parsenodes.h"
|
|
|
|
#include "postgres.h"
|
|
***************
|
|
*** 30,35 ****
|
|
--- 31,38 ----
|
|
#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 */
|