merge of '0a8dfaa3e5365a2004db2b55895e11f65b5cefcc'

and 'ef3b41f37e9f4dd45358bc40f9559ee23f71c284'

--HG--
extra : convert_revision : 36f4aee4c1a6a38c7904e2482102d8555ff45fa0
This commit is contained in:
Matt Johnston 2009-03-17 22:30:39 +00:00
commit 5d3dae1492
2 changed files with 4 additions and 5 deletions

View File

@ -46,9 +46,10 @@
/*#define NO_FAST_EXPTMOD*/ /*#define NO_FAST_EXPTMOD*/
/* Set this if you want to use the DROPBEAR_SMALL_CODE option. This can save /* Set this if you want to use the DROPBEAR_SMALL_CODE option. This can save
several kB in binary size, however will make the symmetrical ciphers (AES, DES several kB in binary size however will make the symmetrical ciphers and hashes
etc) slower (perhaps by 50%). Recommended for most small systems. */ slower, perhaps by 50%. Recommended for small systems that aren't doing
#define DROPBEAR_SMALL_CODE much traffic. */
/*#define DROPBEAR_SMALL_CODE*/
/* Enable X11 Forwarding - server only */ /* Enable X11 Forwarding - server only */
#define ENABLE_X11FWD #define ENABLE_X11FWD

View File

@ -250,8 +250,6 @@ void decrypt_packet() {
} }
buf_incrpos(ses.readbuf, len); buf_incrpos(ses.readbuf, len);
printhex("readbuf decrypted", ses.readbuf->data, ses.readbuf->len);
/* check the hmac */ /* check the hmac */
if (checkmac() != DROPBEAR_SUCCESS) { if (checkmac() != DROPBEAR_SUCCESS) {
dropbear_exit("Integrity error"); dropbear_exit("Integrity error");