diff options
author | Christian Grothoff <grothoff@gnunet.org> | 2021-12-29 18:22:37 +0100 |
---|---|---|
committer | Christian Grothoff <grothoff@gnunet.org> | 2021-12-29 18:22:37 +0100 |
commit | c0b6f577cb6866a8bfce22acbcec6983d5f610f6 (patch) | |
tree | a7cb3c59313b8cc44b3ec51baa9bdd97e25efd09 /src/identity | |
parent | fd620976c140d5df43cf174a54a9f88c4808cad3 (diff) | |
download | gnunet-c0b6f577cb6866a8bfce22acbcec6983d5f610f6.tar.gz gnunet-c0b6f577cb6866a8bfce22acbcec6983d5f610f6.zip |
-updating block plugins to new API
Diffstat (limited to 'src/identity')
-rw-r--r-- | src/identity/identity_api.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 08a975e65..01f36b840 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c | |||
@@ -979,10 +979,8 @@ GNUNET_IDENTITY_key_get_length (const struct GNUNET_IDENTITY_PublicKey *key) | |||
979 | { | 979 | { |
980 | case GNUNET_IDENTITY_TYPE_ECDSA: | 980 | case GNUNET_IDENTITY_TYPE_ECDSA: |
981 | return sizeof (key->type) + sizeof (key->ecdsa_key); | 981 | return sizeof (key->type) + sizeof (key->ecdsa_key); |
982 | break; | ||
983 | case GNUNET_IDENTITY_TYPE_EDDSA: | 982 | case GNUNET_IDENTITY_TYPE_EDDSA: |
984 | return sizeof (key->type) + sizeof (key->eddsa_key); | 983 | return sizeof (key->type) + sizeof (key->eddsa_key); |
985 | break; | ||
986 | default: | 984 | default: |
987 | GNUNET_break (0); | 985 | GNUNET_break (0); |
988 | } | 986 | } |
@@ -992,19 +990,22 @@ GNUNET_IDENTITY_key_get_length (const struct GNUNET_IDENTITY_PublicKey *key) | |||
992 | 990 | ||
993 | ssize_t | 991 | ssize_t |
994 | GNUNET_IDENTITY_read_key_from_buffer (struct GNUNET_IDENTITY_PublicKey *key, | 992 | GNUNET_IDENTITY_read_key_from_buffer (struct GNUNET_IDENTITY_PublicKey *key, |
995 | const void*buffer, | 993 | const void *buffer, |
996 | size_t len) | 994 | size_t len) |
997 | { | 995 | { |
998 | if (len < sizeof (key->type)) | 996 | if (len < sizeof (key->type)) |
999 | return -1; | 997 | return -1; |
1000 | GNUNET_memcpy (&(key->type), buffer, sizeof (key->type)); | 998 | GNUNET_memcpy (&key->type, |
1001 | const ssize_t length = GNUNET_IDENTITY_key_get_length (key); | 999 | buffer, |
1000 | sizeof (key->type)); | ||
1001 | ssize_t length = GNUNET_IDENTITY_key_get_length (key); | ||
1002 | if (len < length) | 1002 | if (len < length) |
1003 | return -1; | 1003 | return -1; |
1004 | if (length < 0) | 1004 | if (length < 0) |
1005 | return -2; | 1005 | return -2; |
1006 | GNUNET_memcpy (&(key->ecdsa_key), buffer + sizeof (key->type), length | 1006 | GNUNET_memcpy (&key->ecdsa_key, |
1007 | - sizeof (key->type)); | 1007 | buffer + sizeof (key->type), |
1008 | length - sizeof (key->type)); | ||
1008 | return length; | 1009 | return length; |
1009 | } | 1010 | } |
1010 | 1011 | ||