/[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 64 by astrand, Thu Jul 18 16:38:31 2002 UTC revision 82 by astrand, Tue Jul 30 07:18:48 2002 UTC
# Line 127  sec_generate_keys(uint8 * client_key, ui Line 127  sec_generate_keys(uint8 * client_key, ui
127          memcpy(sec_sign_key, session_key, 16);          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, server_key);
131                      server_key);          sec_hash_16(sec_encrypt_key, &session_key[32], client_key, server_key);
         sec_hash_16(sec_encrypt_key, &session_key[32], client_key,  
                     server_key);  
132    
133          if (rc4_key_size == 1)          if (rc4_key_size == 1)
134          {          {
# Line 181  buf_out_uint32(uint8 * buffer, uint32 va Line 179  buf_out_uint32(uint8 * buffer, uint32 va
179    
180  /* Generate a signature hash, using a combination of SHA1 and MD5 */  /* Generate a signature hash, using a combination of SHA1 and MD5 */
181  void  void
182  sec_sign(uint8 * signature, int siglen, uint8 * session_key, int keylen,  sec_sign(uint8 * signature, int siglen, uint8 * session_key, int keylen, uint8 * data, int datalen)
          uint8 * data, int datalen)  
183  {  {
184          uint8 shasig[20];          uint8 shasig[20];
185          uint8 md5sig[16];          uint8 md5sig[16];
# Line 286  reverse(uint8 * p, int len) Line 283  reverse(uint8 * p, int len)
283    
284  /* Perform an RSA public key encryption operation */  /* Perform an RSA public key encryption operation */
285  static void  static void
286  sec_rsa_encrypt(uint8 * out, uint8 * in, int len,  sec_rsa_encrypt(uint8 * out, uint8 * in, int len, uint8 * modulus, uint8 * exponent)
                 uint8 * modulus, uint8 * exponent)  
287  {  {
288          BN_CTX ctx;          BN_CTX ctx;
289          BIGNUM mod, exp, x, y;          BIGNUM mod, exp, x, y;
# Line 358  sec_send(STREAM s, uint32 flags) Line 354  sec_send(STREAM s, uint32 flags)
354                  hexdump(s->p + 8, datalen);                  hexdump(s->p + 8, datalen);
355  #endif  #endif
356    
357                  sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8,                  sec_sign(s->p, 8, sec_sign_key, rc4_key_len, s->p + 8, datalen);
                          datalen);  
358                  sec_encrypt(s->p + 8, datalen);                  sec_encrypt(s->p + 8, datalen);
359          }          }
360    
# Line 468  sec_parse_public_key(STREAM s, uint8 ** Line 463  sec_parse_public_key(STREAM s, uint8 **
463  /* Parse a crypto information structure */  /* Parse a crypto information structure */
464  static BOOL  static BOOL
465  sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,  sec_parse_crypt_info(STREAM s, uint32 * rc4_key_size,
466                       uint8 ** server_random, uint8 ** modulus,                       uint8 ** server_random, uint8 ** modulus, uint8 ** exponent)
                      uint8 ** exponent)  
467  {  {
468          uint32 crypt_level, random_len, rsa_info_len;          uint32 crypt_level, random_len, rsa_info_len;
469          uint16 tag, length;          uint16 tag, length;
# Line 505  sec_parse_crypt_info(STREAM s, uint32 * Line 499  sec_parse_crypt_info(STREAM s, uint32 *
499                  switch (tag)                  switch (tag)
500                  {                  {
501                          case SEC_TAG_PUBKEY:                          case SEC_TAG_PUBKEY:
502                                  if (!sec_parse_public_key                                  if (!sec_parse_public_key(s, modulus, exponent))
                                     (s, modulus, exponent))  
503                                          return False;                                          return False;
504    
505                                  break;                                  break;
# Line 534  sec_process_crypt_info(STREAM s) Line 527  sec_process_crypt_info(STREAM s)
527          uint8 client_random[SEC_RANDOM_SIZE];          uint8 client_random[SEC_RANDOM_SIZE];
528          uint32 rc4_key_size;          uint32 rc4_key_size;
529    
530          if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random,          if (!sec_parse_crypt_info(s, &rc4_key_size, &server_random, &modulus, &exponent))
                                   &modulus, &exponent))  
531                  return;                  return;
532    
533          /* Generate a client random, and hence determine encryption keys */          /* Generate a client random, and hence determine encryption keys */
534          generate_random(client_random);          generate_random(client_random);
535          sec_rsa_encrypt(sec_crypted_random, client_random,          sec_rsa_encrypt(sec_crypted_random, client_random, SEC_RANDOM_SIZE, modulus, exponent);
                         SEC_RANDOM_SIZE, modulus, exponent);  
536          sec_generate_keys(client_random, server_random, rc4_key_size);          sec_generate_keys(client_random, server_random, rc4_key_size);
537  }  }
538    
Legend:
Removed from v.64  
changed lines
  Added in v.82
  ViewVC Help
Powered by ViewVC 1.1.26