Changeset a4ac9c4 for lib

Timestamp:

2023-04-01T20:09:39Z (20 months ago)

Author:

GitHub <noreply@…>

Branches:

master

Children:

552da22

Parents:

59c9fa4d

git-author:

Jelmer Vernooij <jelmer@…> (01-04-23 20:09:39)

git-committer:

GitHub <noreply@…> (01-04-23 20:09:39)

Message:

Deprecate sha1_* functions (#172)

• Migrate sha1 calls to direct use of GChecksum

• Mark sha1.h functions as deprecated

Location:

lib

Files:

• sha1.c (modified) (1 diff)
• sha1.h (modified) (1 diff)

lib/sha1.c

@@ -100 +100 @@
         char *ret = g_new0(char, 40);   /* 36 chars + \0 */
         int i, p;
+        gsize digest_len = SHA1_HASH_SIZE;
 
-        sha1_finish(context, dig);
+        g_checksum_get_digest(*context, dig, &digest_len);
+        g_checksum_free(*context);
+
         for (p = i = 0; i < 16; i++) {
                 if (i == 4 || i == 6 || i == 8 || i == 10) {

lib/sha1.h

@@ -6 +6 @@
 #include <gmodule.h>
 
+#ifdef __GNUC__
+#define __SHA1_NON_PUBLIC_DEPRECATION__ __attribute__((deprecated("sha1.h will be removed from Bitlbee's public API. Please use another library (such as GLib's gchecksum) instead")))
+#else
+#define __SHA1_NON_PUBLIC_DEPRECATION__
+#endif
+
 #define SHA1_HASH_SIZE 20
 
 typedef GChecksum *sha1_state_t;
 
-void sha1_init(sha1_state_t *);
-void sha1_append(sha1_state_t *, const guint8 *, unsigned int);
-void sha1_finish(sha1_state_t *, guint8 digest[SHA1_HASH_SIZE]);
-void sha1_hmac(const char *, size_t, const char *, size_t, guint8 digest[SHA1_HASH_SIZE]);
+void sha1_init(sha1_state_t *) __SHA1_NON_PUBLIC_DEPRECATION__;
+void sha1_append(sha1_state_t *, const guint8 *, unsigned int) __SHA1_NON_PUBLIC_DEPRECATION__;
+void sha1_finish(sha1_state_t *, guint8 digest[SHA1_HASH_SIZE]) __SHA1_NON_PUBLIC_DEPRECATION__;
+void sha1_hmac(const char *, size_t, const char *, size_t, guint8 digest[SHA1_HASH_SIZE]) ;
 char *sha1_random_uuid(sha1_state_t *);