From d6b7448ab8c9ecc749209292a7ab1a25c0986fb5 Mon Sep 17 00:00:00 2001 From: git migration script Date: Mon, 2 Aug 1999 08:35:11 +0000 Subject: [PATCH] Rebranch some files on 'ben-mac-port' from trunk. This commit reflects a move of the 'ben-mac-port' branch start-point tag on a subset of the source tree, via CVS's ability to move a branch tag after the fact. The changed files are all copied from trunk r190. [originally from svn r191] [r190 == 5aab53ce521ec51eae8a4df58e4d3ef0c52cbefe] --- Makefile | 5 +- ssh.c | 74 ++++++---- ssh.h | 4 + sshblowf.c | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++ sshrand.c | 10 +- sshrsa.c | 333 +++++++++++++++++++++--------------------- win_res.h | 3 + win_res.rc | 3 + windlg.c | 85 ++++++++--- window.c | 85 ++++++++--- 10 files changed, 776 insertions(+), 241 deletions(-) create mode 100644 sshblowf.c diff --git a/Makefile b/Makefile index 19697de4..4a080c60 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,10 @@ CFLAGS = /nologo /W3 /YX /O2 /Yd /D_WINDOWS /DDEBUG /ML /Fd PUTTYOBJS = window.obj windlg.obj terminal.obj telnet.obj OBJS1 = misc.obj noise.obj OBJS2 = ssh.obj sshcrc.obj sshdes.obj sshmd5.obj sshrsa.obj sshrand.obj -OBJS3 = sshsha.obj version.obj +OBJS3 = sshsha.obj sshblowf.obj version.obj RESRC = win_res.res LIBS1 = advapi32.lib user32.lib gdi32.lib -LIBS2 = ws2_32.lib comctl32.lib comdlg32.lib +LIBS2 = wsock32.lib comctl32.lib comdlg32.lib putty.exe: $(PUTTYOBJS) $(OBJS1) $(OBJS2) $(OBJS3) $(RESRC) link.rsp link /debug -out:putty.exe @link.rsp @@ -47,6 +47,7 @@ sshmd5.obj: sshmd5.c ssh.h sshrsa.obj: sshrsa.c ssh.h sshsha.obj: sshsha.c ssh.h sshrand.obj: sshrand.c ssh.h +sshblowf.obj: sshblowf.c ssh.h version.obj: versionpseudotarget @echo (built version.obj) diff --git a/ssh.c b/ssh.c index c9718db7..17a59238 100644 --- a/ssh.c +++ b/ssh.c @@ -1,10 +1,16 @@ #include #include -#ifndef macintosh #include -#endif /* not macintosh */ #include "putty.h" + +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 +#endif + #include "ssh.h" /* Coroutine mechanics for the sillier bits of the code */ @@ -24,10 +30,15 @@ #define crStop(z) do{ crLine = 0; return (z); }while(0) #define crStopV do{ crLine = 0; return; }while(0) -#ifndef macintosh -static SOCKET s = INVALID_SOCKET; +#ifndef FALSE +#define FALSE 0 +#endif +#ifndef TRUE +#define TRUE 1 #endif +static SOCKET s = INVALID_SOCKET; + static unsigned char session_key[32]; static struct ssh_cipher *cipher = NULL; @@ -36,16 +47,12 @@ static char *savedhost; static enum { SSH_STATE_BEFORE_SIZE, SSH_STATE_INTERMED, - SSH_STATE_SESSION + SSH_STATE_SESSION, + SSH_STATE_CLOSED } ssh_state = SSH_STATE_BEFORE_SIZE; static int size_needed = FALSE; -#ifdef macintosh -static void s_write (unsigned char *buf, int len) { - panic("s_write not implemented"); -} -#else /* not macintosh */ static void s_write (char *buf, int len) { while (len > 0) { int i = send (s, buf, len, 0); @@ -53,13 +60,7 @@ static void s_write (char *buf, int len) { len -= i, buf += i; } } -#endif /* not macintosh */ -#ifdef macintosh -static int s_read (unsigned char *buf, int len) { - panic("s_read not implemented"); -} -#else /* not macintosh */ static int s_read (char *buf, int len) { int ret = 0; while (len > 0) { @@ -71,12 +72,10 @@ static int s_read (char *buf, int len) { } return ret; } -#endif static void c_write (char *buf, int len) { while (len--) { int new_head = (inbuf_head + 1) & INBUF_MASK; - int c = (unsigned char) *buf; if (new_head != inbuf_reap) { inbuf[inbuf_head] = *buf++; inbuf_head = new_head; @@ -101,10 +100,8 @@ static void ssh_size(void); static void ssh_gotdata(unsigned char *data, int datalen) { static long len, biglen, to_read; - static unsigned char c, *p; + static unsigned char *p; static int i, pad; - static char padding[8]; - static unsigned char word[4]; crBegin; while (1) { @@ -175,8 +172,8 @@ static void s_wrpkt_start(int type, int len) { pktout.length = len-5; if (pktout.maxlen < biglen) { pktout.maxlen = biglen; - pktout.data = (pktout.data == NULL ? malloc(biglen) : - realloc(pktout.data, biglen)); + pktout.data = (pktout.data == NULL ? malloc(biglen+4) : + realloc(pktout.data, biglen+4)); if (!pktout.data) fatalbox("Out of memory"); } @@ -215,7 +212,7 @@ static void s_wrpkt(void) { } static int do_ssh_init(void) { - unsigned char c; + char c; char version[10]; char vstring[40]; int i; @@ -251,7 +248,7 @@ static int do_ssh_init(void) { sprintf(vstring, "SSH-%s-7.7.7\n", (strcmp(version, "1.5") <= 0 ? version : "1.5")); - s_write((unsigned char *)vstring, strlen(vstring)); + s_write(vstring, strlen(vstring)); return 1; } @@ -262,8 +259,11 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) { unsigned char cookie[8]; struct RSAKey servkey, hostkey; struct MD5Context md5c; + unsigned long supported_ciphers_mask; + int cipher_type; extern struct ssh_cipher ssh_3des; + extern struct ssh_cipher ssh_blowfish; crBegin; @@ -283,6 +283,11 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) { j = makekey(pktin.body+8+i, &hostkey, &keystr2); + supported_ciphers_mask = (pktin.body[12+i+j] << 24) | + (pktin.body[13+i+j] << 16) | + (pktin.body[14+i+j] << 8) | + (pktin.body[15+i+j]); + MD5Update(&md5c, keystr2, hostkey.bytes); MD5Update(&md5c, keystr1, servkey.bytes); MD5Update(&md5c, pktin.body, 8); @@ -314,8 +319,15 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) { rsaencrypt(rsabuf, hostkey.bytes, &servkey); } + cipher_type = cfg.cipher == CIPHER_BLOWFISH ? SSH_CIPHER_BLOWFISH : + SSH_CIPHER_3DES; + if ((supported_ciphers_mask & (1 << cipher_type)) == 0) { + c_write("Selected cipher not supported, falling back to 3DES\r\n", 53); + cipher_type = SSH_CIPHER_3DES; + } + s_wrpkt_start(3, len+15); - pktout.body[0] = 3; /* SSH_CIPHER_3DES */ + pktout.body[0] = cipher_type; memcpy(pktout.body+1, cookie, 8); pktout.body[9] = (len*8) >> 8; pktout.body[10] = (len*8) & 0xFF; @@ -326,7 +338,8 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) { free(rsabuf); - cipher = &ssh_3des; + cipher = cipher_type == SSH_CIPHER_BLOWFISH ? &ssh_blowfish : + &ssh_3des; cipher->sesskey(session_key); do { crReturnV; } while (!ispkt); @@ -477,9 +490,10 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) { long len = 0; for (i = 0; i < 4; i++) len = (len << 8) + pktin.body[i]; - c_write((char *)pktin.body+4, len); + c_write(pktin.body+4, len); } else if (pktin.type == 1) { - /* SSH_MSG_DISCONNECT: do nothing */ + /* SSH_MSG_DISCONNECT */ + ssh_state = SSH_STATE_CLOSED; } else if (pktin.type == 14) { /* SSH_MSG_SUCCESS: may be from EXEC_SHELL on some servers */ } else if (pktin.type == 15) { @@ -648,6 +662,7 @@ static int ssh_msg (WPARAM wParam, LPARAM lParam) { return 1; case FD_CLOSE: s = INVALID_SOCKET; + ssh_state = SSH_STATE_CLOSED; return 0; } return 1; /* shouldn't happen, but WTF */ @@ -669,6 +684,7 @@ static void ssh_send (char *buf, int len) { static void ssh_size(void) { switch (ssh_state) { case SSH_STATE_BEFORE_SIZE: + case SSH_STATE_CLOSED: break; /* do nothing */ case SSH_STATE_INTERMED: size_needed = TRUE; /* buffer for later */ diff --git a/ssh.h b/ssh.h index 5c72eeb1..a252ef83 100644 --- a/ssh.h +++ b/ssh.h @@ -1,5 +1,9 @@ #include +#define SSH_CIPHER_IDEA 1 +#define SSH_CIPHER_3DES 3 +#define SSH_CIPHER_BLOWFISH 6 + struct RSAKey { int bits; int bytes; diff --git a/sshblowf.c b/sshblowf.c new file mode 100644 index 00000000..1bf64adb --- /dev/null +++ b/sshblowf.c @@ -0,0 +1,415 @@ +/* + * Blowfish implementation for PuTTY. + * + * Coded from scratch from the algorithm description, apart from + * the S and P boxes which are from Bruce Schneier's own + * implementation. + */ + +#include +#include +#include "ssh.h" + +typedef struct { + word32 S0[256], S1[256], S2[256], S3[256], P[18]; + word32 iv0, iv1; /* for CBC mode */ +} BlowfishContext; + +#define GET_32BIT_LSB_FIRST(cp) \ + (((unsigned long)(unsigned char)(cp)[0]) | \ + ((unsigned long)(unsigned char)(cp)[1] << 8) | \ + ((unsigned long)(unsigned char)(cp)[2] << 16) | \ + ((unsigned long)(unsigned char)(cp)[3] << 24)) + +#define PUT_32BIT_LSB_FIRST(cp, value) do { \ + (cp)[0] = (value); \ + (cp)[1] = (value) >> 8; \ + (cp)[2] = (value) >> 16; \ + (cp)[3] = (value) >> 24; } while (0) + +/* + * The Blowfish init data, straight from Bruce Schneier's reference + * implementation. + */ +word32 sbox0[] = { +0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, +0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, +0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658, +0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013, +0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e, +0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60, +0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6, +0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a, +0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c, +0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193, +0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1, +0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239, +0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a, +0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3, +0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176, +0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe, +0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706, +0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b, +0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b, +0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463, +0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c, +0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3, +0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a, +0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8, +0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760, +0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db, +0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8, +0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b, +0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33, +0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4, +0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0, +0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c, +0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777, +0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299, +0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705, +0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf, +0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e, +0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa, +0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9, +0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915, +0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, +0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, +0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076aL}; + +word32 sbox1[] = { +0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, +0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, +0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65, +0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1, +0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9, +0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737, +0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d, +0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd, +0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc, +0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41, +0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908, +0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af, +0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124, +0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c, +0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908, +0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd, +0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b, +0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e, +0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa, +0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a, +0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d, +0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66, +0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5, +0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84, +0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96, +0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14, +0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca, +0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7, +0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77, +0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99, +0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054, +0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73, +0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea, +0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105, +0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646, +0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285, +0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea, +0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb, +0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e, +0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc, +0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, +0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, +0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7L}; + +word32 sbox2[] = { +0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, +0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, +0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af, +0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504, +0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4, +0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee, +0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec, +0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b, +0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332, +0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527, +0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58, +0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c, +0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22, + +0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17, +0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60, +0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115, +0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99, +0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0, +0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74, +0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d, +0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3, +0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3, +0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979, +0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c, +0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa, +0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a, +0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086, +0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc, +0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24, +0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2, +0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84, +0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c, +0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09, +0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10, +0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe, +0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027, +0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0, +0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634, +0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188, +0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc, +0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, +0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, +0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0L}; + +word32 sbox3[] = { +0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, +0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, +0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79, +0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6, +0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a, +0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4, +0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1, +0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59, +0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797, +0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28, +0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6, +0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28, +0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba, +0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a, +0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5, +0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f, +0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce, +0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680, +0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd, +0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb, +0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb, +0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370, +0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc, +0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048, +0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc, +0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9, +0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a, +0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f, +0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a, +0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1, +0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b, +0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e, +0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e, +0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f, +0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623, +0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc, +0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a, +0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6, +0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3, +0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060, +0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, +0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, +0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6L}; + +word32 parray[] = { +0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0, +0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c, +0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1bL}; + +#define Fprime(a,b,c,d) ( ( (S0[a] + S1[b]) ^ S2[c] ) + S3[d] ) +#define F(x) Fprime( ((x>>24)&0xFF), ((x>>16)&0xFF), ((x>>8)&0xFF), (x&0xFF) ) +#define ROUND(n) ( xL ^= P[n], t = xL, xL = F(xL) ^ xR, xR = t ) + +static void blowfish_encrypt(word32 xL, word32 xR, word32 *output, + BlowfishContext *ctx) { + word32 *S0 = ctx->S0; + word32 *S1 = ctx->S1; + word32 *S2 = ctx->S2; + word32 *S3 = ctx->S3; + word32 *P = ctx->P; + word32 t; + + ROUND(0); + ROUND(1); + ROUND(2); + ROUND(3); + ROUND(4); + ROUND(5); + ROUND(6); + ROUND(7); + ROUND(8); + ROUND(9); + ROUND(10); + ROUND(11); + ROUND(12); + ROUND(13); + ROUND(14); + ROUND(15); + xL ^= P[16]; + xR ^= P[17]; + + output[0] = xR; + output[1] = xL; +} + +static void blowfish_decrypt(word32 xL, word32 xR, word32 *output, + BlowfishContext *ctx) { + word32 *S0 = ctx->S0; + word32 *S1 = ctx->S1; + word32 *S2 = ctx->S2; + word32 *S3 = ctx->S3; + word32 *P = ctx->P; + word32 t; + + ROUND(17); + ROUND(16); + ROUND(15); + ROUND(14); + ROUND(13); + ROUND(12); + ROUND(11); + ROUND(10); + ROUND(9); + ROUND(8); + ROUND(7); + ROUND(6); + ROUND(5); + ROUND(4); + ROUND(3); + ROUND(2); + xL ^= P[1]; + xR ^= P[0]; + + output[0] = xR; + output[1] = xL; +} + +static void blowfish_encrypt_cbc(unsigned char *blk, int len, + BlowfishContext *ctx) { + word32 xL, xR, out[2], iv0, iv1; + + assert((len & 7) == 0); + + iv0 = ctx->iv0; iv1 = ctx->iv1; + + while (len > 0) { + xL = GET_32BIT_LSB_FIRST(blk); + xR = GET_32BIT_LSB_FIRST(blk+4); + iv0 ^= xL; + iv1 ^= xR; + blowfish_encrypt(iv0, iv1, out, ctx); + iv0 = out[0]; + iv1 = out[1]; + PUT_32BIT_LSB_FIRST(blk, iv0); + PUT_32BIT_LSB_FIRST(blk+4, iv1); + blk += 8; + len -= 8; + } + + ctx->iv0 = iv0; ctx->iv1 = iv1; +} + +static void blowfish_decrypt_cbc(unsigned char *blk, int len, + BlowfishContext *ctx) { + word32 xL, xR, out[2], iv0, iv1; + + assert((len & 7) == 0); + + iv0 = ctx->iv0; iv1 = ctx->iv1; + + while (len > 0) { + xL = GET_32BIT_LSB_FIRST(blk); + xR = GET_32BIT_LSB_FIRST(blk+4); + blowfish_decrypt(xL, xR, out, ctx); + iv0 ^= out[0]; + iv1 ^= out[1]; + PUT_32BIT_LSB_FIRST(blk, iv0); + PUT_32BIT_LSB_FIRST(blk+4, iv1); + iv0 = xL; + iv1 = xR; + blk += 8; + len -= 8; + } + + ctx->iv0 = iv0; ctx->iv1 = iv1; +} + +static void blowfish_setkey(BlowfishContext *ctx, + const unsigned char *key, short keybytes) { + word32 *S0 = ctx->S0; + word32 *S1 = ctx->S1; + word32 *S2 = ctx->S2; + word32 *S3 = ctx->S3; + word32 *P = ctx->P; + word32 str[2]; + int i; + + for (i = 0; i < 18; i++) { + P[i] = parray[i]; + P[i] ^= ((word32)(unsigned char)(key[ (i*4+0) % keybytes ])) << 24; + P[i] ^= ((word32)(unsigned char)(key[ (i*4+1) % keybytes ])) << 16; + P[i] ^= ((word32)(unsigned char)(key[ (i*4+2) % keybytes ])) << 8; + P[i] ^= ((word32)(unsigned char)(key[ (i*4+3) % keybytes ])); + } + + for (i = 0; i < 256; i++) { + S0[i] = sbox0[i]; + S1[i] = sbox1[i]; + S2[i] = sbox2[i]; + S3[i] = sbox3[i]; + } + + str[0] = str[1] = 0; + + for (i = 0; i < 18; i += 2) { + blowfish_encrypt(str[0], str[1], str, ctx); + P[i] = str[0]; P[i+1] = str[1]; + } + + for (i = 0; i < 256; i += 2) { + blowfish_encrypt(str[0], str[1], str, ctx); + S0[i] = str[0]; S0[i+1] = str[1]; + } + for (i = 0; i < 256; i += 2) { + blowfish_encrypt(str[0], str[1], str, ctx); + S1[i] = str[0]; S1[i+1] = str[1]; + } + for (i = 0; i < 256; i += 2) { + blowfish_encrypt(str[0], str[1], str, ctx); + S2[i] = str[0]; S2[i+1] = str[1]; + } + for (i = 0; i < 256; i += 2) { + blowfish_encrypt(str[0], str[1], str, ctx); + S3[i] = str[0]; S3[i+1] = str[1]; + } +} + +/* -- Interface with PuTTY -- */ + +#define SSH_SESSION_KEY_LENGTH 32 +static BlowfishContext ectx, dctx; + +static void blowfish_sesskey(unsigned char *key) +{ + blowfish_setkey(&ectx, key, SSH_SESSION_KEY_LENGTH); + ectx.iv0 = 0; + ectx.iv1 = 0; + dctx = ectx; +} + +static void blowfish_encrypt_blk(unsigned char *blk, int len) +{ + blowfish_encrypt_cbc(blk, len, &ectx); +} + +static void blowfish_decrypt_blk(unsigned char *blk, int len) +{ + blowfish_decrypt_cbc(blk, len, &dctx); +} + +struct ssh_cipher ssh_blowfish = { + blowfish_sesskey, + blowfish_encrypt_blk, + blowfish_decrypt_blk +}; diff --git a/sshrand.c b/sshrand.c index 17ef6e34..b3bd08bf 100644 --- a/sshrand.c +++ b/sshrand.c @@ -52,8 +52,8 @@ void random_add_noise(void *noise, int length) { pool.incomingpos = 0; } - memcpy(pool.incomingb, p, length); - pool.incomingpos = length; + memcpy(pool.incomingb + pool_incomingpos, p, length); + pool.incomingpos += length; } void random_stir(void) { @@ -121,7 +121,7 @@ void random_stir(void) { * there'll be some extra bizarreness there. */ SHATransform(digest, block); - memcpy(digest, pool.incoming, sizeof(digest)); + memcpy(pool.incoming, digest, sizeof(digest)); pool.poolpos = sizeof(pool.incoming); } @@ -137,8 +137,8 @@ static void random_add_heavynoise(void *noise, int length) { pool.poolpos = 0; } - memcpy(pool.pool, p, length); - pool.poolpos = length; + memcpy(pool.pool + pool.poolpos, p, length); + pool.poolpos += length; } void random_init(void) { diff --git a/sshrsa.c b/sshrsa.c index 70cf9bbe..71e1d634 100644 --- a/sshrsa.c +++ b/sshrsa.c @@ -1,13 +1,10 @@ /* * RSA implementation just sufficient for ssh client-side * initialisation step + * + * Rewritten for more speed by Joris van Rantwijk, Jun 1999. */ -/*#include -#define RSADEBUG -#define DLVL 2 -#include "stel.h"*/ - #include #include #include @@ -57,193 +54,187 @@ static void freebn(Bignum b) { free(b); } -static int msb(Bignum r) { - int i; - int j; - unsigned short n; - - for (i=r[0]; i>0; i--) - if (r[i]) - break; - - j = (i-1)*16; - n = r[i]; - if (n & 0xFF00) j += 8, n >>= 8; - if (n & 0x00F0) j += 4, n >>= 4; - if (n & 0x000C) j += 2, n >>= 2; - if (n & 0x0002) j += 1, n >>= 1; - - return j; -} - -static void add(Bignum r1, Bignum r2, Bignum result) { - int i; - long stuff = 0; - - enter((">add\n")); - debug(r1); - debug(r2); - - for (i = 1 ;; i++) { - if (i <= r1[0]) - stuff += r1[i]; - if (i <= r2[0]) - stuff += r2[i]; - if (i <= result[0]) - result[i] = stuff & 0xFFFFU; - if (i > r1[0] && i > r2[0] && i >= result[0]) - break; - stuff >>= 16; +/* + * Compute c = a * b. + * Input is in the first len words of a and b. + * Result is returned in the first 2*len words of c. + */ +static void bigmul(unsigned short *a, unsigned short *b, unsigned short *c, + int len) +{ + int i, j; + unsigned long ai, t; + + for (j = len - 1; j >= 0; j--) + c[j+len] = 0; + + for (i = len - 1; i >= 0; i--) { + ai = a[i]; + t = 0; + for (j = len - 1; j >= 0; j--) { + t += ai * (unsigned long) b[j]; + t += (unsigned long) c[i+j+1]; + c[i+j+1] = (unsigned short)t; + t = t >> 16; + } + c[i] = (unsigned short)t; } - - debug(result); - leave(("sub\n")); - debug(r1); - debug(r2); - - for (i = 1 ;; i++) { - if (i <= r1[0]) - stuff += r1[i]; - if (i <= r2[0]) - stuff -= r2[i]; - if (i <= result[0]) - result[i] = stuff & 0xFFFFU; - if (i > r1[0] && i > r2[0] && i >= result[0]) - break; - stuff = stuff<0 ? -1 : 0; +/* + * Compute a = a % m. + * Input in first 2*len words of a and first len words of m. + * Output in first 2*len words of a (of which first len words will be zero). + * The MSW of m MUST have its high bit set. + */ +static void bigmod(unsigned short *a, unsigned short *m, int len) +{ + unsigned short m0, m1; + unsigned int h; + int i, k; + + /* Special case for len == 1 */ + if (len == 1) { + a[1] = (((long) a[0] << 16) + a[1]) % m[0]; + a[0] = 0; + return; } - debug(result); - leave(("ge\n")); - debug(r1); - debug(r2); - - if (r1[0] < r2[0]) - i = r2[0]; - else - i = r1[0]; - - while (i > 0) { - unsigned short n1 = (i > r1[0] ? 0 : r1[i]); - unsigned short n2 = (i > r2[0] ? 0 : r2[i]); - - if (n1 > n2) { - dmsg(("greater\n")); - leave((" r2 */ - } else if (n1 < n2) { - dmsg(("less\n")); - leave((" ((unsigned long) r << 16) + a[i+1]) { + q--; + t -= m1; + r = (r + m0) & 0xffff; /* overflow? */ + if (r >= m0 && t > ((unsigned long) r << 16) + a[i+1]) + q--; + } -static void modmult(Bignum r1, Bignum r2, Bignum modulus, Bignum result) { - Bignum temp = newbn(modulus[0]+1); - Bignum tmp2 = newbn(modulus[0]+1); - int i; - int bit, bits, digit, smallbit; - - enter((">modmult\n")); - debug(r1); - debug(r2); - debug(modulus); - - for (i=1; i<=result[0]; i++) - result[i] = 0; /* result := 0 */ - for (i=1; i<=temp[0]; i++) - temp[i] = (i > r2[0] ? 0 : r2[i]); /* temp := r2 */ - - bits = 1+msb(r1); - - for (bit = 0; bit < bits; bit++) { - digit = 1 + bit / 16; - smallbit = bit % 16; - - debug(temp); - if (digit <= r1[0] && (r1[digit] & (1<= 0; k--) { + t = (long) q * (long) m[k]; + t += c; + c = t >> 16; + if ((unsigned short) t > a[i+k]) c++; + a[i+k] -= (unsigned short) t; } - add(temp, temp, tmp2); - if (ge(tmp2, modulus)) - sub(tmp2, modulus, temp); - else - add(tmp2, Zero, temp); + /* Add back m in case of borrow */ + if (c != h) { + t = 0; + for (k = len - 1; k >= 0; k--) { + t += m[k]; + t += a[i+k]; + a[i+k] = (unsigned short)t; + t = t >> 16; + } + } } +} - freebn(temp); - freebn(tmp2); +/* + * Compute (base ^ exp) % mod. + * The base MUST be smaller than the modulus. + * The most significant word of mod MUST be non-zero. + * We assume that the result array is the same size as the mod array. + */ +static void modpow(Bignum base, Bignum exp, Bignum mod, Bignum result) +{ + unsigned short *a, *b, *n, *m; + int mshift; + int mlen, i, j; + + /* Allocate m of size mlen, copy mod to m */ + /* We use big endian internally */ + mlen = mod[0]; + m = malloc(mlen * sizeof(unsigned short)); + for (j = 0; j < mlen; j++) m[j] = mod[mod[0] - j]; + + /* Shift m left to make msb bit set */ + for (mshift = 0; mshift < 15; mshift++) + if ((m[0] << mshift) & 0x8000) break; + if (mshift) { + for (i = 0; i < mlen - 1; i++) + m[i] = (m[i] << mshift) | (m[i+1] >> (16-mshift)); + m[mlen-1] = m[mlen-1] << mshift; + } - debug(result); - leave(("modpow\n")); - debug(r1); - debug(r2); - debug(modulus); - - for (i=1; i<=result[0]; i++) - result[i] = (i==1); /* result := 1 */ - for (i=1; i<=temp[0]; i++) - temp[i] = (i > r1[0] ? 0 : r1[i]); /* temp := r1 */ - - bits = 1+msb(r2); - - for (bit = 0; bit < bits; bit++) { - digit = 1 + bit / 16; - smallbit = bit % 16; - - debug(temp); - if (digit <= r2[0] && (r2[digit] & (1<= 0) { + bigmul(a + mlen, a + mlen, b, mlen); + bigmod(b, m, mlen); + if ((exp[exp[0] - i] & (1 << j)) != 0) { + bigmul(b + mlen, n, a, mlen); + bigmod(a, m, mlen); + } else { + unsigned short *t; + t = a; a = b; b = t; + } + j--; } + i++; j = 15; + } - modmult(temp, temp, modulus, tmp2); - add(tmp2, Zero, temp); + /* Fixup result in case the modulus was shifted */ + if (mshift) { + for (i = mlen - 1; i < 2*mlen - 1; i++) + a[i] = (a[i] << mshift) | (a[i+1] >> (16-mshift)); + a[2*mlen-1] = a[2*mlen-1] << mshift; + bigmod(a, m, mlen); + for (i = 2*mlen - 1; i >= mlen; i--) + a[i] = (a[i] >> mshift) | (a[i-1] << (16-mshift)); } - freebn(temp); - freebn(tmp2); + /* Copy result to buffer */ + for (i = 0; i < mlen; i++) + result[result[0] - i] = a[i+mlen]; - debug(result); - leave((" #include -#include "putty.h" #include "ssh.h" +#include "putty.h" #include "win_res.h" #define NPANELS 7 @@ -42,8 +42,6 @@ static void mungestr(char *in, char *out) { } static void unmungestr(char *in, char *out) { - int candot = 0; - while (*in) { if (*in == '%' && in[1] && in[2]) { int i, j; @@ -95,17 +93,13 @@ static void gppi(HKEY key, LPCTSTR name, int def, int *i) { *i = val; } -typedef struct { - void *posn; - void *temp; - char dataspace[2048]; -} DTemplate; - static HINSTANCE hinst; static char **sessions; static int nsessions; +static int readytogo; + static void save_settings (char *section, int do_host) { int i; HKEY subkey1, sesskey; @@ -153,6 +147,8 @@ static void save_settings (char *section, int do_host) { } wpps (sesskey, "UserName", cfg.username); wppi (sesskey, "NoPTY", cfg.nopty); + wpps (sesskey, "Cipher", cfg.cipher == CIPHER_BLOWFISH ? "blowfish" : + "3des"); wppi (sesskey, "RFCEnviron", cfg.rfc_environ); wppi (sesskey, "BackspaceIsDelete", cfg.bksp_is_delete); wppi (sesskey, "RXVTHomeEnd", cfg.rxvt_homeend); @@ -217,14 +213,17 @@ static void load_settings (char *section, int do_host) { p = malloc(3*strlen(section)+1); mungestr(section, p); - - if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS || - RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) { + + if (RegOpenKey(HKEY_CURRENT_USER, puttystr, &subkey1) != ERROR_SUCCESS) { sesskey = NULL; + } else { + if (RegOpenKey(subkey1, p, &sesskey) != ERROR_SUCCESS) { + sesskey = NULL; + } + RegCloseKey(subkey1); } free(p); - RegCloseKey(subkey1); if (do_host) { char prot[10]; @@ -265,6 +264,14 @@ static void load_settings (char *section, int do_host) { } gpps (sesskey, "UserName", "", cfg.username, sizeof(cfg.username)); gppi (sesskey, "NoPTY", 0, &cfg.nopty); + { + char cipher[10]; + gpps (sesskey, "Cipher", "3des", cipher, 10); + if (!strcmp(cipher, "blowfish")) + cfg.cipher = CIPHER_BLOWFISH; + else + cfg.cipher = CIPHER_3DES; + } gppi (sesskey, "RFCEnviron", 0, &cfg.rfc_environ); gppi (sesskey, "BackspaceIsDelete", 1, &cfg.bksp_is_delete); gppi (sesskey, "RXVTHomeEnd", 0, &cfg.rxvt_homeend); @@ -361,6 +368,27 @@ static int CALLBACK LogProc (HWND hwnd, UINT msg, return 0; } +static int CALLBACK LicenceProc (HWND hwnd, UINT msg, + WPARAM wParam, LPARAM lParam) { + switch (msg) { + case WM_INITDIALOG: + return 1; + case WM_COMMAND: + switch (LOWORD(wParam)) { + case IDOK: + abtbox = NULL; + DestroyWindow (hwnd); + return 0; + } + return 0; + case WM_CLOSE: + abtbox = NULL; + DestroyWindow (hwnd); + return 0; + } + return 0; +} + static int CALLBACK AboutProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -381,7 +409,7 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg, case IDA_LICENCE: EnableWindow(hwnd, 0); DialogBox (hinst, MAKEINTRESOURCE(IDD_LICENCEBOX), - NULL, AboutProc); + NULL, LicenceProc); EnableWindow(hwnd, 1); return 0; } @@ -428,6 +456,15 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, cfg.protocol==PROT_SSH ? IDC0_PROTSSH : IDC0_PROTTELNET); CheckDlgButton (hwnd, IDC0_CLOSEEXIT, cfg.close_on_exit); break; + case WM_LBUTTONUP: + /* + * Button release should trigger WM_OK if there was a + * previous double click on the session list. + */ + ReleaseCapture(); + if (readytogo) + SendMessage (GetParent(hwnd), WM_COMMAND, IDOK, 0); + break; case WM_COMMAND: switch (LOWORD(wParam)) { case IDC0_PROTTELNET: @@ -525,8 +562,10 @@ static int CALLBACK ConnectionProc (HWND hwnd, UINT msg, * Unless it's Default Settings or some other * host-less set of saved settings. */ - if (*cfg.host) - SendMessage (GetParent(hwnd), WM_COMMAND, IDOK, 0); + if (*cfg.host) { + readytogo = TRUE; + SetCapture(hwnd); + } } break; case IDC0_SESSDEL: @@ -834,6 +873,9 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg, SetDlgItemText (hwnd, IDC3_TTEDIT, cfg.termtype); SetDlgItemText (hwnd, IDC3_LOGEDIT, cfg.username); CheckDlgButton (hwnd, IDC3_NOPTY, cfg.nopty); + CheckRadioButton (hwnd, IDC3_CIPHER3DES, IDC3_CIPHERBLOWF, + cfg.cipher == CIPHER_BLOWFISH ? IDC3_CIPHERBLOWF : + IDC3_CIPHER3DES); break; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -852,6 +894,16 @@ static int CALLBACK SshProc (HWND hwnd, UINT msg, HIWORD(wParam) == BN_DOUBLECLICKED) cfg.nopty = IsDlgButtonChecked (hwnd, IDC3_NOPTY); break; + case IDC3_CIPHER3DES: + case IDC3_CIPHERBLOWF: + if (HIWORD(wParam) == BN_CLICKED || + HIWORD(wParam) == BN_DOUBLECLICKED) { + if (IsDlgButtonChecked (hwnd, IDC3_CIPHER3DES)) + cfg.cipher = CIPHER_3DES; + else if (IsDlgButtonChecked (hwnd, IDC3_CIPHERBLOWF)) + cfg.cipher = CIPHER_BLOWFISH; + } + break; } break; } @@ -1031,7 +1083,6 @@ static int CALLBACK ColourProc (HWND hwnd, UINT msg, return GeneralPanelProc (hwnd, msg, wParam, lParam); } -static DTemplate negot, main, reconf, panels[NPANELS]; static DLGPROC panelproc[NPANELS] = { ConnectionProc, KeyboardProc, TerminalProc, TelnetProc, SshProc, SelectionProc, ColourProc diff --git a/window.c b/window.c index 829abe79..e8c45154 100644 --- a/window.c +++ b/window.c @@ -163,7 +163,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) { wndclass.hInstance = inst; wndclass.hIcon = LoadIcon (inst, MAKEINTRESOURCE(IDI_MAINICON)); - wndclass.hCursor = LoadCursor (NULL, IDC_ARROW); + wndclass.hCursor = LoadCursor (NULL, IDC_IBEAM); wndclass.hbrBackground = GetStockObject (BLACK_BRUSH); wndclass.lpszMenuName = NULL; wndclass.lpszClassName = appname; @@ -727,8 +727,8 @@ static int WINAPI WndProc (HWND hwnd, UINT message, term_mouse (cfg.mouse_is_xterm ? MB_PASTE : MB_EXTEND, MA_RELEASE, TO_CHR_X(X_POS(lParam)), TO_CHR_Y(Y_POS(lParam))); - return 0; ReleaseCapture(); + return 0; case WM_RBUTTONDOWN: SetCapture(hwnd); click (cfg.mouse_is_xterm ? MB_EXTEND : MB_PASTE, @@ -953,6 +953,33 @@ static int WINAPI WndProc (HWND hwnd, UINT message, back->send (buf, len); } return 0; + case WM_KEYUP: + case WM_SYSKEYUP: + /* + * We handle KEYUP ourselves in order to distinghish left + * and right Alt or Control keys, which Windows won't do + * right if left to itself. See also the special processing + * at the top of TranslateKey. + */ + { + BYTE keystate[256]; + int ret = GetKeyboardState(keystate); + if (ret && wParam == VK_MENU) { + if (lParam & 0x1000000) keystate[VK_RMENU] = 0; + else keystate[VK_LMENU] = 0; + SetKeyboardState (keystate); + } + if (ret && wParam == VK_CONTROL) { + if (lParam & 0x1000000) keystate[VK_RCONTROL] = 0; + else keystate[VK_LCONTROL] = 0; + SetKeyboardState (keystate); + } + } + /* + * We don't return here, in order to allow Windows to do + * its own KEYUP processing as well. + */ + break; case WM_CHAR: case WM_SYSCHAR: /* @@ -1116,12 +1143,7 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) { unsigned char *p = output; BYTE keystate[256]; int ret, code; - - /* - * Prepend ESC if ALT was pressed at the time. - */ - if (lParam & 0x20000000) - *p++ = 0x1B; + int cancel_alt = FALSE; /* * Get hold of the keyboard state, because we'll need it a few @@ -1129,6 +1151,33 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) { */ ret = GetKeyboardState(keystate); + /* + * Windows does not always want to distinguish left and right + * Alt or Control keys. Thus we keep track of them ourselves. + * See also the WM_KEYUP handler. + */ + if (wParam == VK_MENU) { + if (lParam & 0x1000000) keystate[VK_RMENU] = 0x80; + else keystate[VK_LMENU] = 0x80; + SetKeyboardState (keystate); + return 0; + } + if (wParam == VK_CONTROL) { + if (lParam & 0x1000000) keystate[VK_RCONTROL] = 0x80; + else keystate[VK_LCONTROL] = 0x80; + SetKeyboardState (keystate); + return 0; + } + + /* + * Prepend ESC, and cancel ALT, if ALT was pressed at the time + * and it wasn't AltGr. + */ + if (lParam & 0x20000000 && (keystate[VK_LMENU] & 0x80)) { + *p++ = 0x1B; + cancel_alt = TRUE; + } + /* * Shift-PgUp, Shift-PgDn, and Alt-F4 all produce window * events: we'll deal with those now. @@ -1212,13 +1261,16 @@ static int TranslateKey(WPARAM wParam, LPARAM lParam, unsigned char *output) { } /* - * Before doing Windows charmap translation, remove ALT from - * the keymap, since its sole effect should be to prepend ESC, - * which we've already done. Note that removal of ALT has to - * happen _after_ the above call to SetKeyboardState, or dire - * things will befall. + * Before doing Windows charmap translation, remove LeftALT + * from the keymap, since its sole effect should be to prepend + * ESC, which we've already done. Note that removal of LeftALT + * has to happen _after_ the above call to SetKeyboardState, or + * dire things will befall. */ - keystate[VK_MENU] = keystate[VK_LMENU] = keystate[VK_RMENU] = 0; + if (cancel_alt) { + keystate[VK_MENU] = keystate[VK_RMENU]; + keystate[VK_LMENU] = 0; + } /* * Attempt the Windows char-map translation. @@ -1360,7 +1412,7 @@ void set_sbar (int total, int start, int page) { SetScrollInfo (hwnd, SB_VERT, &si, TRUE); } -Context get_ctx() { +Context get_ctx(void) { HDC hdc; if (hwnd) { hdc = GetDC (hwnd); @@ -1488,11 +1540,10 @@ void get_clip (void **p, int *len) { */ void optimised_move (int to, int from, int lines) { RECT r; - int min, max, d; + int min, max; min = (to < from ? to : from); max = to + from - min; - d = max - min; r.left = 0; r.right = cols * font_width; r.top = min * font_height; r.bottom = (max+lines) * font_height; -- 2.45.2