Changeset 37ef2cb

Timestamp:

2024-05-08T15:44:42Z (8 months ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

684aca2

Parents:

210d1d9

git-author:

Petr Vaněk <arkamar@…> (20-02-24 07:55:25)

git-committer:

Jelmer Vernooij <jelmer@…> (08-05-24 15:44:42)

Message:

Adjust sha1_random_uuid usage in jabber/conference.c

The jabber/conference.c module failed to compile due to the implicit use
of the sha1_random_uuid function following the deprecation of the sha1
lib. This patch reintroduces the sha1.h include to resolve compilation
errors encountered with GCC 14:

error: implicit declaration of function ‘sha1_random_uuid’

Additionally, the patch corrects the type mismatch error when calling
sha1_random_uuid, aligning with the expected ‘GChecksum ’ type,
otherwise compilation fails with following error:

error: passing argument 1 of ‘sha1_random_uuid’ from incompatible pointer type
note: expected ‘GChecksum ’ {aka ‘struct _GChecksum ’} but argument is of type ‘GChecksum *’ {aka ‘struct _GChecksum *’}

Fixes: a4ac9c413b97 ("Deprecate sha1_* functions (#172)")

File:

• protocols/jabber/conference.c (modified) (2 diffs)

protocols/jabber/conference.c

@@ -23 +23 @@
 
 #include "jabber.h"
+#include "sha1.h"
 
 static xt_status jabber_chat_join_failed(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
@@ -86 +87 @@
         g_checksum_update(sum, (uint8_t *) &now, sizeof(now));
         g_checksum_update(sum, (uint8_t *) who, strlen(who));
-        uuid = sha1_random_uuid(sum);
+        uuid = sha1_random_uuid(&sum);
 
         if (jd->flags & JFLAG_GTALK) {