ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-04-16 13:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- Add Counter Mode support

Browse Source 
--HG--
extra : convert_revision : 5225162bdf32d70b58b6d3ae375a290326c59f3a
This commit is contained in:
Matt Johnston 2008-09-29 13:53:31 +00:00
parent 049fcf1ac5
commit 511f6555c9
11 changed files with 195 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
algo.h
View File

@ -29,13 +29,18 @@
#include "includes.h" #include "includes.h"
#include "buffer.h" #include "buffer.h"
#define DROPBEAR_MODE_UNUSED 0
#define DROPBEAR_MODE_CBC 1
#define DROPBEAR_MODE_CTR 2
struct Algo_Type { struct Algo_Type {
unsigned char *name; /* identifying name */ unsigned char *name; /* identifying name */
char val; /* a value for this cipher, or -1 for invalid */ char val; /* a value for this cipher, or -1 for invalid */
void *data; /* algorithm specific data */ const void *data; /* algorithm specific data */
unsigned usable : 1; /* whether we can use this algorithm */ char usable; /* whether we can use this algorithm */
const void *mode; /* the mode, currently only used for ciphers,
points to a 'struct dropbear_cipher_mode' */
}; };
typedef struct Algo_Type algo_type; typedef struct Algo_Type algo_type;
@ -48,6 +53,7 @@ extern algo_type sshhashes[];
extern algo_type sshcompress[]; extern algo_type sshcompress[];
extern const struct dropbear_cipher dropbear_nocipher; extern const struct dropbear_cipher dropbear_nocipher;
extern const struct dropbear_cipher_mode dropbear_mode_none;
extern const struct dropbear_hash dropbear_nohash; extern const struct dropbear_hash dropbear_nohash;
struct dropbear_cipher { struct dropbear_cipher {
@ -56,6 +62,16 @@ struct dropbear_cipher {
unsigned char blocksize; unsigned char blocksize;
}; };
struct dropbear_cipher_mode {
int (*start)(int cipher, const unsigned char *IV,
const unsigned char *key,
int keylen, int num_rounds, void *cipher_state);
int (*encrypt)(const unsigned char *pt, unsigned char *ct,
unsigned long len, void *cipher_state);
int (*decrypt)(const unsigned char *ct, unsigned char *pt,
unsigned long len, void *cipher_state);
};
struct dropbear_hash { struct dropbear_hash {
const struct ltc_hash_descriptor *hashdesc; const struct ltc_hash_descriptor *hashdesc;
unsigned long keysize; unsigned long keysize;

132
common-algo.c
View File

@ -29,32 +29,44 @@
/* This file (algo.c) organises the ciphers which can be used, and is used to /* This file (algo.c) organises the ciphers which can be used, and is used to
* decide which ciphers/hashes/compression/signing to use during key exchange*/ * decide which ciphers/hashes/compression/signing to use during key exchange*/
static int void_cipher(const unsigned char* in, unsigned char* out,
unsigned long len, void *cipher_state) {
memcpy(out, in, len);
return CRYPT_OK;
}
static int void_start(int cipher, const unsigned char *IV,
const unsigned char *key,
int keylen, int num_rounds, void *cipher_state) {
return CRYPT_OK;
}
/* Mappings for ciphers, parameters are /* Mappings for ciphers, parameters are
{&cipher_desc, keysize, blocksize} */ {&cipher_desc, keysize, blocksize} */
/* NOTE: if keysize > 2*SHA1_HASH_SIZE, code such as hashkeys() /* NOTE: if keysize > 2*SHA1_HASH_SIZE, code such as hashkeys()
needs revisiting */ needs revisiting */
#ifdef DROPBEAR_AES256_CBC #ifdef DROPBEAR_AES256
static const struct dropbear_cipher dropbear_aes256 = static const struct dropbear_cipher dropbear_aes256 =
{&aes_desc, 32, 16}; {&aes_desc, 32, 16};
#endif #endif
#ifdef DROPBEAR_AES128_CBC #ifdef DROPBEAR_AES128
static const struct dropbear_cipher dropbear_aes128 = static const struct dropbear_cipher dropbear_aes128 =
{&aes_desc, 16, 16}; {&aes_desc, 16, 16};
#endif #endif
#ifdef DROPBEAR_BLOWFISH_CBC #ifdef DROPBEAR_BLOWFISH
static const struct dropbear_cipher dropbear_blowfish = static const struct dropbear_cipher dropbear_blowfish =
{&blowfish_desc, 16, 8}; {&blowfish_desc, 16, 8};
#endif #endif
#ifdef DROPBEAR_TWOFISH256_CBC #ifdef DROPBEAR_TWOFISH256
static const struct dropbear_cipher dropbear_twofish256 = static const struct dropbear_cipher dropbear_twofish256 =
{&twofish_desc, 32, 16}; {&twofish_desc, 32, 16};
#endif #endif
#ifdef DROPBEAR_TWOFISH128_CBC #ifdef DROPBEAR_TWOFISH128
static const struct dropbear_cipher dropbear_twofish128 = static const struct dropbear_cipher dropbear_twofish128 =
{&twofish_desc, 16, 16}; {&twofish_desc, 16, 16};
#endif #endif
#ifdef DROPBEAR_3DES_CBC #ifdef DROPBEAR_3DES
static const struct dropbear_cipher dropbear_3des = static const struct dropbear_cipher dropbear_3des =
{&des3_desc, 24, 8}; {&des3_desc, 24, 8};
#endif #endif
@ -63,6 +75,24 @@ static const struct dropbear_cipher dropbear_3des =
const struct dropbear_cipher dropbear_nocipher = const struct dropbear_cipher dropbear_nocipher =
{NULL, 16, 8}; {NULL, 16, 8};
/* A few void* s are required to silence warnings
* about the symmetric_CBC vs symmetric_CTR cipher_state pointer */
const struct dropbear_cipher_mode dropbear_mode_cbc =
{(void*)cbc_start, (void*)cbc_encrypt, (void*)cbc_decrypt};
const struct dropbear_cipher_mode dropbear_mode_none =
{void_start, void_cipher, void_cipher};
#ifdef DROPBEAR_ENABLE_CTR_MODE
/* a wrapper to make ctr_start and cbc_start look the same */
static int dropbear_big_endian_ctr_start(int cipher,
const unsigned char *IV,
const unsigned char *key, int keylen,
int num_rounds, symmetric_CTR *ctr) {
return ctr_start(cipher, IV, key, keylen, num_rounds, CTR_COUNTER_BIG_ENDIAN, ctr);
}
const struct dropbear_cipher_mode dropbear_mode_ctr =
{(void*)dropbear_big_endian_ctr_start, (void*)ctr_encrypt, (void*)ctr_decrypt};
#endif
/* Mapping of ssh hashes to libtomcrypt hashes, including keysize etc. /* Mapping of ssh hashes to libtomcrypt hashes, including keysize etc.
{&hash_desc, keysize, hashsize} */ {&hash_desc, keysize, hashsize} */
@ -83,66 +113,90 @@ const struct dropbear_hash dropbear_nohash =
{NULL, 16, 0}; /* used initially */ {NULL, 16, 0}; /* used initially */
/* The following map ssh names to internal values */ /* The following map ssh names to internal values.
* The ordering here is important for the client - the first mode
* that is also supported by the server will get used. */
algo_type sshciphers[] = { algo_type sshciphers[] = {
#ifdef DROPBEAR_AES128_CBC #ifdef DROPBEAR_ENABLE_CTR_MODE
{"aes128-cbc", 0, (void*)&dropbear_aes128, 1}, #ifdef DROPBEAR_AES128
{"aes128-ctr", 0, &dropbear_aes128, 1, &dropbear_mode_ctr},
#endif #endif
#ifdef DROPBEAR_3DES_CBC #ifdef DROPBEAR_3DES
{"3des-cbc", 0, (void*)&dropbear_3des, 1}, {"3des-ctr", 0, &dropbear_3des, 1, &dropbear_mode_ctr},
#endif #endif
#ifdef DROPBEAR_AES256_CBC #ifdef DROPBEAR_AES256
{"aes256-cbc", 0, (void*)&dropbear_aes256, 1}, {"aes256-ctr", 0, &dropbear_aes256, 1, &dropbear_mode_ctr},
#endif #endif
#ifdef DROPBEAR_TWOFISH256_CBC #ifdef DROPBEAR_TWOFISH256
{"twofish256-cbc", 0, (void*)&dropbear_twofish256, 1}, {"twofish256-ctr", 0, &dropbear_twofish256, 1, &dropbear_mode_ctr},
{"twofish-cbc", 0, (void*)&dropbear_twofish256, 1},
#endif #endif
#ifdef DROPBEAR_TWOFISH128_CBC #ifdef DROPBEAR_TWOFISH128
{"twofish128-cbc", 0, (void*)&dropbear_twofish128, 1}, {"twofish128-ctr", 0, &dropbear_twofish128, 1, &dropbear_mode_ctr},
#endif #endif
#ifdef DROPBEAR_BLOWFISH_CBC #ifdef DROPBEAR_BLOWFISH
{"blowfish-cbc", 0, (void*)&dropbear_blowfish, 1}, {"blowfish-ctr", 0, &dropbear_blowfish, 1, &dropbear_mode_ctr},
#endif #endif
{NULL, 0, NULL, 0} #endif /* DROPBEAR_ENABLE_CTR_MODE */
/* CBC modes are always enabled */
#ifdef DROPBEAR_AES128
{"aes128-cbc", 0, &dropbear_aes128, 1, &dropbear_mode_cbc},
#endif
#ifdef DROPBEAR_3DES
{"3des-cbc", 0, &dropbear_3des, 1, &dropbear_mode_cbc},
#endif
#ifdef DROPBEAR_AES256
{"aes256-cbc", 0, &dropbear_aes256, 1, &dropbear_mode_cbc},
#endif
#ifdef DROPBEAR_TWOFISH256
{"twofish256-cbc", 0, &dropbear_twofish256, 1, &dropbear_mode_cbc},
{"twofish-cbc", 0, &dropbear_twofish256, 1, &dropbear_mode_cbc},
#endif
#ifdef DROPBEAR_TWOFISH128
{"twofish128-cbc", 0, &dropbear_twofish128, 1, &dropbear_mode_cbc},
#endif
#ifdef DROPBEAR_BLOWFISH
{"blowfish-cbc", 0, &dropbear_blowfish, 1, &dropbear_mode_cbc},
#endif
{NULL, 0, NULL, 0, NULL}
}; };
algo_type sshhashes[] = { algo_type sshhashes[] = {
#ifdef DROPBEAR_SHA1_96_HMAC #ifdef DROPBEAR_SHA1_96_HMAC
{"hmac-sha1-96", 0, (void*)&dropbear_sha1_96, 1}, {"hmac-sha1-96", 0, &dropbear_sha1_96, 1, NULL},
#endif #endif
#ifdef DROPBEAR_SHA1_HMAC #ifdef DROPBEAR_SHA1_HMAC
{"hmac-sha1", 0, (void*)&dropbear_sha1, 1}, {"hmac-sha1", 0, &dropbear_sha1, 1, NULL},
#endif #endif
#ifdef DROPBEAR_MD5_HMAC #ifdef DROPBEAR_MD5_HMAC
{"hmac-md5", 0, (void*)&dropbear_md5, 1}, {"hmac-md5", 0, &dropbear_md5, 1, NULL},
#endif #endif
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0, NULL}
}; };
algo_type sshcompress[] = { algo_type sshcompress[] = {
#ifndef DISABLE_ZLIB #ifndef DISABLE_ZLIB
{"zlib", DROPBEAR_COMP_ZLIB, NULL, 1}, {"zlib", DROPBEAR_COMP_ZLIB, NULL, 1, NULL},
{"zlib@openssh.com", DROPBEAR_COMP_ZLIB_DELAY, NULL, 1}, {"zlib@openssh.com", DROPBEAR_COMP_ZLIB_DELAY, NULL, 1, NULL},
#endif #endif
{"none", DROPBEAR_COMP_NONE, NULL, 1}, {"none", DROPBEAR_COMP_NONE, NULL, 1, NULL},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0, NULL}
}; };
algo_type sshhostkey[] = { algo_type sshhostkey[] = {
#ifdef DROPBEAR_RSA #ifdef DROPBEAR_RSA
{"ssh-rsa", DROPBEAR_SIGNKEY_RSA, NULL, 1}, {"ssh-rsa", DROPBEAR_SIGNKEY_RSA, NULL, 1, NULL},
#endif #endif
#ifdef DROPBEAR_DSS #ifdef DROPBEAR_DSS
{"ssh-dss", DROPBEAR_SIGNKEY_DSS, NULL, 1}, {"ssh-dss", DROPBEAR_SIGNKEY_DSS, NULL, 1, NULL},
#endif #endif
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0, NULL}
}; };
algo_type sshkex[] = { algo_type sshkex[] = {
{"diffie-hellman-group1-sha1", DROPBEAR_KEX_DH_GROUP1, NULL, 1}, {"diffie-hellman-group1-sha1", DROPBEAR_KEX_DH_GROUP1, NULL, 1, NULL},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0, NULL}
}; };
@ -151,16 +205,16 @@ algo_type sshkex[] = {
void crypto_init() { void crypto_init() {
const struct ltc_cipher_descriptor *regciphers[] = { const struct ltc_cipher_descriptor *regciphers[] = {
#ifdef DROPBEAR_AES_CBC #ifdef DROPBEAR_AES
&aes_desc, &aes_desc,
#endif #endif
#ifdef DROPBEAR_BLOWFISH_CBC #ifdef DROPBEAR_BLOWFISH
&blowfish_desc, &blowfish_desc,
#endif #endif
#ifdef DROPBEAR_TWOFISH_CBC #ifdef DROPBEAR_TWOFISH
&twofish_desc, &twofish_desc,
#endif #endif
#ifdef DROPBEAR_3DES_CBC #ifdef DROPBEAR_3DES
&des3_desc, &des3_desc,
#endif #endif
NULL NULL
@ -216,7 +270,7 @@ void buf_put_algolist(buffer * buf, algo_type localalgos[]) {
unsigned int donefirst = 0; unsigned int donefirst = 0;
buffer *algolist = NULL; buffer *algolist = NULL;
algolist = buf_new(100); algolist = buf_new(160);
for (i = 0; localalgos[i].name != NULL; i++) { for (i = 0; localalgos[i].name != NULL; i++) {
if (localalgos[i].usable) { if (localalgos[i].usable) {
if (donefirst) if (donefirst)

21
common-kex.c
View File

@ -295,19 +295,20 @@ void gen_new_keys() {
recv_cipher = find_cipher(ses.newkeys->recv_algo_crypt->cipherdesc->name); recv_cipher = find_cipher(ses.newkeys->recv_algo_crypt->cipherdesc->name);
if (recv_cipher < 0) if (recv_cipher < 0)
dropbear_exit("crypto error"); dropbear_exit("crypto error");
if (ses.newkeys->recv_crypt_mode->start(recv_cipher,
if (cbc_start(recv_cipher, recv_IV, recv_key, recv_IV, recv_key,
ses.newkeys->recv_algo_crypt->keysize, 0, ses.newkeys->recv_algo_crypt->keysize, 0,
&ses.newkeys->recv_symmetric_struct) != CRYPT_OK) { &ses.newkeys->recv_cipher_state) != CRYPT_OK) {
dropbear_exit("crypto error"); dropbear_exit("crypto error");
} }
trans_cipher = find_cipher(ses.newkeys->trans_algo_crypt->cipherdesc->name); trans_cipher = find_cipher(ses.newkeys->trans_algo_crypt->cipherdesc->name);
if (trans_cipher < 0) if (trans_cipher < 0)
dropbear_exit("crypto error"); dropbear_exit("crypto error");
if (ses.newkeys->trans_crypt_mode->start(trans_cipher,
if (cbc_start(trans_cipher, trans_IV, trans_key, trans_IV, trans_key,
ses.newkeys->trans_algo_crypt->keysize, 0, ses.newkeys->trans_algo_crypt->keysize, 0,
&ses.newkeys->trans_symmetric_struct) != CRYPT_OK) { &ses.newkeys->trans_cipher_state) != CRYPT_OK) {
dropbear_exit("crypto error"); dropbear_exit("crypto error");
} }
@ -701,6 +702,10 @@ static void read_kex_algos() {
(struct dropbear_cipher*)s2c_cipher_algo->data; (struct dropbear_cipher*)s2c_cipher_algo->data;
ses.newkeys->trans_algo_crypt = ses.newkeys->trans_algo_crypt =
(struct dropbear_cipher*)c2s_cipher_algo->data; (struct dropbear_cipher*)c2s_cipher_algo->data;
ses.newkeys->recv_crypt_mode =
(struct dropbear_cipher_mode*)s2c_cipher_algo->mode;
ses.newkeys->trans_crypt_mode =
(struct dropbear_cipher_mode*)c2s_cipher_algo->mode;
ses.newkeys->recv_algo_mac = ses.newkeys->recv_algo_mac =
(struct dropbear_hash*)s2c_hash_algo->data; (struct dropbear_hash*)s2c_hash_algo->data;
ses.newkeys->trans_algo_mac = ses.newkeys->trans_algo_mac =
@ -713,6 +718,10 @@ static void read_kex_algos() {
(struct dropbear_cipher*)c2s_cipher_algo->data; (struct dropbear_cipher*)c2s_cipher_algo->data;
ses.newkeys->trans_algo_crypt = ses.newkeys->trans_algo_crypt =
(struct dropbear_cipher*)s2c_cipher_algo->data; (struct dropbear_cipher*)s2c_cipher_algo->data;
ses.newkeys->recv_crypt_mode =
(struct dropbear_cipher_mode*)c2s_cipher_algo->mode;
ses.newkeys->trans_crypt_mode =
(struct dropbear_cipher_mode*)s2c_cipher_algo->mode;
ses.newkeys->recv_algo_mac = ses.newkeys->recv_algo_mac =
(struct dropbear_hash*)c2s_hash_algo->data; (struct dropbear_hash*)c2s_hash_algo->data;
ses.newkeys->trans_algo_mac = ses.newkeys->trans_algo_mac =

2
common-session.c
View File

@ -96,6 +96,8 @@ void common_session_init(int sock_in, int sock_out, char* remotehost) {
ses.newkeys = NULL; ses.newkeys = NULL;
ses.keys->recv_algo_crypt = &dropbear_nocipher; ses.keys->recv_algo_crypt = &dropbear_nocipher;
ses.keys->trans_algo_crypt = &dropbear_nocipher; ses.keys->trans_algo_crypt = &dropbear_nocipher;
ses.keys->recv_crypt_mode = &dropbear_mode_none;
ses.keys->trans_crypt_mode = &dropbear_mode_none;
ses.keys->recv_algo_mac = &dropbear_nohash; ses.keys->recv_algo_mac = &dropbear_nohash;
ses.keys->trans_algo_mac = &dropbear_nohash; ses.keys->trans_algo_mac = &dropbear_nohash;

12
libtomcrypt/src/headers/tomcrypt_custom.h
View File

@ -90,15 +90,15 @@
/* #define LTC_NO_BSWAP */ /* #define LTC_NO_BSWAP */
#ifdef DROPBEAR_BLOWFISH_CBC #ifdef DROPBEAR_BLOWFISH
#define BLOWFISH #define BLOWFISH
#endif #endif
#ifdef DROPBEAR_AES_CBC #ifdef DROPBEAR_AES
#define RIJNDAEL #define RIJNDAEL
#endif #endif
#ifdef DROPBEAR_TWOFISH_CBC #ifdef DROPBEAR_TWOFISH
#define TWOFISH #define TWOFISH
/* enabling just TWOFISH_SMALL will make the binary ~1kB smaller, turning on /* enabling just TWOFISH_SMALL will make the binary ~1kB smaller, turning on
@ -108,12 +108,16 @@
/*#define TWOFISH_TABLES*/ /*#define TWOFISH_TABLES*/
#endif #endif
#ifdef DROPBEAR_3DES_CBC #ifdef DROPBEAR_3DES
#define DES #define DES
#endif #endif
#define LTC_CBC_MODE #define LTC_CBC_MODE
#ifdef DROPBEAR_ENABLE_CTR_MODE
#define LTC_CTR_MODE
#endif
#if defined(DROPBEAR_DSS) && defined(DSS_PROTOK) #if defined(DROPBEAR_DSS) && defined(DSS_PROTOK)
#define SHA512 #define SHA512
#endif #endif

20
options.h
View File

@ -75,18 +75,22 @@ etc) slower (perhaps by 50%). Recommended for most small systems. */
/* Encryption - at least one required. /* Encryption - at least one required.
* RFC Draft requires 3DES and recommends AES128 for interoperability. * Protocol RFC requires 3DES and recommends AES128 for interoperability.
* Including multiple keysize variants the same cipher * Including multiple keysize variants the same cipher
* (eg AES256 as well as AES128) will result in a minimal size increase.*/ * (eg AES256 as well as AES128) will result in a minimal size increase.*/
#define DROPBEAR_AES128_CBC #define DROPBEAR_AES128
#define DROPBEAR_3DES_CBC #define DROPBEAR_3DES
#define DROPBEAR_AES256_CBC #define DROPBEAR_AES256
#define DROPBEAR_BLOWFISH_CBC #define DROPBEAR_BLOWFISH
#define DROPBEAR_TWOFISH256_CBC #define DROPBEAR_TWOFISH256
#define DROPBEAR_TWOFISH128_CBC #define DROPBEAR_TWOFISH128
/* Enable "Counter Mode" for ciphers. This is more secure than normal
* CBC mode against certain attacks. TODO how much size does it add? */
#define DROPBEAR_ENABLE_CTR_MODE
/* Message Integrity - at least one required. /* Message Integrity - at least one required.
* RFC Draft requires sha1 and recommends sha1-96. * Protocol RFC requires sha1 and recommends sha1-96.
* sha1-96 may be of use for slow links, as it has a smaller overhead. * sha1-96 may be of use for slow links, as it has a smaller overhead.
* *
* Note: there's no point disabling sha1 to save space, since it's used * Note: there's no point disabling sha1 to save space, since it's used

40
packet.c
View File

@ -194,20 +194,12 @@ static void read_packet_init() {
/* now we have the first block, need to get packet length, so we decrypt /* now we have the first block, need to get packet length, so we decrypt
* the first block (only need first 4 bytes) */ * the first block (only need first 4 bytes) */
buf_setpos(ses.readbuf, 0); buf_setpos(ses.readbuf, 0);
if (ses.keys->recv_algo_crypt->cipherdesc == NULL) { if (ses.keys->recv_crypt_mode->decrypt(buf_getptr(ses.readbuf, blocksize),
/* copy it */
memcpy(buf_getwriteptr(ses.decryptreadbuf, blocksize),
buf_getptr(ses.readbuf, blocksize),
blocksize);
} else {
/* decrypt it */
if (cbc_decrypt(buf_getptr(ses.readbuf, blocksize),
buf_getwriteptr(ses.decryptreadbuf,blocksize), buf_getwriteptr(ses.decryptreadbuf,blocksize),
blocksize, blocksize,
&ses.keys->recv_symmetric_struct) != CRYPT_OK) { &ses.keys->recv_cipher_state) != CRYPT_OK) {
dropbear_exit("error decrypting"); dropbear_exit("error decrypting");
} }
}
buf_setlen(ses.decryptreadbuf, blocksize); buf_setlen(ses.decryptreadbuf, blocksize);
len = buf_getint(ses.decryptreadbuf) + 4 + macsize; len = buf_getint(ses.decryptreadbuf) + 4 + macsize;
@ -246,25 +238,18 @@ void decrypt_packet() {
buf_setlen(ses.decryptreadbuf, ses.decryptreadbuf->size); buf_setlen(ses.decryptreadbuf, ses.decryptreadbuf->size);
buf_setpos(ses.decryptreadbuf, blocksize); buf_setpos(ses.decryptreadbuf, blocksize);
/* decrypt if encryption is set, memcpy otherwise */ /* decrypt it */
if (ses.keys->recv_algo_crypt->cipherdesc == NULL) {
/* copy it */
len = ses.readbuf->len - macsize - blocksize;
memcpy(buf_getwriteptr(ses.decryptreadbuf, len),
buf_getptr(ses.readbuf, len), len);
} else {
/* decrypt */
while (ses.readbuf->pos < ses.readbuf->len - macsize) { while (ses.readbuf->pos < ses.readbuf->len - macsize) {
if (cbc_decrypt(buf_getptr(ses.readbuf, blocksize), if (ses.keys->recv_crypt_mode->decrypt(
buf_getptr(ses.readbuf, blocksize),
buf_getwriteptr(ses.decryptreadbuf, blocksize), buf_getwriteptr(ses.decryptreadbuf, blocksize),
blocksize, blocksize,
&ses.keys->recv_symmetric_struct) != CRYPT_OK) { &ses.keys->recv_cipher_state) != CRYPT_OK) {
dropbear_exit("error decrypting"); dropbear_exit("error decrypting");
} }
buf_incrpos(ses.readbuf, blocksize); buf_incrpos(ses.readbuf, blocksize);
buf_incrwritepos(ses.decryptreadbuf, blocksize); buf_incrwritepos(ses.decryptreadbuf, blocksize);
} }
}
/* check the hmac */ /* check the hmac */
buf_setpos(ses.readbuf, ses.readbuf->len - macsize); buf_setpos(ses.readbuf, ses.readbuf->len - macsize);
@ -544,25 +529,18 @@ void encrypt_packet() {
* wire by writepacket() */ * wire by writepacket() */
writebuf = buf_new(clearwritebuf->len + macsize); writebuf = buf_new(clearwritebuf->len + macsize);
if (ses.keys->trans_algo_crypt->cipherdesc == NULL) {
/* copy it */
memcpy(buf_getwriteptr(writebuf, clearwritebuf->len),
buf_getptr(clearwritebuf, clearwritebuf->len),
clearwritebuf->len);
buf_incrwritepos(writebuf, clearwritebuf->len);
} else {
/* encrypt it */ /* encrypt it */
while (clearwritebuf->pos < clearwritebuf->len) { while (clearwritebuf->pos < clearwritebuf->len) {
if (cbc_encrypt(buf_getptr(clearwritebuf, blocksize), if (ses.keys->trans_crypt_mode->encrypt(
buf_getptr(clearwritebuf, blocksize),
buf_getwriteptr(writebuf, blocksize), buf_getwriteptr(writebuf, blocksize),
blocksize, blocksize,
&ses.keys->trans_symmetric_struct) != CRYPT_OK) { &ses.keys->trans_cipher_state) != CRYPT_OK) {
dropbear_exit("error encrypting"); dropbear_exit("error encrypting");
} }
buf_incrpos(clearwritebuf, blocksize); buf_incrpos(clearwritebuf, blocksize);
buf_incrwritepos(writebuf, blocksize); buf_incrwritepos(writebuf, blocksize);
} }
}
/* now add a hmac and we're done */ /* now add a hmac and we're done */
writemac(writebuf, clearwritebuf); writemac(writebuf, clearwritebuf);

16
session.h
View File

@ -64,6 +64,8 @@ struct key_context {
const struct dropbear_cipher *recv_algo_crypt; /* NULL for none */ const struct dropbear_cipher *recv_algo_crypt; /* NULL for none */
const struct dropbear_cipher *trans_algo_crypt; /* NULL for none */ const struct dropbear_cipher *trans_algo_crypt; /* NULL for none */
const struct dropbear_cipher_mode *recv_crypt_mode;
const struct dropbear_cipher_mode *trans_crypt_mode;
const struct dropbear_hash *recv_algo_mac; /* NULL for none */ const struct dropbear_hash *recv_algo_mac; /* NULL for none */
const struct dropbear_hash *trans_algo_mac; /* NULL for none */ const struct dropbear_hash *trans_algo_mac; /* NULL for none */
char algo_kex; char algo_kex;
@ -79,8 +81,18 @@ struct key_context {
#endif #endif
/* actual keys */ /* actual keys */
symmetric_CBC recv_symmetric_struct; union {
symmetric_CBC trans_symmetric_struct; symmetric_CBC cbc;
#ifdef DROPBEAR_ENABLE_CTR_MODE
symmetric_CTR ctr;
#endif
} recv_cipher_state;
union {
symmetric_CBC cbc;
#ifdef DROPBEAR_ENABLE_CTR_MODE
symmetric_CTR ctr;
#endif
} trans_cipher_state;
unsigned char recvmackey[MAX_MAC_KEY]; unsigned char recvmackey[MAX_MAC_KEY];
unsigned char transmackey[MAX_MAC_KEY]; unsigned char transmackey[MAX_MAC_KEY];

2
svr-authpubkeyoptions.c
View File

@ -105,7 +105,7 @@ void svr_pubkey_options_cleanup() {
/* helper for svr_add_pubkey_options. returns DROPBEAR_SUCCESS if the option is matched, /* helper for svr_add_pubkey_options. returns DROPBEAR_SUCCESS if the option is matched,
and increments the options_buf */ and increments the options_buf */
static int match_option(buffer *options_buf, const char *opt_name) { static int match_option(buffer *options_buf, const char *opt_name) {
const int len = strlen(opt_name); const unsigned int len = strlen(opt_name);
if (options_buf->len - options_buf->pos < len) { if (options_buf->len - options_buf->pos < len) {
return DROPBEAR_FAILURE; return DROPBEAR_FAILURE;
} }

2
svr-chansession.c
View File

@ -663,11 +663,11 @@ static int noptycommand(struct Channel *channel, struct ChanSess *chansess) {
addchildpid(chansess, chansess->pid); addchildpid(chansess, chansess->pid);
if (svr_ses.lastexit.exitpid != -1) { if (svr_ses.lastexit.exitpid != -1) {
unsigned int i;
TRACE(("parent side: lastexitpid is %d", svr_ses.lastexit.exitpid)) TRACE(("parent side: lastexitpid is %d", svr_ses.lastexit.exitpid))
/* The child probably exited and the signal handler triggered /* The child probably exited and the signal handler triggered
* possibly before we got around to adding the childpid. So we fill * possibly before we got around to adding the childpid. So we fill
* out its data manually */ * out its data manually */
int i;
for (i = 0; i < svr_ses.childpidsize; i++) { for (i = 0; i < svr_ses.childpidsize; i++) {
if (svr_ses.childpids[i].pid == svr_ses.lastexit.exitpid) { if (svr_ses.childpids[i].pid == svr_ses.lastexit.exitpid) {
TRACE(("found match for lastexitpid")) TRACE(("found match for lastexitpid"))

8
sysoptions.h
View File

@ -134,12 +134,12 @@
accept for keyb-interactive accept for keyb-interactive
auth */ auth */
#if defined(DROPBEAR_AES256_CBC) || defined(DROPBEAR_AES128_CBC) #if defined(DROPBEAR_AES256) || defined(DROPBEAR_AES128)
#define DROPBEAR_AES_CBC #define DROPBEAR_AES
#endif #endif
#if defined(DROPBEAR_TWOFISH256_CBC) || defined(DROPBEAR_TWOFISH128_CBC) #if defined(DROPBEAR_TWOFISH256) || defined(DROPBEAR_TWOFISH128)
#define DROPBEAR_TWOFISH_CBC #define DROPBEAR_TWOFISH
#endif #endif
#ifndef ENABLE_X11FWD #ifndef ENABLE_X11FWD