Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
celllframe-node
Manage
Activity
Members
Labels
Plan
Issues
5
Issue boards
Milestones
Code
Merge requests
17
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
celllframe-node
Commits
777d0bfe
Commit
777d0bfe
authored
4 months ago
by
Constantin P.
💬
Browse files
Options
Downloads
Plain Diff
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
!1779
Develop port 02 12
,
!1760
Hotfix wrns
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dap-sdk
+1
-1
1 addition, 1 deletion
dap-sdk
sources/main_node_tool.c
+2
-2
2 additions, 2 deletions
sources/main_node_tool.c
sources/sig_unix_handler.c
+2
-2
2 additions, 2 deletions
sources/sig_unix_handler.c
with
5 additions
and
5 deletions
dap-sdk
@
fd2ac4c6
Compare
09462f6e
...
fd2ac4c6
Subproject commit
09462f6ea2c421c663d6e946924b231b7c99f176
Subproject commit
fd2ac4c6f2d32cf190817c65e66d5c5b9087e7e3
This diff is collapsed.
Click to expand it.
sources/main_node_tool.c
+
2
−
2
View file @
777d0bfe
...
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
sources/sig_unix_handler.c
+
2
−
2
View file @
777d0bfe
...
...
@@ -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();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment