[gnunet] branch master updated: NEWS: -

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 257673639 NEWS: -
257673639 is described below

commit 257673639daf4a9a71793588b3f65226cb718c54
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Sun Jul 16 19:30:45 2023 +0200

    NEWS: -
    
    Rename encrypt2/decrypt2 to encrypt/decrypt
---
 src/identity/gnunet-identity.c        | 18 +++++++++---------
 src/identity/identity_api.c           | 20 ++++++++++----------
 src/identity/test_identity.c          |  6 +++---
 src/include/gnunet_identity_service.h | 24 +++++++++++-------------
 4 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index c4cae78ca..59354a2e1 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -264,10 +264,10 @@ write_encrypted_message (void)
       GNUNET_SYSERR)
   {
     size_t msg_len = strlen (write_msg) + 1;
-    ssize_t res = GNUNET_IDENTITY_encrypt2 (write_msg,
-                                            msg_len,
-                                            &recipient,
-                                            ct, strlen (write_msg) + 1024);
+    ssize_t res = GNUNET_IDENTITY_encrypt (write_msg,
+                                           msg_len,
+                                           &recipient,
+                                           ct, strlen (write_msg) + 1024);
     if (-1 != res)
     {
       char *serialized_msg;
@@ -309,11 +309,11 @@ read_encrypted_message (struct GNUNET_IDENTITY_Ego *ego)
                                                         deserialized_msg,
                                                         &msg_len))
   {
-    ssize_t res = GNUNET_IDENTITY_decrypt2 (deserialized_msg,
-                                            msg_len,
-                                            
GNUNET_IDENTITY_ego_get_private_key (
-                                              ego),
-                                            deserialized_msg, msg_len);
+    ssize_t res = GNUNET_IDENTITY_decrypt (deserialized_msg,
+                                           msg_len,
+                                           GNUNET_IDENTITY_ego_get_private_key 
(
+                                             ego),
+                                           deserialized_msg, msg_len);
     if (-1 != res)
     {
       deserialized_msg[res - 1] = '\0';
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 0731fc06f..8a7e5c10b 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -1175,11 +1175,11 @@ GNUNET_IDENTITY_encrypt_old (const void *block,
 
 
 ssize_t
-GNUNET_IDENTITY_encrypt2 (const void *pt,
-                          size_t pt_size,
-                          const struct GNUNET_IDENTITY_PublicKey *pub,
-                          void *ct_buf,
-                          size_t ct_size)
+GNUNET_IDENTITY_encrypt (const void *pt,
+                         size_t pt_size,
+                         const struct GNUNET_IDENTITY_PublicKey *pub,
+                         void *ct_buf,
+                         size_t ct_size)
 {
   struct GNUNET_HashCode k;
   struct GNUNET_CRYPTO_FoKemC *kemc = (struct GNUNET_CRYPTO_FoKemC*) ct_buf;
@@ -1214,11 +1214,11 @@ GNUNET_IDENTITY_encrypt2 (const void *pt,
 
 
 ssize_t
-GNUNET_IDENTITY_decrypt2 (const void *ct_buf,
-                          size_t ct_size,
-                          const struct GNUNET_IDENTITY_PrivateKey *priv,
-                          void *pt,
-                          size_t pt_size)
+GNUNET_IDENTITY_decrypt (const void *ct_buf,
+                         size_t ct_size,
+                         const struct GNUNET_IDENTITY_PrivateKey *priv,
+                         void *pt,
+                         size_t pt_size)
 {
   struct GNUNET_HashCode k;
   struct GNUNET_CRYPTO_FoKemC *kemc = (struct GNUNET_CRYPTO_FoKemC*) ct_buf;
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c
index af17b5bcc..b9ec59ab3 100644
--- a/src/identity/test_identity.c
+++ b/src/identity/test_identity.c
@@ -264,10 +264,10 @@ create_cb (void *cls,
   ssize_t len;
 
   GNUNET_IDENTITY_key_get_public (pk, &pub);
-  len = GNUNET_IDENTITY_encrypt2 ("test", strlen ("test") + 1, &pub, ct,
-                                  sizeof(ct));
+  len = GNUNET_IDENTITY_encrypt ("test", strlen ("test") + 1, &pub, ct,
+                                 sizeof(ct));
   CHECK (-1 != len);
-  GNUNET_IDENTITY_decrypt2 (ct, len, pk, pt, sizeof (pt));
+  GNUNET_IDENTITY_decrypt (ct, len, pk, pt, sizeof (pt));
   CHECK (-1 != len);
   CHECK (0 == strcmp (pt, "test"));
   op =
diff --git a/src/include/gnunet_identity_service.h 
b/src/include/gnunet_identity_service.h
index 15e49d781..db39a92eb 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -762,8 +762,7 @@ GNUNET_IDENTITY_decrypt_old (
  *
  * @param block the block to encrypt
  * @param size the size of the @a block
- * @param pub public key to use for ecdh
- * @param ecc where to write the ecc public key
+ * @param pub public key to encrypt for
  * @param result the output parameter in which to store the encrypted result
  *               can be the same or overlap with @c block
  * @returns the size of the encrypted block, -1 for errors.
@@ -771,11 +770,11 @@ GNUNET_IDENTITY_decrypt_old (
  *          this size should be the same as @c len.
  */
 ssize_t
-GNUNET_IDENTITY_encrypt2 (const void *block,
-                          size_t size,
-                          const struct GNUNET_IDENTITY_PublicKey *pub,
-                          void *result,
-                          size_t result_size);
+GNUNET_IDENTITY_encrypt (const void *block,
+                         size_t size,
+                         const struct GNUNET_IDENTITY_PublicKey *pub,
+                         void *result,
+                         size_t result_size);
 
 
 /**
@@ -792,12 +791,11 @@ GNUNET_IDENTITY_encrypt2 (const void *block,
  *         this size should be the same as @c size.
  */
 ssize_t
-GNUNET_IDENTITY_decrypt2 (
-  const void *block,
-  size_t size,
-  const struct GNUNET_IDENTITY_PrivateKey *priv,
-  void *result,
-  size_t result_size);
+GNUNET_IDENTITY_decrypt (const void *block,
+                         size_t size,
+                         const struct GNUNET_IDENTITY_PrivateKey *priv,
+                         void *result,
+                         size_t result_size);
 
 
 /**

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.