diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:22:36 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:22:36 +0100 |
commit | fec34163a1f17729c190022a2bf747f48e34f07a (patch) | |
tree | 9c2884555c795f9f70ec1e0c8d76dbb50aba1f2f /src/identity/identity_api.c | |
parent | 63fe195e40e55f13ab29e3ba578e97017fc4cc48 (diff) | |
parent | 8bf864c25bda97c1448b709a76a168834753ff86 (diff) | |
download | gnunet-fec34163a1f17729c190022a2bf747f48e34f07a.tar.gz gnunet-fec34163a1f17729c190022a2bf747f48e34f07a.zip |
-merge branch 'jacki/messenger'
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
Diffstat (limited to 'src/identity/identity_api.c')
-rw-r--r-- | src/identity/identity_api.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index d44e8da96..64c088923 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c | |||
@@ -1138,11 +1138,11 @@ GNUNET_IDENTITY_signature_verify_ (uint32_t purpose, | |||
1138 | 1138 | ||
1139 | 1139 | ||
1140 | ssize_t | 1140 | ssize_t |
1141 | GNUNET_IDENTITY_public_key_encrypt (const void *block, | 1141 | GNUNET_IDENTITY_encrypt (const void *block, |
1142 | size_t size, | 1142 | size_t size, |
1143 | const struct GNUNET_IDENTITY_PublicKey *pub, | 1143 | const struct GNUNET_IDENTITY_PublicKey *pub, |
1144 | struct GNUNET_CRYPTO_EcdhePublicKey *ecc, | 1144 | struct GNUNET_CRYPTO_EcdhePublicKey *ecc, |
1145 | void *result) | 1145 | void *result) |
1146 | { | 1146 | { |
1147 | struct GNUNET_CRYPTO_EcdhePrivateKey pk; | 1147 | struct GNUNET_CRYPTO_EcdhePrivateKey pk; |
1148 | GNUNET_CRYPTO_ecdhe_key_create (&pk); | 1148 | GNUNET_CRYPTO_ecdhe_key_create (&pk); |
@@ -1177,13 +1177,11 @@ GNUNET_IDENTITY_public_key_encrypt (const void *block, | |||
1177 | 1177 | ||
1178 | 1178 | ||
1179 | ssize_t | 1179 | ssize_t |
1180 | GNUNET_IDENTITY_private_key_decrypt (const void *block, | 1180 | GNUNET_IDENTITY_decrypt (const void *block, |
1181 | size_t size, | 1181 | size_t size, |
1182 | const struct | 1182 | const struct GNUNET_IDENTITY_PrivateKey *priv, |
1183 | GNUNET_IDENTITY_PrivateKey *priv, | 1183 | const struct GNUNET_CRYPTO_EcdhePublicKey *ecc, |
1184 | const struct | 1184 | void *result) |
1185 | GNUNET_CRYPTO_EcdhePublicKey *ecc, | ||
1186 | void *result) | ||
1187 | { | 1185 | { |
1188 | struct GNUNET_HashCode hash; | 1186 | struct GNUNET_HashCode hash; |
1189 | switch (ntohl (priv->type)) | 1187 | switch (ntohl (priv->type)) |