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
unsigned char iv[SILC_CIPHER_MAX_IV_SIZE];
};
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
/* Dynamically registered list of ciphers. */
SilcDList silc_cipher_list = NULL;
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
/* Macro to define cipher to cipher list */
#define SILC_CIPHER_API_DEF(name, cipher, keylen, blocklen, ivlen, mode) \
-{ name, silc_##cipher##_set_key, silc_##cipher##_encrypt, \
- silc_##cipher##_decrypt, silc_##cipher##_context_len, \
- keylen, blocklen, ivlen, mode }
+{ name, silc_##cipher##_set_key, silc_##cipher##_set_iv, \
+ silc_##cipher##_encrypt, silc_##cipher##_decrypt, \
+ silc_##cipher##_context_len, keylen, blocklen, ivlen, mode }
/* Static list of ciphers for silc_cipher_register_default(). */
const SilcCipherObject silc_default_ciphers[] =
SILC_CIPHER_MODE_CBC),
SILC_CIPHER_API_DEF("twofish-128-cbc", twofish_cbc, 128, 16, 16,
SILC_CIPHER_MODE_CBC),
- SILC_CIPHER_API_DEF("cast-256-cbc", cast_cbc, 256, 16, 16,
- SILC_CIPHER_MODE_CBC),
- SILC_CIPHER_API_DEF("cast-192-cbc", cast_cbc, 192, 16, 16,
- SILC_CIPHER_MODE_CBC),
- SILC_CIPHER_API_DEF("cast-128-cbc", cast_cbc, 128, 16, 16,
- SILC_CIPHER_MODE_CBC),
#ifdef SILC_DEBUG
SILC_CIPHER_API_DEF("none", none, 0, 0, 0, 0),
#endif /* SILC_DEBUG */
SilcBool silc_cipher_register(const SilcCipherObject *cipher)
{
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
SilcCipherObject *new;
SILC_LOG_DEBUG(("Registering new cipher `%s'", cipher->name));
}
new = silc_calloc(1, sizeof(*new));
+ if (!new)
+ return FALSE;
new->name = strdup(cipher->name);
+ if (!new->name) {
+ silc_free(new);
+ return FALSE;
+ }
new->key_len = cipher->key_len;
new->block_len = cipher->block_len;
new->iv_len = cipher->iv_len;
new->set_key = cipher->set_key;
+ new->set_iv = cipher->set_iv;
new->encrypt = cipher->encrypt;
new->decrypt = cipher->decrypt;
new->context_len = cipher->context_len;
silc_cipher_list = silc_dlist_init();
silc_dlist_add(silc_cipher_list, new);
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
return TRUE;
}
SilcBool silc_cipher_unregister(SilcCipherObject *cipher)
{
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
SilcCipherObject *entry;
SILC_LOG_DEBUG(("Unregistering cipher"));
}
}
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
return FALSE;
}
SilcBool silc_cipher_register_default(void)
{
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
int i;
for (i = 0; silc_default_ciphers[i].name; i++)
silc_cipher_register(&(silc_default_ciphers[i]));
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
return TRUE;
}
SilcBool silc_cipher_unregister_all(void)
{
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
SilcCipherObject *entry;
if (!silc_cipher_list)
if (!silc_cipher_list)
break;
}
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
return TRUE;
}
SILC_LOG_DEBUG(("Allocating new cipher object"));
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
if (silc_cipher_list) {
silc_dlist_start(silc_cipher_list);
while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) {
}
}
}
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
if (entry) {
*new_cipher = silc_calloc(1, sizeof(**new_cipher));
+ if (!(*new_cipher))
+ return FALSE;
(*new_cipher)->cipher = entry;
(*new_cipher)->context = silc_calloc(1, entry->context_len());
+ if (!(*new_cipher)->context) {
+ silc_free(*new_cipher);
+ return FALSE;
+ }
return TRUE;
}
SilcBool silc_cipher_is_supported(const unsigned char *name)
{
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
SilcCipherObject *entry;
if (silc_cipher_list) {
if (!strcmp(silc_default_ciphers[i].name, name))
return TRUE;
}
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
return FALSE;
}
char *list = NULL;
int len = 0;
-#ifndef SILC_EPOC
+#ifndef SILC_SYMBIAN
if (silc_cipher_list) {
silc_dlist_start(silc_cipher_list);
while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) {
len++;
}
}
-#endif /* SILC_EPOC */
+#endif /* SILC_SYMBIAN */
list[len - 1] = 0;
void silc_cipher_set_iv(SilcCipher cipher, const unsigned char *iv)
{
- memcpy(&cipher->iv, iv, cipher->cipher->iv_len);
+ if (iv)
+ memmove(&cipher->iv, iv, cipher->cipher->iv_len);
+ cipher->cipher->set_iv(cipher->context, iv);
}
/* Returns the IV (initial vector) of the cipher. */