X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilchmac.c;h=86754f230c977682c5ce2547ec94c94f25586d39;hb=e7b6c157b80152bf9fb9266e6bdd93f9fb0db776;hp=8b81dfc311a19089400267abd1cce510587abadf;hpb=ac6e8a218587071df78ada0dc415b3098fdec0d2;p=silc.git diff --git a/lib/silccrypt/silchmac.c b/lib/silccrypt/silchmac.c index 8b81dfc3..86754f23 100644 --- a/lib/silccrypt/silchmac.c +++ b/lib/silccrypt/silchmac.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 1999 - 2006 Pekka Riikonen + Copyright (C) 1999 - 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 @@ -31,18 +31,20 @@ struct SilcHmacStruct { unsigned int allocated_hash : 1; /* TRUE if the hash was allocated */ }; -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN /* List of dynamically registered HMACs. */ SilcDList silc_hmac_list = NULL; -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ /* Default hmacs for silc_hmac_register_default(). */ const SilcHmacObject silc_default_hmacs[] = { { "hmac-sha256-96", 12 }, + { "hmac-sha512-96", 12 }, { "hmac-sha1-96", 12 }, { "hmac-md5-96", 12 }, { "hmac-sha256", 32 }, + { "hmac-sha512", 64 }, { "hmac-sha1", 20 }, { "hmac-md5", 16 }, @@ -81,12 +83,11 @@ static void silc_hmac_init_internal(SilcHmac hmac, unsigned char *key, } } -/* Registers a new HMAC into the SILC. This function is used at the - initialization of the SILC. */ +/* Registers a new HMAC */ SilcBool silc_hmac_register(const SilcHmacObject *hmac) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcHmacObject *new; SILC_LOG_DEBUG(("Registering new HMAC `%s'", hmac->name)); @@ -112,15 +113,15 @@ SilcBool silc_hmac_register(const SilcHmacObject *hmac) silc_hmac_list = silc_dlist_init(); silc_dlist_add(silc_hmac_list, new); -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return TRUE; } -/* Unregister a HMAC from the SILC. */ +/* Unregister a HMAC */ SilcBool silc_hmac_unregister(SilcHmacObject *hmac) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcHmacObject *entry; SILC_LOG_DEBUG(("Unregistering HMAC")); @@ -144,29 +145,23 @@ SilcBool silc_hmac_unregister(SilcHmacObject *hmac) } } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return FALSE; } -/* Function that registers all the default hmacs (all builtin ones). - The application may use this to register the default hmacs if - specific hmacs in any specific order is not wanted. */ +/* Register default HMACs */ SilcBool silc_hmac_register_default(void) { -#ifndef SILC_EPOC - int i; - - for (i = 0; silc_default_hmacs[i].name; i++) - silc_hmac_register(&(silc_default_hmacs[i])); - -#endif /* SILC_EPOC */ + /* We use builtin HMACs */ return TRUE; } +/* Unregister all HMACs */ + SilcBool silc_hmac_unregister_all(void) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcHmacObject *entry; if (!silc_hmac_list) @@ -178,7 +173,7 @@ SilcBool silc_hmac_unregister_all(void) if (!silc_hmac_list) break; } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return TRUE; } @@ -189,6 +184,9 @@ SilcBool silc_hmac_unregister_all(void) SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) { + SilcHmacObject *entry = NULL; + int i; + SILC_LOG_DEBUG(("Allocating new HMAC")); /* Allocate the new object */ @@ -218,9 +216,9 @@ SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) (*new_hmac)->hash = hash; -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN + /* Check registered list of HMACs */ if (silc_hmac_list) { - SilcHmacObject *entry; silc_dlist_start(silc_hmac_list); while ((entry = silc_dlist_get(silc_hmac_list)) != SILC_LIST_END) { if (!strcmp(entry->name, name)) { @@ -229,10 +227,10 @@ SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) } } } -#else - { - /* On EPOC which don't have globals we check our constant hash list. */ - int i; +#endif /* SILC_SYMBIAN */ + + if (!entry) { + /* Check builtin list of HMACs */ for (i = 0; silc_default_hmacs[i].name; i++) { if (!strcmp(silc_default_hmacs[i].name, name)) { (*new_hmac)->hmac = (SilcHmacObject *)&(silc_default_hmacs[i]); @@ -240,7 +238,6 @@ SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac) } } } -#endif /* SILC_EPOC */ silc_free(*new_hmac); *new_hmac = NULL; @@ -289,12 +286,13 @@ const char *silc_hmac_get_name(SilcHmac hmac) SilcBool silc_hmac_is_supported(const char *name) { -#ifndef SILC_EPOC SilcHmacObject *entry; + int i; if (!name) return FALSE; +#ifndef SILC_SYMBIAN if (silc_hmac_list) { silc_dlist_start(silc_hmac_list); while ((entry = silc_dlist_get(silc_hmac_list)) != SILC_LIST_END) { @@ -302,14 +300,12 @@ SilcBool silc_hmac_is_supported(const char *name) return TRUE; } } -#else - { - int i; - for (i = 0; silc_default_hmacs[i].name; i++) - if (!strcmp(silc_default_hmacs[i].name, name)) - return TRUE; - } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ + + for (i = 0; silc_default_hmacs[i].name; i++) + if (!strcmp(silc_default_hmacs[i].name, name)) + return TRUE; + return FALSE; } @@ -317,11 +313,11 @@ SilcBool silc_hmac_is_supported(const char *name) char *silc_hmac_get_supported() { - SilcHmacObject *entry; + SilcHmacObject *entry, *entry2; char *list = NULL; - int len = 0; + int len = 0, i; -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN if (silc_hmac_list) { silc_dlist_start(silc_hmac_list); while ((entry = silc_dlist_get(silc_hmac_list)) != SILC_LIST_END) { @@ -334,21 +330,30 @@ char *silc_hmac_get_supported() len++; } } -#else - { - int i; - for (i = 0; silc_default_hmacs[i].name; i++) { - entry = (SilcHmacObject *)&(silc_default_hmacs[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_hmacs[i].name; i++) { + entry = (SilcHmacObject *)&(silc_default_hmacs[i]); + + if (silc_hmac_list) { + silc_dlist_start(silc_hmac_list); + while ((entry2 = silc_dlist_get(silc_hmac_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_EPOC */ list[len - 1] = 0;