X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilccrypt%2Fsilccipher.c;h=f7f64600b34633fc788f756d59dfffab5061f143;hb=52e57c880aba9c5e89f59d962eb9af75670b76e0;hp=0aea2dc099f136b3db8332f1e0500be589ebf487;hpb=67e6fb70f9a874ccf467529371cd819779b35214;p=silc.git diff --git a/lib/silccrypt/silccipher.c b/lib/silccrypt/silccipher.c index 0aea2dc0..f7f64600 100644 --- a/lib/silccrypt/silccipher.c +++ b/lib/silccrypt/silccipher.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - 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 @@ -28,16 +28,16 @@ struct SilcCipherStruct { 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[] = @@ -60,12 +60,6 @@ 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 */ @@ -79,7 +73,7 @@ const SilcCipherObject silc_default_ciphers[] = SilcBool silc_cipher_register(const SilcCipherObject *cipher) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcCipherObject *new; SILC_LOG_DEBUG(("Registering new cipher `%s'", cipher->name)); @@ -95,11 +89,18 @@ SilcBool silc_cipher_register(const SilcCipherObject *cipher) } 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; @@ -110,7 +111,7 @@ SilcBool silc_cipher_register(const SilcCipherObject *cipher) silc_cipher_list = silc_dlist_init(); silc_dlist_add(silc_cipher_list, new); -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return TRUE; } @@ -118,7 +119,7 @@ SilcBool silc_cipher_register(const SilcCipherObject *cipher) SilcBool silc_cipher_unregister(SilcCipherObject *cipher) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcCipherObject *entry; SILC_LOG_DEBUG(("Unregistering cipher")); @@ -142,7 +143,7 @@ SilcBool silc_cipher_unregister(SilcCipherObject *cipher) } } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return FALSE; } @@ -152,19 +153,19 @@ SilcBool silc_cipher_unregister(SilcCipherObject *cipher) 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) @@ -176,7 +177,7 @@ SilcBool silc_cipher_unregister_all(void) if (!silc_cipher_list) break; } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return TRUE; } @@ -191,7 +192,7 @@ SilcBool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) 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) { @@ -210,12 +211,18 @@ SilcBool silc_cipher_alloc(const unsigned char *name, SilcCipher *new_cipher) } } } -#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; } @@ -236,7 +243,7 @@ void silc_cipher_free(SilcCipher cipher) SilcBool silc_cipher_is_supported(const unsigned char *name) { -#ifndef SILC_EPOC +#ifndef SILC_SYMBIAN SilcCipherObject *entry; if (silc_cipher_list) { @@ -253,7 +260,7 @@ SilcBool silc_cipher_is_supported(const unsigned char *name) if (!strcmp(silc_default_ciphers[i].name, name)) return TRUE; } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ return FALSE; } @@ -265,7 +272,7 @@ char *silc_cipher_get_supported(void) 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) { @@ -292,7 +299,7 @@ char *silc_cipher_get_supported(void) len++; } } -#endif /* SILC_EPOC */ +#endif /* SILC_SYMBIAN */ list[len - 1] = 0; @@ -331,7 +338,9 @@ SilcBool silc_cipher_set_key(SilcCipher cipher, const unsigned char *key, 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. */