diff options
author | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:32:32 +0100 |
---|---|---|
committer | TheJackiMonster <thejackimonster@gmail.com> | 2020-11-12 17:32:32 +0100 |
commit | e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf (patch) | |
tree | 80c08d417bb0c862adcbcde7f55aa7e3a4646d27 /src/identity/identity_api.c | |
parent | fec34163a1f17729c190022a2bf747f48e34f07a (diff) | |
download | gnunet-e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf.tar.gz gnunet-e11d1e59e4ae5f7d89c33df3ae9ca8f1ece990cf.zip |
-revert "-merge branch 'jacki/messenger'"
This reverts commit fec34163a1f17729c190022a2bf747f48e34f07a, reversing
changes made to 63fe195e40e55f13ab29e3ba578e97017fc4cc48.
Diffstat (limited to 'src/identity/identity_api.c')
-rw-r--r-- | src/identity/identity_api.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 64c088923..d44e8da96 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_encrypt (const void *block, | 1141 | GNUNET_IDENTITY_public_key_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,11 +1177,13 @@ GNUNET_IDENTITY_encrypt (const void *block, | |||
1177 | 1177 | ||
1178 | 1178 | ||
1179 | ssize_t | 1179 | ssize_t |
1180 | GNUNET_IDENTITY_decrypt (const void *block, | 1180 | GNUNET_IDENTITY_private_key_decrypt (const void *block, |
1181 | size_t size, | 1181 | size_t size, |
1182 | const struct GNUNET_IDENTITY_PrivateKey *priv, | 1182 | const struct |
1183 | const struct GNUNET_CRYPTO_EcdhePublicKey *ecc, | 1183 | GNUNET_IDENTITY_PrivateKey *priv, |
1184 | void *result) | 1184 | const struct |
1185 | GNUNET_CRYPTO_EcdhePublicKey *ecc, | ||
1186 | void *result) | ||
1185 | { | 1187 | { |
1186 | struct GNUNET_HashCode hash; | 1188 | struct GNUNET_HashCode hash; |
1187 | switch (ntohl (priv->type)) | 1189 | switch (ntohl (priv->type)) |