Mercurial > dropbear
changeset 194:e972be139cb5
Switching to libtomcrypt 1.02
(still has problems)
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Mon, 09 May 2005 09:32:33 +0000 |
| parents | ca6a7c7a925c |
| children | a6eb598d8686 |
| files | algo.h common-algo.c includes.h packet.c |
| diffstat | 4 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/algo.h Mon May 09 09:31:49 2005 +0000 +++ b/algo.h Mon May 09 09:32:33 2005 +0000 @@ -51,13 +51,13 @@ extern const struct dropbear_hash dropbear_nohash; struct dropbear_cipher { - const struct _cipher_descriptor *cipherdesc; + const struct ltc_cipher_descriptor *cipherdesc; unsigned long keysize; unsigned char blocksize; }; struct dropbear_hash { - const struct _hash_descriptor *hashdesc; + const struct ltc_hash_descriptor *hashdesc; unsigned long keysize; unsigned char hashsize; };
--- a/common-algo.c Mon May 09 09:31:49 2005 +0000 +++ b/common-algo.c Mon May 09 09:32:33 2005 +0000 @@ -125,7 +125,7 @@ * This should be run before using any of the ciphers/hashes */ void crypto_init() { - const struct _cipher_descriptor *regciphers[] = { + const struct ltc_cipher_descriptor *regciphers[] = { #ifdef DROPBEAR_AES128_CBC &aes_desc, #endif @@ -141,7 +141,7 @@ NULL }; - const struct _hash_descriptor *reghashes[] = { + const struct ltc_hash_descriptor *reghashes[] = { /* we need sha1 for hostkey stuff regardless */ &sha1_desc, #ifdef DROPBEAR_MD5_HMAC
--- a/includes.h Mon May 09 09:31:49 2005 +0000 +++ b/includes.h Mon May 09 09:32:33 2005 +0000 @@ -111,7 +111,7 @@ #include <libgen.h> #endif -#include "libtomcrypt/mycrypt.h" +#include "libtomcrypt/src/headers/tomcrypt.h" #include "libtommath/tommath.h" #include "compat.h"
--- a/packet.c Mon May 09 09:31:49 2005 +0000 +++ b/packet.c Mon May 09 09:32:33 2005 +0000 @@ -201,6 +201,7 @@ /* decrypt it */ if (cbc_decrypt(buf_getptr(ses.readbuf, blocksize), buf_getwriteptr(ses.decryptreadbuf,blocksize), + blocksize, &ses.keys->recv_symmetric_struct) != CRYPT_OK) { dropbear_exit("error decrypting"); } @@ -254,6 +255,7 @@ while (ses.readbuf->pos < ses.readbuf->len - macsize) { if (cbc_decrypt(buf_getptr(ses.readbuf, blocksize), buf_getwriteptr(ses.decryptreadbuf, blocksize), + blocksize, &ses.keys->recv_symmetric_struct) != CRYPT_OK) { dropbear_exit("error decrypting"); } @@ -491,6 +493,7 @@ while (clearwritebuf->pos < clearwritebuf->len) { if (cbc_encrypt(buf_getptr(clearwritebuf, blocksize), buf_getwriteptr(writebuf, blocksize), + blocksize, &ses.keys->trans_symmetric_struct) != CRYPT_OK) { dropbear_exit("error encrypting"); }