X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilccipher.c;h=53c938b69a17e475d44ba9f7392bf993911a99ea;hp=fea377743ace559b038e2c6adf0f8e56d6baeb9a;hb=382d15d447b7a95390decfa783836ae4fe255b3d;hpb=fb8dbc2d9cd7ff5d197654f873ac18aa6ef9c5e3 diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index fea37774..53c938b6 100644 --- a/lib/silccrypt/silccipher.c +++ b/lib/silccrypt/silccipher.c @@ -20,14 +20,22 @@ /* $Id$ */ #include "silcincludes.h" - #include "ciphers.h" /* Includes cipher definitions */ +/* The SilcCipher context */ +struct SilcCipherStruct { + SilcCipherObject *cipher; + void *context; + unsigned char iv[SILC_CIPHER_MAX_IV_SIZE]; +}; + +#ifndef SILC_EPOC /* Dynamically registered list of ciphers. */ SilcDList silc_cipher_list = NULL; +#endif /* SILC_EPOC */ /* Static list of ciphers for silc_cipher_register_default(). */ -SilcCipherObject silc_default_ciphers[] = +const SilcCipherObject silc_default_ciphers[] = { { "aes-256-cbc", 16, 256, silc_aes_set_key, silc_aes_set_key_with_string, silc_aes_encrypt_cbc, @@ -59,15 +67,15 @@ SilcCipherObject silc_default_ciphers[] = { "rc6-128-cbc", 16, 128, silc_rc6_set_key, silc_rc6_set_key_with_string, silc_rc6_encrypt_cbc, silc_rc6_decrypt_cbc, silc_rc6_context_len }, - { "mars-256-cbc", 16, 256, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_context_len }, - { "mars-192-cbc", 16, 192, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_context_len }, - { "mars-128-cbc", 16, 128, silc_mars_set_key, silc_mars_set_key_with_string, - silc_mars_encrypt_cbc, silc_mars_decrypt_cbc, - silc_mars_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 }, { "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 }, @@ -80,12 +88,23 @@ SilcCipherObject silc_default_ciphers[] = registered. Therefore, if memory has been allocated for the object sent as argument it has to be free'd after this function returns succesfully. */ -bool silc_cipher_register(SilcCipherObject *cipher) +bool silc_cipher_register(const SilcCipherObject *cipher) { +#ifndef SILC_EPOC SilcCipherObject *new; SILC_LOG_DEBUG(("Registering new cipher `%s'", cipher->name)); + /* Check if exists already */ + if (silc_cipher_list) { + SilcCipherObject *entry; + silc_dlist_start(silc_cipher_list); + while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { + if (!strcmp(entry->name, cipher->name)) + return FALSE; + } + } + new = silc_calloc(1, sizeof(*new)); new->name = strdup(cipher->name); new->block_len = cipher->block_len; @@ -101,6 +120,7 @@ bool silc_cipher_register(SilcCipherObject *cipher) silc_cipher_list = silc_dlist_init(); silc_dlist_add(silc_cipher_list, new); +#endif /* SILC_EPOC */ return TRUE; } @@ -108,6 +128,7 @@ bool silc_cipher_register(SilcCipherObject *cipher) bool silc_cipher_unregister(SilcCipherObject *cipher) { +#ifndef SILC_EPOC SilcCipherObject *entry; SILC_LOG_DEBUG(("Unregistering cipher")); @@ -119,6 +140,8 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { if (cipher == SILC_ALL_CIPHERS || entry == cipher) { silc_dlist_del(silc_cipher_list, entry); + silc_free(entry->name); + silc_free(entry); if (silc_dlist_count(silc_cipher_list) == 0) { silc_dlist_uninit(silc_cipher_list); @@ -129,6 +152,7 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) } } +#endif /* SILC_EPOC */ return FALSE; } @@ -138,11 +162,31 @@ bool silc_cipher_unregister(SilcCipherObject *cipher) bool silc_cipher_register_default(void) { +#ifndef SILC_EPOC int i; for (i = 0; silc_default_ciphers[i].name; i++) silc_cipher_register(&(silc_default_ciphers[i])); +#endif /* SILC_EPOC */ + return TRUE; +} + +bool silc_cipher_unregister_all(void) +{ +#ifndef SILC_EPOC + SilcCipherObject *entry; + + if (!silc_cipher_list) + return FALSE; + + silc_dlist_start(silc_cipher_list); + while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { + silc_cipher_unregister(entry); + if (!silc_cipher_list) + break; + } +#endif /* SILC_EPOC */ return TRUE; } @@ -153,25 +197,37 @@ bool silc_cipher_register_default(void) bool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) { - SilcCipherObject *entry; + SilcCipherObject *entry = NULL; SILC_LOG_DEBUG(("Allocating new cipher object")); +#ifndef SILC_EPOC if (silc_cipher_list) { silc_dlist_start(silc_cipher_list); while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { - if (!strcmp(entry->name, name)) { - *new_cipher = silc_calloc(1, sizeof(**new_cipher)); - (*new_cipher)->cipher = entry; - (*new_cipher)->context = silc_calloc(1, entry->context_len()); - (*new_cipher)->set_iv = silc_cipher_set_iv; - (*new_cipher)->get_iv = silc_cipher_get_iv; - (*new_cipher)->get_key_len = silc_cipher_get_key_len; - (*new_cipher)->get_block_len = silc_cipher_get_block_len; - return TRUE; + if (!strcmp(entry->name, name)) + break; + } + } +#else + { + /* On EPOC which don't have globals we check our constant cipher list. */ + int i; + for (i = 0; silc_default_ciphers[i].name; i++) { + if (!strcmp(silc_default_ciphers[i].name, name)) { + entry = (SilcCipherObject *)&(silc_default_ciphers[i]); + break; } } } +#endif /* SILC_EPOC */ + + if (entry) { + *new_cipher = silc_calloc(1, sizeof(**new_cipher)); + (*new_cipher)->cipher = entry; + (*new_cipher)->context = silc_calloc(1, entry->context_len()); + return TRUE; + } return FALSE; } @@ -190,6 +246,7 @@ void silc_cipher_free(SilcCipher cipher) bool silc_cipher_is_supported(const unsigned char *name) { +#ifndef SILC_EPOC SilcCipherObject *entry; if (silc_cipher_list) { @@ -199,7 +256,14 @@ bool silc_cipher_is_supported(const unsigned char *name) return TRUE; } } - +#else + { + int i; + for (i = 0; silc_default_ciphers[i].name; i++) + if (!strcmp(silc_default_ciphers[i].name, name)) + return TRUE; + } +#endif /* SILC_EPOC */ return FALSE; } @@ -209,9 +273,9 @@ char *silc_cipher_get_supported(void) { SilcCipherObject *entry; char *list = NULL; - int len; + int len = 0; - len = 0; +#ifndef SILC_EPOC if (silc_cipher_list) { silc_dlist_start(silc_cipher_list); while ((entry = silc_dlist_get(silc_cipher_list)) != SILC_LIST_END) { @@ -224,6 +288,21 @@ char *silc_cipher_get_supported(void) len++; } } +#else + { + int i; + for (i = 0; silc_default_ciphers[i].name; i++) { + entry = (SilcCipherObject *)&(silc_default_ciphers[i]); + 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; @@ -233,25 +312,37 @@ char *silc_cipher_get_supported(void) /* Encrypts */ bool silc_cipher_encrypt(SilcCipher cipher, const unsigned char *src, - unsigned char *dst, uint32 len, + unsigned char *dst, SilcUInt32 len, unsigned char *iv) { - return cipher->cipher->encrypt(cipher->context, src, dst, len, 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); } /* Decrypts */ bool silc_cipher_decrypt(SilcCipher cipher, const unsigned char *src, - unsigned char *dst, uint32 len, + unsigned char *dst, SilcUInt32 len, unsigned char *iv) { - return cipher->cipher->decrypt(cipher->context, src, dst, len, 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 */ bool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, - uint32 keylen) + SilcUInt32 keylen) { return cipher->cipher->set_key(cipher->context, key, keylen); } @@ -264,24 +355,30 @@ void silc_cipher_set_iv(SilcCipher cipher, const unsigned char *iv) memcpy(&cipher->iv, iv, cipher->cipher->block_len); } -/* Returns the IV (initial vector) of the cipher. The IV is returned - to 'iv' argument. */ +/* Returns the IV (initial vector) of the cipher. */ -void silc_cipher_get_iv(SilcCipher cipher, unsigned char *iv) +unsigned char *silc_cipher_get_iv(SilcCipher cipher) { - memcpy(iv, &cipher->iv, cipher->cipher->block_len); + return cipher->iv; } /* Returns the key length of the cipher. */ -uint32 silc_cipher_get_key_len(SilcCipher cipher) +SilcUInt32 silc_cipher_get_key_len(SilcCipher cipher) { return cipher->cipher->key_len; } /* Returns the block size of the cipher. */ -uint32 silc_cipher_get_block_len(SilcCipher cipher) +SilcUInt32 silc_cipher_get_block_len(SilcCipher cipher) { return cipher->cipher->block_len; } + +/* Returns the name of the cipher */ + +const char *silc_cipher_get_name(SilcCipher cipher) +{ + return (const char *)cipher->cipher->name; +}