/[rdesktop]/sourceforge.net/trunk/rdesktop/secure.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/secure.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 32 by matty, Sat Sep 15 09:37:17 2001 UTC revision 64 by astrand, Thu Jul 18 16:38:31 2002 UTC
# Line 43  static int rc4_key_len; Line 43  static int rc4_key_len;
43  static RC4_KEY rc4_decrypt_key;  static RC4_KEY rc4_decrypt_key;
44  static RC4_KEY rc4_encrypt_key;  static RC4_KEY rc4_encrypt_key;
45    
46  static uint8 sec_sign_key[8];  static uint8 sec_sign_key[16];
47  static uint8 sec_decrypt_key[16];  static uint8 sec_decrypt_key[16];
48  static uint8 sec_encrypt_key[16];  static uint8 sec_encrypt_key[16];
49  static uint8 sec_decrypt_update_key[8];  static uint8 sec_decrypt_update_key[16];
50  static uint8 sec_encrypt_update_key[8];  static uint8 sec_encrypt_update_key[16];
51  static uint8 sec_crypted_random[64];  static uint8 sec_crypted_random[SEC_MODULUS_SIZE];
52    
53  /*  /*
54   * General purpose 48-byte transformation, using two 32-byte salts (generally,   * General purpose 48-byte transformation, using two 32-byte salts (generally,
# Line 56  static uint8 sec_crypted_random[64]; Line 56  static uint8 sec_crypted_random[64];
56   * Both SHA1 and MD5 algorithms are used.   * Both SHA1 and MD5 algorithms are used.
57   */   */
58  void  void
59  sec_hash_48(uint8 *out, uint8 *in, uint8 *salt1, uint8 *salt2, uint8 salt)  sec_hash_48(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2, uint8 salt)
60  {  {
61          uint8 shasig[20];          uint8 shasig[20];
62          uint8 pad[4];          uint8 pad[4];
# Line 87  sec_hash_48(uint8 *out, uint8 *in, uint8 Line 87  sec_hash_48(uint8 *out, uint8 *in, uint8
87   * only using a single round of MD5.   * only using a single round of MD5.
88   */   */
89  void  void
90  sec_hash_16(uint8 *out, uint8 *in, uint8 *salt1, uint8 *salt2)  sec_hash_16(uint8 * out, uint8 * in, uint8 * salt1, uint8 * salt2)
91  {  {
92          MD5_CTX md5;          MD5_CTX md5;
93    
# Line 100  sec_hash_16(uint8 *out, uint8 *in, uint8 Line 100  sec_hash_16(uint8 *out, uint8 *in, uint8
100    
101  /* Reduce key entropy from 64 to 40 bits */  /* Reduce key entropy from 64 to 40 bits */
102  static void  static void
103  sec_make_40bit(uint8 *key)  sec_make_40bit(uint8 * key)
104  {  {
105          key[0] = 0xd1;          key[0] = 0xd1;
106          key[1] = 0x26;          key[1] = 0x26;
# Line 109  sec_make_40bit(uint8 *key) Line 109  sec_make_40bit(uint8 *key)
109    
110  /* Generate a session key and RC4 keys, given client and server randoms */  /* Generate a session key and RC4 keys, given client and server randoms */
111  static void  static void
112  sec_generate_keys(uint8 *client_key, uint8 *server_key, int rc4_key_size)  sec_generate_keys(uint8 * client_key, uint8 * server_key, int rc4_key_size)
113  {  {
114          uint8 session_key[48];          uint8 session_key[48];
115          uint8 temp_hash[48];          uint8 temp_hash[48];
# Line 123  sec_generate_keys(uint8 *client_key, uin Line 123  sec_generate_keys(uint8 *client_key, uin
123          sec_hash_48(temp_hash, input, client_key, server_key, 65);          sec_hash_48(temp_hash, input, client_key, server_key, 65);
124          sec_hash_48(session_key, temp_hash, client_key, server_key, 88);          sec_hash_48(session_key, temp_hash, client_key, server_key, 88);
125    
126          /* Store first 8 bytes of session key, for generating signatures */          /* Store first 16 bytes of session key, for generating signatures */
127          memcpy(sec_sign_key, session_key, 8);          memcpy(sec_sign_key, session_key, 16);
128    
129          /* Generate RC4 keys */          /* Generate RC4 keys */
130          sec_hash_16(sec_decrypt_key, &session_key[16], client_key,          sec_hash_16(sec_decrypt_key, &session_key[16], client_key,
# Line 146  sec_generate_keys(uint8 *client_key, uin Line 146  sec_generate_keys(uint8 *client_key, uin
146                  rc4_key_len = 16;                  rc4_key_len = 16;
147          }          }
148    
149          /* Store first 8 bytes of RC4 keys as update keys */          /* Save initial RC4 keys as update keys */
150          memcpy(sec_decrypt_update_key, sec_decrypt_key, 8);          memcpy(sec_decrypt_update_key, sec_decrypt_key, 16);
151          memcpy(sec_encrypt_update_key, sec_encrypt_key, 8);          memcpy(sec_encrypt_update_key, sec_encrypt_key, 16);
152    
153          /* Initialise RC4 state arrays */          /* Initialise RC4 state arrays */
154          RC4_set_key(&rc4_decrypt_key, rc4_key_len, sec_decrypt_key);          RC4_set_key(&rc4_decrypt_key, rc4_key_len, sec_decrypt_key);
# Line 171  static uint8 pad_92[48] = { Line 171  static uint8 pad_92[48] = {
171    
172  /* Output a uint32 into a buffer (little-endian) */  /* Output a uint32 into a buffer (little-endian) */
173  void  void
174  buf_out_uint32(uint8 *buffer, uint32 value)  buf_out_uint32(uint8 * buffer, uint32 value)
175  {  {
176          buffer[0] = (value) & 0xff;          buffer[0] = (value) & 0xff;
177          buffer[1] = (value >> 8) & 0xff;          buffer[1] = (value >> 8) & 0xff;
# Line 181  buf_out_uint32(uint8 *buffer, uint32 val Line 181  buf_out_uint32(uint8 *buffer, uint32 val
181    
182  /* Generate a signature hash, using a combination of SHA1 and MD5 */  /* Generate a signature hash, using a combination of SHA1 and MD5 */
183  void  void
184  sec_sign(uint8 *signature, uint8 *session_key, int length,  sec_sign(uint8 * signature, int siglen, uint8 * session_key, int keylen,
185           uint8 *data, int datalen)           uint8 * data, int datalen)
186  {  {
187          uint8 shasig[20];          uint8 shasig[20];
188          uint8 md5sig[16];          uint8 md5sig[16];
# Line 193  sec_sign(uint8 *signature, uint8 *sessio Line 193  sec_sign(uint8 *signature, uint8 *sessio
193          buf_out_uint32(lenhdr, datalen);          buf_out_uint32(lenhdr, datalen);
194    
195          SHA1_Init(&sha);          SHA1_Init(&sha);
196          SHA1_Update(&sha, session_key, length);          SHA1_Update(&sha, session_key, keylen);
197          SHA1_Update(&sha, pad_54, 40);          SHA1_Update(&sha, pad_54, 40);
198          SHA1_Update(&sha, lenhdr, 4);          SHA1_Update(&sha, lenhdr, 4);
199          SHA1_Update(&sha, data, datalen);          SHA1_Update(&sha, data, datalen);
200          SHA1_Final(shasig, &sha);          SHA1_Final(shasig, &sha);
201    
202          MD5_Init(&md5);          MD5_Init(&md5);
203          MD5_Update(&md5, session_key, length);          MD5_Update(&md5, session_key, keylen);
204          MD5_Update(&md5, pad_92, 48);          MD5_Update(&md5, pad_92, 48);
205          MD5_Update(&md5, shasig, 20);          MD5_Update(&md5, shasig, 20);
206          MD5_Final(md5sig, &md5);          MD5_Final(md5sig, &md5);
207    
208          memcpy(signature, md5sig, length);          memcpy(signature, md5sig, siglen);
209  }  }
210    
211  /* Update an encryption key - similar to the signing process */  /* Update an encryption key - similar to the signing process */
212  static void  static void
213  sec_update(uint8 *key, uint8 *update_key)  sec_update(uint8 * key, uint8 * update_key)
214  {  {
215          uint8 shasig[20];          uint8 shasig[20];
216          SHA_CTX sha;          SHA_CTX sha;
# Line 218  sec_update(uint8 *key, uint8 *update_key Line 218  sec_update(uint8 *key, uint8 *update_key
218          RC4_KEY update;          RC4_KEY update;
219    
220          SHA1_Init(&sha);          SHA1_Init(&sha);
221          SHA1_Update(&sha, update_key, 8);          SHA1_Update(&sha, update_key, rc4_key_len);
222          SHA1_Update(&sha, pad_54, 40);          SHA1_Update(&sha, pad_54, 40);
223          SHA1_Update(&sha, key, 8);          SHA1_Update(&sha, key, rc4_key_len);
224          SHA1_Final(shasig, &sha);          SHA1_Final(shasig, &sha);
225    
226          MD5_Init(&md5);          MD5_Init(&md5);
227          MD5_Update(&md5, update_key, 8);          MD5_Update(&md5, update_key, rc4_key_len);
228          MD5_Update(&md5, pad_92, 48);          MD5_Update(&md5, pad_92, 48);
229          MD5_Update(&md5, shasig, 20);          MD5_Update(&md5, shasig, 20);
230          MD5_Final(key, &md5);          MD5_Final(key, &md5);
# Line 238  sec_update(uint8 *key, uint8 *update_key Line 238  sec_update(uint8 *key, uint8 *update_key
238    
239  /* Encrypt data using RC4 */  /* Encrypt data using RC4 */
240  static void  static void
241  sec_encrypt(uint8 *data, int length)  sec_encrypt(uint8 * data, int length)
242  {  {
243          static int use_count;          static int use_count;
244    
# Line 255  sec_encrypt(uint8 *data, int length) Line 255  sec_encrypt(uint8 *data, int length)
255    
256  /* Decrypt data using RC4 */  /* Decrypt data using RC4 */
257  static void  static void
258  sec_decrypt(uint8 *data, int length)  sec_decrypt(uint8 * data, int length)
259  {  {
260          static int use_count;          static int use_count;
261    
# Line 271  sec_decrypt(uint8 *data, int length) Line 271  sec_decrypt(uint8 *data, int length)
271  }  }
272    
273  static void  static void
274  reverse(uint8 *p, int len)  reverse(uint8 * p, int len)
275  {  {
276          int i, j;          int i, j;
277          uint8 temp;          uint8 temp;
278    
279          for (i = 0, j = len-1; i < j; i++, j--)          for (i = 0, j = len - 1; i < j; i++, j--)
280          {          {
281                  temp = p[i];                  temp = p[i];
282                  p[i] = p[j];                  p[i] = p[j];
# Line 286  reverse(uint8 *p, int len) Line 286  reverse(uint8 *p, int len)
286    
287  /* Perform an RSA public key encryption operation */  /* Perform an RSA public key encryption operation */
288  static void  static void
289  sec_rsa_encrypt(uint8 *out, uint8 *in, int len,  sec_rsa_encrypt(uint8 * out, uint8 * in, int len,
290                  uint8 *modulus, uint8 *exponent)                  uint8 * modulus, uint8 * exponent)
291  {  {
292          BN_CTX ctx;          BN_CTX ctx;
293          BIGNUM mod, exp, x, y;          BIGNUM mod, exp, x, y;
# Line 312  sec_rsa_encrypt(uint8 *out, uint8 *in, i Line 312  sec_rsa_encrypt(uint8 *out, uint8 *in, i
312          outlen = BN_bn2bin(&y, out);          outlen = BN_bn2bin(&y, out);
313          reverse(out, outlen);          reverse(out, outlen);
314          if (outlen < SEC_MODULUS_SIZE)          if (outlen < SEC_MODULUS_SIZE)
315                  memset(out+outlen, 0, SEC_MODULUS_SIZE-outlen);                  memset(out + outlen, 0, SEC_MODULUS_SIZE - outlen);
316    
317          BN_free(&y);          BN_free(&y);
318          BN_clear_free(&x);          BN_clear_free(&x);
# Line 358  sec_send(STREAM s, uint32 flags) Line 358  sec_send(STREAM s, uint32 flags)
358                  hexdump(s->p + 8, datalen);                  hexdump(s->p + 8, datalen);
359  #endif  #endif
360    
361                  sec_sign(s->p, sec_sign_key, 8, s->p + 8, datalen);                  sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8,
362                             datalen);
363                  sec_encrypt(s->p + 8, datalen);                  sec_encrypt(s->p + 8, datalen);
364          }          }
365    
# Line 432  sec_out_mcs_data(STREAM s) Line 433  sec_out_mcs_data(STREAM s)
433          /* Client encryption settings */          /* Client encryption settings */
434          out_uint16_le(s, SEC_TAG_CLI_CRYPT);          out_uint16_le(s, SEC_TAG_CLI_CRYPT);
435          out_uint16(s, 8);       /* length */          out_uint16(s, 8);       /* length */
436          out_uint32_le(s, encryption ? 1 : 0);   /* encryption enabled */          out_uint32_le(s, encryption ? 0x3 : 0); /* encryption supported, 128-bit supported */
437          s_mark_end(s);          s_mark_end(s);
438  }  }
439    
440  /* Parse a public key structure */  /* Parse a public key structure */
441  static BOOL  static BOOL
442  sec_parse_public_key(STREAM s, uint8 **modulus, uint8 **exponent)  sec_parse_public_key(STREAM s, uint8 ** modulus, uint8 ** exponent)
443  {  {
444          uint32 magic, modulus_len;          uint32 magic, modulus_len;
445    
# Line 466  sec_parse_public_key(STREAM s, uint8 **m Line 467  sec_parse_public_key(STREAM s, uint8 **m
467    
468  /* Parse a crypto information structure */  /* Parse a crypto information structure */
469  static BOOL  static BOOL
470  sec_parse_crypt_info(STREAM s, uint32 *rc4_key_size,  sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
471                       uint8 **server_random, uint8 **modulus, uint8 **exponent)                       uint8 ** server_random, uint8 ** modulus,
472                         uint8 ** exponent)
473  {  {
474          uint32 crypt_level, random_len, rsa_info_len;          uint32 crypt_level, random_len, rsa_info_len;
475          uint16 tag, length;          uint16 tag, length;
Legend:
Removed from v.32  
changed lines
  Added in v.64
  ViewVC Help
Powered by ViewVC 1.1.26