From 1487420be358c13d1770c5c079591cd29226e8fa Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Wed, 20 Nov 2019 18:32:00 +0700
Subject: [PATCH] [*] libdap-chain-crypto -> libdap-crypto
---
CMakeLists.txt | 2 +-
libdap | 2 +-
libdap-chain | 2 +-
libdap-chain-crypto | 2 +-
libdap-chain-cs-dag | 2 +-
libdap-chain-cs-dag-poa | 2 +-
libdap-chain-cs-dag-pos | 2 +-
libdap-chain-global-db | 2 +-
libdap-chain-mempool | 2 +-
libdap-chain-net | 2 +-
libdap-chain-net-srv | 2 +-
libdap-chain-net-srv-vpn | 2 +-
libdap-chain-wallet | 2 +-
libdap-crypto | 2 +-
libdap-server | 2 +-
libdap-stream | 2 +-
libdap-stream-ch-chain-net-srv | 2 +-
sources/main_node_tool.c | 40 +++++++++++++++++-----------------
18 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 154d5a6e4..fcd2ad8f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB")
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 2)
SET( CPACK_PACKAGE_VERSION_MINOR 6)
-SET( CPACK_PACKAGE_VERSION_PATCH 9)
+SET( CPACK_PACKAGE_VERSION_PATCH 10)
SET( CPACK_SYSTEM_NAME "debian-9.9-amd64")
SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
diff --git a/libdap b/libdap
index 08177c98b..1c0614797 160000
--- a/libdap
+++ b/libdap
@@ -1 +1 @@
-Subproject commit 08177c98b8d52f069ac4ef3a140d925d440d80e0
+Subproject commit 1c0614797a3a2a2f4c179630025600e177637a65
diff --git a/libdap-chain b/libdap-chain
index 6a57f51ba..f7e22487b 160000
--- a/libdap-chain
+++ b/libdap-chain
@@ -1 +1 @@
-Subproject commit 6a57f51bae31b8fcaeba2ac6163bbd3bf528a7dc
+Subproject commit f7e22487b7c01431161bc527269e76e16e213cfd
diff --git a/libdap-chain-crypto b/libdap-chain-crypto
index aaeef8d97..f8dfd8884 160000
--- a/libdap-chain-crypto
+++ b/libdap-chain-crypto
@@ -1 +1 @@
-Subproject commit aaeef8d971086b9fa8ac141d3f0b0e0c98b699f8
+Subproject commit f8dfd888432234c0314057f5551a578dd770003c
diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag
index c33d57a9a..5ec441b09 160000
--- a/libdap-chain-cs-dag
+++ b/libdap-chain-cs-dag
@@ -1 +1 @@
-Subproject commit c33d57a9a62b00ca52b4db5d0bcfc480ab2d909e
+Subproject commit 5ec441b095eea928055f673186440cde78253918
diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa
index 10ef1bf2d..db06bbd6a 160000
--- a/libdap-chain-cs-dag-poa
+++ b/libdap-chain-cs-dag-poa
@@ -1 +1 @@
-Subproject commit 10ef1bf2d2a1688a159a87613bb2417c5176d98c
+Subproject commit db06bbd6a784ff2496f2d1bb9cbb54924efe83b6
diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos
index 87759842e..b1a0d674d 160000
--- a/libdap-chain-cs-dag-pos
+++ b/libdap-chain-cs-dag-pos
@@ -1 +1 @@
-Subproject commit 87759842ed0159a065cf374ce01194174949bce4
+Subproject commit b1a0d674dbb56938e0ba58862ad1d638420e554f
diff --git a/libdap-chain-global-db b/libdap-chain-global-db
index 6a574e4bd..8c6bbf445 160000
--- a/libdap-chain-global-db
+++ b/libdap-chain-global-db
@@ -1 +1 @@
-Subproject commit 6a574e4bd23354672773a9e4b8cbb2b656249c15
+Subproject commit 8c6bbf4458bd10614bf48bb2da7e84b4f80f0d33
diff --git a/libdap-chain-mempool b/libdap-chain-mempool
index 86046978d..4bbdcf60e 160000
--- a/libdap-chain-mempool
+++ b/libdap-chain-mempool
@@ -1 +1 @@
-Subproject commit 86046978d73ef5902292123e829d4a7cf4ac561f
+Subproject commit 4bbdcf60e10de8462820e45d7cc3715dca4c2139
diff --git a/libdap-chain-net b/libdap-chain-net
index 722708bff..10e82c539 160000
--- a/libdap-chain-net
+++ b/libdap-chain-net
@@ -1 +1 @@
-Subproject commit 722708bffe07b2f4eb92bb8b0d910badeff95992
+Subproject commit 10e82c5393eee63eff349b4f4d2ec932e66c57bf
diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv
index 71a1db8b1..5edea70af 160000
--- a/libdap-chain-net-srv
+++ b/libdap-chain-net-srv
@@ -1 +1 @@
-Subproject commit 71a1db8b1cdc8a9723cce1212d21a21c11f403a3
+Subproject commit 5edea70af6a5ede0c759e9d83a5741376f4da9fb
diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn
index 268f58d7e..5d22d6242 160000
--- a/libdap-chain-net-srv-vpn
+++ b/libdap-chain-net-srv-vpn
@@ -1 +1 @@
-Subproject commit 268f58d7e1bade3fcb4035df6359ecfd5b27a579
+Subproject commit 5d22d6242694b003694ea5130be2383761880551
diff --git a/libdap-chain-wallet b/libdap-chain-wallet
index 2c5cb7e34..5273ba5ba 160000
--- a/libdap-chain-wallet
+++ b/libdap-chain-wallet
@@ -1 +1 @@
-Subproject commit 2c5cb7e34e5c7092c6a0b972be58e4607b52d704
+Subproject commit 5273ba5ba0a15dd94e680f9d961ab150f3764848
diff --git a/libdap-crypto b/libdap-crypto
index 17f821883..d9337dda7 160000
--- a/libdap-crypto
+++ b/libdap-crypto
@@ -1 +1 @@
-Subproject commit 17f8218833f473d2c954113617ae63cb5dc9400f
+Subproject commit d9337dda7db1b3430d17914b4e290b9a200045a2
diff --git a/libdap-server b/libdap-server
index 639d9897c..e3f07ae78 160000
--- a/libdap-server
+++ b/libdap-server
@@ -1 +1 @@
-Subproject commit 639d9897cca41a514fe4987fec7962b781c080c5
+Subproject commit e3f07ae78aaecfada9f44abdd48a4ebbce9e2184
diff --git a/libdap-stream b/libdap-stream
index eca304dfd..5fd18ccdb 160000
--- a/libdap-stream
+++ b/libdap-stream
@@ -1 +1 @@
-Subproject commit eca304dfd36e2bc5a7b99114d3072f02cbe54a24
+Subproject commit 5fd18ccdb08cf8f35b0ab7eed857387433bddbbb
diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv
index f4a9affb3..85f7f0c0b 160000
--- a/libdap-stream-ch-chain-net-srv
+++ b/libdap-stream-ch-chain-net-srv
@@ -1 +1 @@
-Subproject commit f4a9affb3d69c01aecd9c6619862d9b6137936dd
+Subproject commit 85f7f0c0b7f7f21cb46acf2ef0b5349523120cd7
diff --git a/sources/main_node_tool.c b/sources/main_node_tool.c
index 7ee855fe5..9fcab399d 100644
--- a/sources/main_node_tool.c
+++ b/sources/main_node_tool.c
@@ -57,8 +57,8 @@
#include "dap_chain.h"
#include "dap_chain_wallet.h"
-#include "dap_chain_cert.h"
-#include "dap_chain_cert_file.h"
+#include "dap_cert.h"
+#include "dap_cert_file.h"
#include "dap_chain_cs_dag.h"
#include "dap_chain_cs_dag_event.h"
@@ -146,7 +146,7 @@ int main(int argc, const char **argv) {
}*/
const char *l_wallet_name = argv[4];
- dap_chain_sign_type_t l_sig_type = dap_chain_sign_type_from_str( argv[5] );
+ dap_sign_type_t l_sig_type = dap_sign_type_from_str( argv[5] );
dap_chain_wallet_t *l_wallet = NULL;
if ( l_sig_type.type == SIG_TYPE_NULL ) {
@@ -198,10 +198,10 @@ int main(int argc, const char **argv) {
/* if ( strcmp( argv[2],"create_from") == 0 ){
}else if ( argc >=7){
// wallet create_from <wallet name> from <wallet ca1> [<wallet ca2> ...<wallet caN>]
- dap_chain_cert_t ** l_wallet_cert = NULL;
+ dap_cert_t ** l_wallet_cert = NULL;
size_t l_wallet_cert_size = 0;
l_wallet_cert_size = (argc - 3 )
- l_wallet_cert = DAP_NEW_Z_SIZE (dap_chain_cert_t*, l_wallet_cert_size );
+ l_wallet_cert = DAP_NEW_Z_SIZE (dap_cert_t*, l_wallet_cert_size );
}else {
log_it(L_ERROR,"Wrong 'wallet create_from' command params");
s_help();
@@ -211,7 +211,7 @@ int main(int argc, const char **argv) {
if ( l_wallet_cert ){
if (l_wallet_cert_size > 0)
for (size_t i = 0; i < l_wallet_cert_size; i++)
- dap_chain_cert_delete( l_wallet_cert[i]->);
+ dap_cert_delete( l_wallet_cert[i]->);
}
}*/
@@ -221,10 +221,10 @@ int main(int argc, const char **argv) {
if ( strcmp( argv[2],"dump") == 0 ){
if (argc>=4) {
const char * l_cert_name = argv[3];
- dap_chain_cert_t * l_cert = dap_chain_cert_add_file(l_cert_name, s_system_ca_dir);
+ dap_cert_t * l_cert = dap_cert_add_file(l_cert_name, s_system_ca_dir);
if ( l_cert ) {
- dap_chain_cert_dump(l_cert);
- dap_chain_cert_delete_by_name(l_cert_name);
+ dap_cert_dump(l_cert);
+ dap_cert_delete_by_name(l_cert_name);
ret = 0;
}
else {
@@ -235,13 +235,13 @@ int main(int argc, const char **argv) {
if (argc < 5) exit(-7023);
const char *l_cert_name = argv[3];
const char *l_cert_pkey_path = argv[4];
- dap_chain_cert_t *l_cert = dap_chain_cert_add_file(l_cert_name, s_system_ca_dir);
+ dap_cert_t *l_cert = dap_cert_add_file(l_cert_name, s_system_ca_dir);
if ( !l_cert ) exit( -7021 );
l_cert->enc_key->pub_key_data_size = dap_enc_gen_key_public_size(l_cert->enc_key);
if ( l_cert->enc_key->pub_key_data_size ) {
//l_cert->key_private->pub_key_data = DAP_NEW_SIZE(void, l_cert->key_private->pub_key_data_size);
//if ( dap_enc_gen_key_public(l_cert->key_private, l_cert->key_private->pub_key_data) == 0){
- dap_chain_pkey_t * l_pkey = dap_chain_pkey_from_enc_key( l_cert->enc_key );
+ dap_pkey_t * l_pkey = dap_pkey_from_enc_key( l_cert->enc_key );
if (l_pkey) {
FILE *l_file = fopen(l_cert_pkey_path,"wb");
if (l_file) {
@@ -252,7 +252,7 @@ int main(int argc, const char **argv) {
log_it(L_ERROR, "Can't produce pkey from the certificate");
exit(-7022);
}
- dap_chain_cert_delete_by_name(l_cert_name);
+ dap_cert_delete_by_name(l_cert_name);
ret = 0;
//}else{
// log_it(L_ERROR,"Can't produce public key with this key type");
@@ -266,11 +266,11 @@ int main(int argc, const char **argv) {
if ( argc >= 5 ) {
const char *l_cert_name = argv[3];
const char *l_cert_new_name = argv[4];
- dap_chain_cert_t *l_cert = dap_chain_cert_add_file(l_cert_name, s_system_ca_dir);
+ dap_cert_t *l_cert = dap_cert_add_file(l_cert_name, s_system_ca_dir);
if ( l_cert ) {
if ( l_cert->enc_key->pub_key_data_size ) {
// Create empty new cert
- dap_chain_cert_t * l_cert_new = dap_chain_cert_new(l_cert_new_name);
+ dap_cert_t * l_cert_new = dap_cert_new(l_cert_new_name);
l_cert_new->enc_key = dap_enc_key_new( l_cert->enc_key->type);
// Copy only public key
@@ -279,9 +279,9 @@ int main(int argc, const char **argv) {
l_cert->enc_key->pub_key_data_size );
memcpy(l_cert_new->enc_key->pub_key_data, l_cert->enc_key->pub_key_data,l_cert->enc_key->pub_key_data_size);
- dap_chain_cert_save_to_folder(l_cert_new, s_system_ca_dir);
- //dap_chain_cert_delete_by_name(l_cert_name);
- //dap_chain_cert_delete_by_name(l_cert_new_name);
+ dap_cert_save_to_folder(l_cert_new, s_system_ca_dir);
+ //dap_cert_delete_by_name(l_cert_name);
+ //dap_cert_delete_by_name(l_cert_new_name);
} else {
log_it(L_ERROR,"Can't produce pkey from this cert type");
exit(-7023);
@@ -324,11 +324,11 @@ int main(int argc, const char **argv) {
if ( l_key_type != DAP_ENC_KEY_TYPE_NULL ) {
int l_key_length = argc >=6 ? atoi(argv[5]) : 0;
- dap_chain_cert_t * l_cert = dap_chain_cert_generate(l_cert_name,l_cert_path,l_key_type ); // key length ignored!
+ dap_cert_t * l_cert = dap_cert_generate(l_cert_name,l_cert_path,l_key_type ); // key length ignored!
if (l_cert == NULL){
log_it(L_ERROR, "Can't create %s",l_cert_path);
}
- dap_chain_cert_delete(l_cert);
+ dap_cert_delete(l_cert);
} else {
s_help();
DAP_DELETE(l_cert_path);
@@ -394,7 +394,7 @@ static int s_init( int argc, const char **argv )
return -3;
}
- if ( dap_chain_cert_init() != 0 ) {
+ if ( dap_cert_init() != 0 ) {
log_it( L_ERROR, "Can't chain certificate storage module" );
return -4;
}
--
GitLab