Skip to content
Snippets Groups Projects
Commit 60b99b93 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'hotfix-5685' into 'master'

hotfix-5685

See merge request cellframe/cellframe-node!378
parents 582283ef c3a8123e
No related branches found
No related tags found
No related merge requests found
......@@ -9,7 +9,7 @@ set(CMAKE_C_STANDARD 11)
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 5)
SET( CPACK_PACKAGE_VERSION_MINOR 0)
SET( CPACK_PACKAGE_VERSION_PATCH 46)
SET( CPACK_PACKAGE_VERSION_PATCH 47)
if (CMAKE_TARGET_ARCH MATCHES arm)
SET( CPACK_PACKAGE_ARCHITECTURE "${CMAKE_TARGET_ARCH}")
......
Subproject commit 94454195a56b0bfce12d30b93640265f38024975
Subproject commit ed09d2c6fe7e4f924a5a1731f5460b4192e9a484
......@@ -35,7 +35,7 @@ listen_port_tcp={SERVER_PORT}
# Listening path have priority above listening address
listen_path={PREFIX}/var/run/node_notify
listen_path_mode=600
#listen_addr=0.0.0.0
#listen_address=0.0.0.0
#listen_port=18888
[stream]
......
Subproject commit ab04cc3d6308e8c6c9e53c32792378008e0c5363
Subproject commit 6c33d78152c5da4fcf1724a8b3d4f8f8abd89bf1
Subproject commit acd31789d614970d2ca192d3aba39fd1e77f9875
Subproject commit d03e7d9a98aa173ed7b4db5e28e89a4409c5edea
......@@ -144,9 +144,6 @@ void exit_if_server_already_running( void );
static const char *s_pid_file_path = NULL;
bool dap_chain_net_srv_pay_verificator(dap_chain_tx_out_cond_t *a_cond, dap_chain_datum_tx_t *a_tx, bool a_owner)
{ UNUSED(a_cond); UNUSED(a_tx); UNUSED(a_owner); return true; }
#ifdef __ANDROID__
int cellframe_node_Main(int argc, const char **argv)
#else
......
......@@ -268,15 +268,13 @@ int main(int argc, const char **argv)
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
// Copy only public key pointer
l_cert_new->enc_key->pub_key_data = DAP_NEW_Z_SIZE(uint8_t,
l_cert_new->enc_key->pub_key_data_size =
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_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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment