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##_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[] =
{
- { "aes-256-cbc", 16, 256, silc_aes_set_key,
- silc_aes_set_key_with_string, silc_aes_encrypt_cbc,
- silc_aes_decrypt_cbc, silc_aes_context_len },
- { "aes-192-cbc", 16, 192, silc_aes_set_key,
- silc_aes_set_key_with_string, silc_aes_encrypt_cbc,
- silc_aes_decrypt_cbc, silc_aes_context_len },
- { "aes-128-cbc", 16, 128, silc_aes_set_key,
- silc_aes_set_key_with_string, silc_aes_encrypt_cbc,
- silc_aes_decrypt_cbc, silc_aes_context_len },
- { "twofish-256-cbc", 16, 256, silc_twofish_set_key,
- silc_twofish_set_key_with_string,
- silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc,
- silc_twofish_context_len },
- { "twofish-192-cbc", 16, 192, silc_twofish_set_key,
- silc_twofish_set_key_with_string,
- silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc,
- silc_twofish_context_len },
- { "twofish-128-cbc", 16, 128, silc_twofish_set_key,
- silc_twofish_set_key_with_string,
- silc_twofish_encrypt_cbc, silc_twofish_decrypt_cbc,
- silc_twofish_context_len },
- { "cast-256-cbc", 16, 256, silc_cast_set_key, silc_cast_set_key_with_string,
- silc_cast_encrypt_cbc, silc_cast_decrypt_cbc,
- silc_cast_context_len },
- { "cast-192-cbc", 16, 192, silc_cast_set_key, silc_cast_set_key_with_string,
- silc_cast_encrypt_cbc, silc_cast_decrypt_cbc,
- silc_cast_context_len },
- { "cast-128-cbc", 16, 128, silc_cast_set_key, silc_cast_set_key_with_string,
- silc_cast_encrypt_cbc, silc_cast_decrypt_cbc,
- silc_cast_context_len },
+ SILC_CIPHER_API_DEF("aes-256-ctr", aes_ctr, 256, 16, 16,
+ SILC_CIPHER_MODE_CTR),
+ SILC_CIPHER_API_DEF("aes-192-ctr", aes_ctr, 192, 16, 16,
+ SILC_CIPHER_MODE_CTR),
+ SILC_CIPHER_API_DEF("aes-128-ctr", aes_ctr, 128, 16, 16,
+ SILC_CIPHER_MODE_CTR),
+ SILC_CIPHER_API_DEF("aes-256-cbc", aes_cbc, 256, 16, 16,
+ SILC_CIPHER_MODE_CBC),
+ SILC_CIPHER_API_DEF("aes-192-cbc", aes_cbc, 192, 16, 16,
+ SILC_CIPHER_MODE_CBC),
+ SILC_CIPHER_API_DEF("aes-128-cbc", aes_cbc, 128, 16, 16,
+ SILC_CIPHER_MODE_CBC),
+ SILC_CIPHER_API_DEF("twofish-256-cbc", twofish_cbc, 256, 16, 16,
+ SILC_CIPHER_MODE_CBC),
+ SILC_CIPHER_API_DEF("twofish-192-cbc", twofish_cbc, 192, 16, 16,
+ SILC_CIPHER_MODE_CBC),
+ SILC_CIPHER_API_DEF("twofish-128-cbc", twofish_cbc, 128, 16, 16,
+ SILC_CIPHER_MODE_CBC),
#ifdef SILC_DEBUG
- { "none", 0, 0, silc_none_set_key, silc_none_set_key_with_string,
- silc_none_encrypt_cbc, silc_none_decrypt_cbc,
- silc_none_context_len },
+ SILC_CIPHER_API_DEF("none", none, 0, 0, 0, 0),
#endif /* SILC_DEBUG */
-
- { NULL, 0, 0, NULL, NULL, NULL, NULL, NULL }
+ { NULL, NULL, 0, 0, 0, 0 }
};
/* Register a new cipher into SILC. This is used at the initialization of
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);
- new->block_len = cipher->block_len;
+ 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_key_with_string = cipher->set_key_with_string;
+ new->set_iv = cipher->set_iv;
new->encrypt = cipher->encrypt;
new->decrypt = cipher->decrypt;
new->context_len = cipher->context_len;
+ new->mode = cipher->mode;
/* Add to list */
if (silc_cipher_list == NULL)
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;
unsigned char *dst, SilcUInt32 len,
unsigned char *iv)
{
-#ifdef SILC_DEBUG
- assert((len & (cipher->cipher->block_len - 1)) == 0);
-#endif
- if (len & (cipher->cipher->block_len - 1))
- return FALSE;
return cipher->cipher->encrypt(cipher->context, src, dst, len,
iv ? iv : cipher->iv);
}
unsigned char *dst, SilcUInt32 len,
unsigned char *iv)
{
-#ifdef SILC_DEBUG
- /* assert((len & (cipher->cipher->block_len - 1)) == 0); */
-#endif
- if (len & (cipher->cipher->block_len - 1))
- return FALSE;
return cipher->cipher->decrypt(cipher->context, src, dst, len,
iv ? iv : cipher->iv);
}
/* Sets the key for the cipher */
SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key,
- SilcUInt32 keylen)
+ SilcUInt32 keylen, SilcBool encryption)
{
- return cipher->cipher->set_key(cipher->context, key, keylen);
+ return cipher->cipher->set_key(cipher->context, key, keylen, encryption);
}
/* Sets the IV (initial vector) for the cipher. */
void silc_cipher_set_iv(SilcCipher cipher, const unsigned char *iv)
{
- memset(&cipher->iv, 0, sizeof(cipher->iv));
- memcpy(&cipher->iv, iv, cipher->cipher->block_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. */
return cipher->cipher->block_len;
}
+/* Returns the IV length of the cipher. */
+
+SilcUInt32 silc_cipher_get_iv_len(SilcCipher cipher)
+{
+ return cipher->cipher->iv_len;
+}
+
/* Returns the name of the cipher */
const char *silc_cipher_get_name(SilcCipher cipher)
{
return (const char *)cipher->cipher->name;
}
+
+/* Returns cipher mode */
+
+SilcCipherMode silc_cipher_get_mode(SilcCipher cipher)
+{
+ return cipher->cipher->mode;
+}
projects / silc.git / blobdiff