merge

readme.md

@@ -76,14 +76,18 @@ sudo cp config.json /etc/encryptsql/
 ln -s ../../../include db_include
 
 rm -rf build
-mkdir build
-cd build
-cmake ..
+mkdir build && cd build
+cmake .. \
+  -DENCRYPTSQL_INSTALL_DIR=/usr/local/postgresql \
+  -DENCRYPTSQL_CONFIG_DIR=/etc/encryptsql \
+  -DDK_SERVER_HOST=127.0.0.1 \
+  -DDK_SERVER_PORT=9443
 sudo make -j `nproc`
 
 cd ../../../../../
-sudo touch src/interfaces/libpq/encryptsql/build/lib/enclave.signed.so
-sudo make install
+cmake --build src/interfaces/libpq/encryptsql/build --target enclave.signed.so -j"$(nproc)"
+cp /etc/encryptsql/enclave.signed.so src/interfaces/libpq/encryptsql/build/lib/enclave.signed.so
+make install
 
 sudo rm /usr/local/postgresql/lib/libudf.so
 sudo cp src/interfaces/libpq/encryptsql/build/lib/libudf.so /usr/local/postgresql/lib
@@ -99,15 +103,16 @@ sudo cp src/interfaces/libpq/encryptsql/build/bin/backup /usr/local/postgresql/b
 sudo cp src/interfaces/libpq/encryptsql/build/bin/restore /usr/local/postgresql/bin/
 
 # 创建cmk存储路径
-sudo mkdir -p /new_enc/kms_test
-sudo cp src/interfaces/libpq/encryptsql/src/KMS/domainkey /new_enc/kms_test/
+sudo mkdir -p /etc/encryptsql/kms_test
+sudo cp src/interfaces/libpq/encryptsql/src/KMS/domainkey /etc/encryptsql/kms_test/
 
 cd /etc/encryptsql
 sudo chmod 777 map.json
 
 # 创建kms_root根密钥相关文件
-sudo mkdir -p /new_enc/kms_root
-cd /new_enc/kms_root
+sudo mkdir -p /etc/encryptsql/kms_root
+
+cd /etc/encryptsql/kms_root
 sudo head -c 16 /dev/urandom > frag_a
 sudo head -c 16 /dev/urandom > frag_b
 sudo head -c 16 /dev/urandom > frag_c
@@ -135,6 +140,14 @@ source ~/.bashrc
 
 initdb
 
+vim /usr/local/postgresql/data/postgresql.conf
+# vim 打开后，将下面内容加入到尾部
+shared_preload_libraries = 'keydist_receiver'
+keydist.listen_host = '127.0.0.1'
+keydist.listen_port = '9443'
+keydist.enclave_signed_path = '/new_enc/postgresql-14.2/src/interfaces/libpq/encryptsql/build/bin/tls_server_enclave.signed'
+
+
 pg_ctl start
 
 su root