Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1997 - 2006 Pekka Riikonen
+ Copyright (C) 1997 - 2007 Pekka Riikonen
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "md5.h"
#include "sha1.h"
#include "sha256.h"
+#include "sha512.h"
/* The main SILC hash structure. */
struct SilcHashStruct {
/* Default hash functions for silc_hash_register_default(). */
const SilcHashObject silc_default_hash[] =
{
- { "sha256", 32, 64, silc_sha256_init, silc_sha256_update, silc_sha256_final,
+ { "sha256", "2.16.840.1.101.3.4.2.1",
+ 32, 64, silc_sha256_init, silc_sha256_update, silc_sha256_final,
silc_sha256_transform, silc_sha256_context_len },
- { "sha1", 20, 64, silc_sha1_init, silc_sha1_update, silc_sha1_final,
+ { "sha512", "2.16.840.1.101.3.4.2.3",
+ 32, 64, silc_sha512_init, silc_sha512_update, silc_sha512_final,
+ silc_sha512_transform, silc_sha512_context_len },
+ { "sha1", "1.3.14.3.2.26",
+ 20, 64, silc_sha1_init, silc_sha1_update, silc_sha1_final,
silc_sha1_transform, silc_sha1_context_len },
- { "md5", 16, 64, silc_md5_init, silc_md5_update, silc_md5_final,
+ { "md5", "1.2.840.113549.2.5",
+ 16, 64, silc_md5_init, silc_md5_update, silc_md5_final,
silc_md5_transform, silc_md5_context_len },
- { NULL, 0, 0, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, 0, 0, NULL, NULL, NULL, NULL, NULL }
};
-/* Registers a new hash function into the SILC. This function is used at
- the initialization of the SILC. */
+/* Registers a new hash function */
SilcBool silc_hash_register(const SilcHashObject *hash)
{
silc_free(new);
return FALSE;
}
+ new->oid = strdup(hash->oid);
+ if (!new->oid) {
+ silc_free(new);
+ return FALSE;
+ }
new->hash_len = hash->hash_len;
new->block_len = hash->block_len;
new->init = hash->init;
return TRUE;
}
-/* Unregister a hash function from the SILC. */
+/* Unregister a hash function */
SilcBool silc_hash_unregister(SilcHashObject *hash)
{
if (hash == SILC_ALL_HASH_FUNCTIONS || entry == hash) {
silc_dlist_del(silc_hash_list, entry);
silc_free(entry->name);
+ silc_free(entry->oid);
silc_free(entry);
if (silc_dlist_count(silc_hash_list) == 0) {
return FALSE;
}
-/* Function that registers all the default hash funcs (all builtin ones).
- The application may use this to register the default hash funcs if
- specific hash funcs in any specific order is not wanted. */
+/* Register default hash functions */
SilcBool silc_hash_register_default(void)
{
-#ifndef SILC_SYMBIAN
- int i;
-
- for (i = 0; silc_default_hash[i].name; i++)
- silc_hash_register(&(silc_default_hash[i]));
-
-#endif /* SILC_SYMBIAN */
+ /* We use builtin hash functions */
return TRUE;
}
+/* Unregister all hash functions */
+
SilcBool silc_hash_unregister_all(void)
{
#ifndef SILC_SYMBIAN
/* Allocates a new SilcHash object. New object is returned into new_hash
argument. */
-SilcBool silc_hash_alloc(const unsigned char *name, SilcHash *new_hash)
+SilcBool silc_hash_alloc(const char *name, SilcHash *new_hash)
{
SilcHashObject *entry = NULL;
+ int i;
- SILC_LOG_DEBUG(("Allocating new hash object"));
+ SILC_LOG_DEBUG(("Allocating new hash %s", name));
#ifndef SILC_SYMBIAN
+ /* Check list of registered hash functions */
if (silc_hash_list) {
silc_dlist_start(silc_hash_list);
while ((entry = silc_dlist_get(silc_hash_list)) != SILC_LIST_END) {
break;
}
}
-#else
- {
- /* On EPOC which don't have globals we check our constant hash list. */
- int i;
+#endif /* SILC_SYMBIAN */
+
+ if (!entry) {
+ /* Check builtin hash function list */
for (i = 0; silc_default_hash[i].name; i++) {
if (!strcmp(silc_default_hash[i].name, name)) {
entry = (SilcHashObject *)&(silc_default_hash[i]);
}
}
}
+
+ if (entry) {
+ *new_hash = silc_calloc(1, sizeof(**new_hash));
+ if (!(*new_hash))
+ return FALSE;
+ (*new_hash)->hash = entry;
+ (*new_hash)->context = silc_calloc(1, entry->context_len());
+ if (!(*new_hash)->context) {
+ silc_free(*new_hash);
+ return FALSE;
+ }
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
+/* Allocate hash by OID string */
+
+SilcBool silc_hash_alloc_by_oid(const char *oid, SilcHash *new_hash)
+{
+ SilcHashObject *entry = NULL;
+ int i;
+
+ SILC_LOG_DEBUG(("Allocating new hash %s", oid));
+
+#ifndef SILC_SYMBIAN
+ /* Check list of registered hash functions */
+ if (silc_hash_list) {
+ silc_dlist_start(silc_hash_list);
+ while ((entry = silc_dlist_get(silc_hash_list)) != SILC_LIST_END) {
+ if (!strcmp(entry->oid, oid))
+ break;
+ }
+ }
#endif /* SILC_SYMBIAN */
+ if (!entry) {
+ /* Check builtin hash function list */
+ for (i = 0; silc_default_hash[i].oid; i++) {
+ if (!strcmp(silc_default_hash[i].oid, oid)) {
+ entry = (SilcHashObject *)&(silc_default_hash[i]);
+ break;
+ }
+ }
+ }
+
if (entry) {
*new_hash = silc_calloc(1, sizeof(**new_hash));
if (!(*new_hash))
return hash->hash->name;
}
+/* Returns hash OID string */
+
+const char *silc_hash_get_oid(SilcHash hash)
+{
+ return hash->hash->oid;
+}
+
/* Returns TRUE if hash algorithm `name' is supported. */
-SilcBool silc_hash_is_supported(const unsigned char *name)
+SilcBool silc_hash_is_supported(const char *name)
{
-#ifndef SILC_SYMBIAN
SilcHashObject *entry;
+ int i;
+#ifndef SILC_SYMBIAN
if (silc_hash_list) {
silc_dlist_start(silc_hash_list);
while ((entry = silc_dlist_get(silc_hash_list)) != SILC_LIST_END) {
return TRUE;
}
}
-#else
- {
- int i;
- for (i = 0; silc_default_hash[i].name; i++)
- if (!strcmp(silc_default_hash[i].name, name))
- return TRUE;
- }
#endif /* SILC_SYMBIAN */
+
+ for (i = 0; silc_default_hash[i].name; i++)
+ if (!strcmp(silc_default_hash[i].name, name))
+ return TRUE;
+
return FALSE;
}
char *silc_hash_get_supported(void)
{
- SilcHashObject *entry;
+ SilcHashObject *entry, *entry2;
char *list = NULL;
- int len = 0;
+ int i, len = 0;
#ifndef SILC_SYMBIAN
if (silc_hash_list) {
len++;
}
}
-#else
- {
- int i;
- for (i = 0; silc_default_hash[i].name; i++) {
- entry = (SilcHashObject *)&(silc_default_hash[i]);
- len += strlen(entry->name);
- list = silc_realloc(list, len + 1);
+#endif /* SILC_SYMBIAN */
- memcpy(list + (len - strlen(entry->name)),
- entry->name, strlen(entry->name));
- memcpy(list + len, ",", 1);
- len++;
+ for (i = 0; silc_default_hash[i].name; i++) {
+ entry = (SilcHashObject *)&(silc_default_hash[i]);
+
+ if (silc_hash_list) {
+ silc_dlist_start(silc_hash_list);
+ while ((entry2 = silc_dlist_get(silc_hash_list)) != SILC_LIST_END) {
+ if (!strcmp(entry2->name, entry->name))
+ break;
+ }
+ if (entry2)
+ continue;
}
+
+ len += strlen(entry->name);
+ list = silc_realloc(list, len + 1);
+
+ memcpy(list + (len - strlen(entry->name)),
+ entry->name, strlen(entry->name));
+ memcpy(list + len, ",", 1);
+ len++;
}
-#endif /* SILC_SYMBIAN */
list[len - 1] = 0;
hash->hash->final(hash->context, return_hash);
}
-void silc_hash_transform(SilcHash hash, SilcUInt32 *state,
+void silc_hash_transform(SilcHash hash, void *state,
const unsigned char *data)
{
hash->hash->transform(state, data);
projects / silc.git / blobdiff