Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libdap-crypto-python
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
cellframe
libdap-crypto-python
Commits
6fef53aa
Commit
6fef53aa
authored
5 years ago
by
alexey.stratulat
Browse files
Options
Downloads
Patches
Plain Diff
[*] Fix.
parent
a480f8bc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
include/key_list.h
+6
-0
6 additions, 0 deletions
include/key_list.h
src/key_list.c
+1
-1
1 addition, 1 deletion
src/key_list.c
src/libdap-crypto-python.c
+1
-0
1 addition, 0 deletions
src/libdap-crypto-python.c
src/wrapping_dap_enc_key.c
+21
-14
21 additions, 14 deletions
src/wrapping_dap_enc_key.c
with
29 additions
and
15 deletions
include/key_list.h
+
6
−
0
View file @
6fef53aa
#ifndef KEY_LIST_H
#define KEY_LIST_H
#include
"dap_common.h"
#include
"dap_enc_key.h"
#include
<stdint.h>
...
...
@@ -24,3 +28,5 @@ dap_enc_key_t *key_list_get_key(key_list_t *list, uint8_t key);
#ifdef __cplusplus
}
#endif
#endif
This diff is collapsed.
Click to expand it.
src/key_list.c
+
1
−
1
View file @
6fef53aa
...
...
@@ -54,4 +54,4 @@ dap_enc_key_t *key_list_get_key(key_list_t *list, uint8_t key){
return
NULL
;
}
return
list
->
keys
[
index
];
}
\ No newline at end of file
}
This diff is collapsed.
Click to expand it.
src/libdap-crypto-python.c
+
1
−
0
View file @
6fef53aa
...
...
@@ -11,6 +11,7 @@ static PyObject* dap_crypto_init(PyObject *self, PyObject *args){
return
PyLong_FromLong
(
-
2
);
}
keys
=
key_list_init
();
keys_iaes
=
keys
;
return
PyLong_FromLong
(
0
);
}
...
...
This diff is collapsed.
Click to expand it.
src/wrapping_dap_enc_key.c
+
21
−
14
View file @
6fef53aa
...
...
@@ -32,11 +32,11 @@ PyObject* dap_enc_key_get_dec_size_py(PyObject *self, PyObject *args){
// allocate memory for key struct
PyObject
*
dap_enc_key_new_py
(
PyObject
*
self
,
PyObject
*
args
){
int
type_key
;
if
(
!
PyArg_ParseTuple
(
args
,
"
i
"
,
&
type_key
)){
u
int
8_t
type_key
;
if
(
!
PyArg_ParseTuple
(
args
,
"
h
"
,
&
type_key
)){
return
NULL
;
}
if
(
type_key
<
0
||
type_key
>
16
){
if
(
type_key
>
16
){
return
PyLong_FromLong
(
-
1
);
}
dap_enc_key_t
*
new_key
=
dap_enc_key_new
(
type_key
);
...
...
@@ -45,18 +45,25 @@ PyObject* dap_enc_key_new_py(PyObject *self, PyObject *args){
}
/// default gen key
PyObject
*
dap_enc_key_new_generate_py
(
PyObject
*
self
,
PyObject
*
args
){
///!!!!!!! ERR
/*int type_key;
PyObject *kex_buf;
size_t kex_size;
PyObject* seed,
size_t seed_size;
size_t key_size
if (PyArg_ParseTuple(args, "i|O|n|O|n|n", &type_key, &kex_buf, &kex_size, &seed, &seed_size, &key_size)){
PyObject
*
dap_enc_key_new_generate_py
(
PyObject
*
self
,
PyObject
*
args
){
uint8_t
in_type_key
;
PyBytesObject
*
in_kex_buf
;
size_t
in_kex_size
;
PyBytesObject
*
in_seed
;
size_t
in_seed_size
;
size_t
in_key_size
;
if
(
!
PyArg_ParseTuple
(
args
,
"h|S|n|S|n|n"
,
&
in_type_key
,
&
in_kex_buf
,
&
in_kex_size
,
&
in_seed
,
&
in_seed_size
,
&
in_key_size
)){
return
NULL
;
}
//dap_enc_key_new_generate - restart*/
return
PyLong_FromLong
(
0
);
if
(
in_type_key
>
16
){
return
PyLong_FromLong
(
-
1
);
}
void
*
kex_buf
=
PyBytes_AsString
((
PyObject
*
)
in_kex_buf
);
void
*
seed
=
PyBytes_AsString
((
PyObject
*
)
in_seed
);
dap_enc_key_t
*
new_key
=
dap_enc_key_new_generate
(
in_type_key
,
kex_buf
,
in_kex_size
,
seed
,
in_seed_size
,
in_key_size
);
uint8_t
new_key_id
=
key_list_add_element
(
keys
,
new_key
);
return
PyLong_FromLong
(
new_key_id
);
}
// update struct dap_enc_key_t after insert foreign keys
...
...
@@ -134,4 +141,4 @@ PyObject *dap_enc_key_delete_py(PyObject *self, PyObject *args){
key_list_del_element
(
keys
,
key_id
);
dap_enc_key_delete
(
key
);
return
PyLong_FromLong
(
0
);
}
\ No newline at end of file
}
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