Skip to content
Snippets Groups Projects
Commit 777d0bfe authored by Constantin P.'s avatar Constantin P. 💬
Browse files

Merge branch 'hotfix-wrns' into 'master'

Hotfix wrns

See merge request !1760
parents 3a6c0475 c36582ce
No related branches found
No related tags found
2 merge requests!1779Develop port 02 12,!1760Hotfix wrns
Subproject commit 09462f6ea2c421c663d6e946924b231b7c99f176
Subproject commit fd2ac4c6f2d32cf190817c65e66d5c5b9087e7e3
......@@ -517,7 +517,7 @@ static int s_cert_copy(int argc, const char **argv, bool a_pvt_key_copy)
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 public key (copy only memory address of key storage)
l_cert_new->enc_key->pub_key_data = DAP_DUP_SIZE(l_cert->enc_key->pub_key_data,
l_cert_new->enc_key->pub_key_data = DAP_DUP_SIZE((byte_t*)l_cert->enc_key->pub_key_data,
l_cert->enc_key->pub_key_data_size);
if (!l_cert_new->enc_key->pub_key_data) {
log_it(L_CRITICAL, "%s", c_error_memory_alloc);
......@@ -526,7 +526,7 @@ static int s_cert_copy(int argc, const char **argv, bool a_pvt_key_copy)
l_cert_new->enc_key->pub_key_data_size = l_cert->enc_key->pub_key_data_size;
// Copy private key for rename (copy only memory address of key storage)
if (l_cert->enc_key->priv_key_data && l_cert->enc_key->priv_key_data_size && a_pvt_key_copy) {
l_cert_new->enc_key->priv_key_data = DAP_DUP_SIZE(l_cert->enc_key->priv_key_data,
l_cert_new->enc_key->priv_key_data = DAP_DUP_SIZE((byte_t*)l_cert->enc_key->priv_key_data,
l_cert->enc_key->priv_key_data_size);
if (!l_cert_new->enc_key->priv_key_data) {
log_it(L_CRITICAL, "%s", c_error_memory_alloc);
......
......@@ -38,9 +38,9 @@ static void clear_pid_file() {
}
static void sig_exit_handler(int sig_code) {
log_it(L_DEBUG, "Got exit code: %d", sig_code);
exit(sig_code);
fflush(stdout);
exit(0);
/*clear_pid_file();
dap_plugin_deinit();
......
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