From 7b403dc57f0309360e6e431f2bf415cc8100024e Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Mon, 9 May 2005 09:32:33 +0000
Subject: [PATCH] Switching to libtomcrypt 1.02 (still has problems)
--HG--
extra : convert_revision : 4dfd70544ed9a766876ddda9f6ac3f26054eb3db
---
algo.h | 4 ++--
common-algo.c | 4 ++--
includes.h | 2 +-
packet.c | 3 +++
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/algo.h b/algo.h
index 3e8ebb55..5ed01cc7 100644
--- a/algo.h
+++ b/algo.h
@@ -51,13 +51,13 @@ extern const struct dropbear_cipher dropbear_nocipher;
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;
};
diff --git a/common-algo.c b/common-algo.c
index 1975864e..ea9c3114 100644
--- a/common-algo.c
+++ b/common-algo.c
@@ -125,7 +125,7 @@ algo_type sshkex[] = {
* 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 @@ void crypto_init() {
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
diff --git a/includes.h b/includes.h
index 50f2b7be..6c9f0842 100644
--- a/includes.h
+++ b/includes.h
@@ -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"
diff --git a/packet.c b/packet.c
index 56b31c21..ecda4102 100644
--- a/packet.c
+++ b/packet.c
@@ -201,6 +201,7 @@ static void read_packet_init() {
/* 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 @@ void decrypt_packet() {
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 @@ void encrypt_packet() {
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");
}
--
GitLab