[seahorse] Remove useless seahorse-algo.c file
- From: Stefan Walter <stefw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse] Remove useless seahorse-algo.c file
- Date: Wed, 19 Oct 2011 12:50:45 +0000 (UTC)
commit ddc362006156e52a5314b3d085ef7e2c6b3f0c58
Author: Stef Walter <stefw collabora co uk>
Date: Wed Oct 19 14:50:22 2011 +0200
Remove useless seahorse-algo.c file
* Use glib checksum functionality instead
ssh/Makefile.am | 1 -
ssh/seahorse-algo.c | 243 -------------------------------------------
ssh/seahorse-algo.h | 49 ---------
ssh/seahorse-ssh-key-data.c | 41 ++++----
4 files changed, 20 insertions(+), 314 deletions(-)
---
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index e4f3c23..13b26c1 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -20,7 +20,6 @@ noinst_LTLIBRARIES = libseahorse-ssh.la
libseahorse_ssh_la_SOURCES = \
seahorse-ssh.h seahorse-ssh.c \
seahorse-ssh-module.c seahorse-ssh-module.h \
- seahorse-algo.c seahorse-algo.h \
seahorse-ssh-commands.c seahorse-ssh-commands.h \
seahorse-ssh-dialogs.h \
seahorse-ssh-generate.c \
diff --git a/ssh/seahorse-ssh-key-data.c b/ssh/seahorse-ssh-key-data.c
index 51d5ec5..aabb8db 100644
--- a/ssh/seahorse-ssh-key-data.c
+++ b/ssh/seahorse-ssh-key-data.c
@@ -24,7 +24,6 @@
#include "seahorse-ssh-key-data.h"
#include "seahorse-ssh-source.h"
-#include "seahorse-algo.h"
#include "seahorse-util.h"
#define SSH_PRIVATE_BEGIN "-----BEGIN "
@@ -77,27 +76,27 @@ parse_algo (const gchar *type)
static gboolean
parse_key_blob (guchar *bytes, gsize len, SeahorseSSHKeyData *data)
{
- md5_ctx_t ctx;
- guchar digest[MD5_LEN];
- gchar *fingerprint;
- guint i;
-
- seahorse_md5_init (&ctx);
- seahorse_md5_update (&ctx, bytes, len);
- seahorse_md5_final (digest, &ctx);
-
- fingerprint = g_new0 (gchar, MD5_LEN * 3 + 1);
- for (i = 0; i < MD5_LEN; i++) {
- char hex[4];
- snprintf (hex, sizeof (hex), "%02x:", (int)(digest[i]));
- strncat (fingerprint, hex, MD5_LEN * 3 - strlen (fingerprint));
- }
+ GString *fingerprint;
+ gchar *digest;
+ gsize n_digest;
+ gsize i;
- /* Remove the trailing ':' character */
- fingerprint[(MD5_LEN * 3) - 1] = '\0';
- data->fingerprint = fingerprint;
-
- return TRUE;
+ digest = g_compute_checksum_for_data (G_CHECKSUM_MD5, bytes, len);
+ if (!digest)
+ return FALSE;
+
+ n_digest = strlen (digest);
+ fingerprint = g_string_sized_new ((n_digest * 3) / 2);
+ for (i = 0; i < n_digest; i += 2) {
+ if (i > 0)
+ g_string_append_c (fingerprint, ':');
+ g_string_append_len (fingerprint, digest + i, 2);
+ }
+
+ g_free (digest);
+ data->fingerprint = g_string_free (fingerprint, FALSE);
+
+ return TRUE;
}
static gboolean
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]