projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SILC Thread Queue API
[silc.git]
/
lib
/
silccrypt
/
silchmac.c
diff --git
a/lib/silccrypt/silchmac.c
b/lib/silccrypt/silchmac.c
index 1e9380dbfd1e9a57c1bd26ccca21fcbaab823972..86754f230c977682c5ce2547ec94c94f25586d39 100644
(file)
--- a/
lib/silccrypt/silchmac.c
+++ b/
lib/silccrypt/silchmac.c
@@
-4,7
+4,7
@@
Author: Pekka Riikonen <priikone@silcnet.org>
Author: Pekka Riikonen <priikone@silcnet.org>
- Copyright (C) 1999 - 200
6
Pekka Riikonen
+ Copyright (C) 1999 - 200
7
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
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
@@
-40,9
+40,11
@@
SilcDList silc_hmac_list = NULL;
const SilcHmacObject silc_default_hmacs[] =
{
{ "hmac-sha256-96", 12 },
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-sha1-96", 12 },
{ "hmac-md5-96", 12 },
{ "hmac-sha256", 32 },
+ { "hmac-sha512", 64 },
{ "hmac-sha1", 20 },
{ "hmac-md5", 16 },
{ "hmac-sha1", 20 },
{ "hmac-md5", 16 },
@@
-81,8
+83,7
@@
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)
{
SilcBool silc_hmac_register(const SilcHmacObject *hmac)
{
@@
-116,7
+117,7
@@
SilcBool silc_hmac_register(const SilcHmacObject *hmac)
return TRUE;
}
return TRUE;
}
-/* Unregister a HMAC
from the SILC.
*/
+/* Unregister a HMAC */
SilcBool silc_hmac_unregister(SilcHmacObject *hmac)
{
SilcBool silc_hmac_unregister(SilcHmacObject *hmac)
{
@@
-148,22
+149,16
@@
SilcBool silc_hmac_unregister(SilcHmacObject *hmac)
return FALSE;
}
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)
{
SilcBool silc_hmac_register_default(void)
{
-#ifndef SILC_SYMBIAN
- int i;
-
- for (i = 0; silc_default_hmacs[i].name; i++)
- silc_hmac_register(&(silc_default_hmacs[i]));
-
-#endif /* SILC_SYMBIAN */
+ /* We use builtin HMACs */
return TRUE;
}
return TRUE;
}
+/* Unregister all HMACs */
+
SilcBool silc_hmac_unregister_all(void)
{
#ifndef SILC_SYMBIAN
SilcBool silc_hmac_unregister_all(void)
{
#ifndef SILC_SYMBIAN
@@
-189,6
+184,9
@@
SilcBool silc_hmac_unregister_all(void)
SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac)
{
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 */
SILC_LOG_DEBUG(("Allocating new HMAC"));
/* Allocate the new object */
@@
-219,8
+217,8
@@
SilcBool silc_hmac_alloc(const char *name, SilcHash hash, SilcHmac *new_hmac)
(*new_hmac)->hash = hash;
#ifndef SILC_SYMBIAN
(*new_hmac)->hash = hash;
#ifndef SILC_SYMBIAN
+ /* Check registered list of HMACs */
if (silc_hmac_list) {
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)) {
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)
}
}
}
}
}
}
-#e
lse
- {
- /* On EPOC which don't have globals we check our constant hash list. */
- int i;
+#e
ndif /* 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]);
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_SYMBIAN */
silc_free(*new_hmac);
*new_hmac = NULL;
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)
{
SilcBool silc_hmac_is_supported(const char *name)
{
-#ifndef SILC_SYMBIAN
SilcHmacObject *entry;
SilcHmacObject *entry;
+ int i;
if (!name)
return FALSE;
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) {
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;
}
}
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_SYMBIAN */
#endif /* SILC_SYMBIAN */
+
+ for (i = 0; silc_default_hmacs[i].name; i++)
+ if (!strcmp(silc_default_hmacs[i].name, name))
+ return TRUE;
+
return FALSE;
}
return FALSE;
}
@@
-317,9
+313,9
@@
SilcBool silc_hmac_is_supported(const char *name)
char *silc_hmac_get_supported()
{
char *silc_hmac_get_supported()
{
- SilcHmacObject *entry;
+ SilcHmacObject *entry
, *entry2
;
char *list = NULL;
char *list = NULL;
- int len = 0;
+ int len = 0
, i
;
#ifndef SILC_SYMBIAN
if (silc_hmac_list) {
#ifndef SILC_SYMBIAN
if (silc_hmac_list) {
@@
-334,21
+330,30
@@
char *silc_hmac_get_supported()
len++;
}
}
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_SYMBIAN */
list[len - 1] = 0;
list[len - 1] = 0;