/[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 435 by astrand, Wed Jul 9 09:18:20 2003 UTC revision 642 by matthewc, Thu Mar 18 02:32:00 2004 UTC
# Line 34  Line 34 
34  #endif  #endif
35    
36  extern char hostname[16];  extern char hostname[16];
37  extern int width;  extern int g_width;
38  extern int height;  extern int g_height;
39  extern int keylayout;  extern int keylayout;
40  extern BOOL encryption;  extern BOOL g_encryption;
41  extern BOOL g_licence_issued;  extern BOOL g_licence_issued;
42  extern BOOL use_rdp5;  extern BOOL g_use_rdp5;
43  extern int server_bpp;  extern BOOL g_console_session;
44    extern int g_server_bpp;
45  extern uint16 mcs_userid;  extern uint16 mcs_userid;
46  extern VCHANNEL g_channels[];  extern VCHANNEL g_channels[];
47  extern unsigned int g_num_channels;  extern unsigned int g_num_channels;
# Line 57  static uint8 sec_decrypt_update_key[16]; Line 58  static uint8 sec_decrypt_update_key[16];
58  static uint8 sec_encrypt_update_key[16];  static uint8 sec_encrypt_update_key[16];
59  static uint8 sec_crypted_random[SEC_MODULUS_SIZE];  static uint8 sec_crypted_random[SEC_MODULUS_SIZE];
60    
61  uint16 server_rdp_version = 0;  uint16 g_server_rdp_version = 0;
62    
63  /*  /*
64   * General purpose 48-byte transformation, using two 32-byte salts (generally,   * General purpose 48-byte transformation, using two 32-byte salts (generally,
# Line 411  sec_out_mcs_data(STREAM s) Line 412  sec_out_mcs_data(STREAM s)
412          if (hostlen > 30)          if (hostlen > 30)
413                  hostlen = 30;                  hostlen = 30;
414    
415          out_uint16_be(s, 5);    /* unknown */          /* Generic Conference Control (T.124) ConferenceCreateRequest */
416            out_uint16_be(s, 5);
417          out_uint16_be(s, 0x14);          out_uint16_be(s, 0x14);
418          out_uint8(s, 0x7c);          out_uint8(s, 0x7c);
419          out_uint16_be(s, 1);          out_uint16_be(s, 1);
# Line 424  sec_out_mcs_data(STREAM s) Line 426  sec_out_mcs_data(STREAM s)
426          out_uint16_le(s, 0xc001);          out_uint16_le(s, 0xc001);
427          out_uint8(s, 0);          out_uint8(s, 0);
428    
429          out_uint32_le(s, 0x61637544);   /* "Duca" ?! */          out_uint32_le(s, 0x61637544);   /* OEM ID: "Duca", as in Ducati. */
430          out_uint16_be(s, ((length - 14) | 0x8000));     /* remaining length */          out_uint16_be(s, ((length - 14) | 0x8000));     /* remaining length */
431    
432          /* Client information */          /* Client information */
433          out_uint16_le(s, SEC_TAG_CLI_INFO);          out_uint16_le(s, SEC_TAG_CLI_INFO);
434          out_uint16_le(s, 212);  /* length */          out_uint16_le(s, 212);  /* length */
435          out_uint16_le(s, use_rdp5 ? 4 : 1);     /* RDP version. 1 == RDP4, 4 == RDP5. */          out_uint16_le(s, g_use_rdp5 ? 4 : 1);   /* RDP version. 1 == RDP4, 4 == RDP5. */
436          out_uint16_le(s, 8);          out_uint16_le(s, 8);
437          out_uint16_le(s, width);          out_uint16_le(s, g_width);
438          out_uint16_le(s, height);          out_uint16_le(s, g_height);
439          out_uint16_le(s, 0xca01);          out_uint16_le(s, 0xca01);
440          out_uint16_le(s, 0xaa03);          out_uint16_le(s, 0xaa03);
441          out_uint32_le(s, keylayout);          out_uint32_le(s, keylayout);
# Line 448  sec_out_mcs_data(STREAM s) Line 450  sec_out_mcs_data(STREAM s)
450          out_uint32_le(s, 12);          out_uint32_le(s, 12);
451          out_uint8s(s, 64);      /* reserved? 4 + 12 doublewords */          out_uint8s(s, 64);      /* reserved? 4 + 12 doublewords */
452    
453          switch (server_bpp)          switch (g_server_bpp)
454          {          {
455                  case 8:                  case 8:
456                          out_uint16_le(s, 0xca01);                          out_uint16_le(s, 0xca01);
# Line 466  sec_out_mcs_data(STREAM s) Line 468  sec_out_mcs_data(STREAM s)
468          out_uint16_le(s, 1);          out_uint16_le(s, 1);
469    
470          out_uint32(s, 0);          out_uint32(s, 0);
471          out_uint8(s, server_bpp);          out_uint8(s, g_server_bpp);
472          out_uint16_le(s, 0x0700);          out_uint16_le(s, 0x0700);
473          out_uint8(s, 0);          out_uint8(s, 0);
474          out_uint32_le(s, 1);          out_uint32_le(s, 1);
# Line 474  sec_out_mcs_data(STREAM s) Line 476  sec_out_mcs_data(STREAM s)
476    
477          out_uint16_le(s, SEC_TAG_CLI_4);          out_uint16_le(s, SEC_TAG_CLI_4);
478          out_uint16_le(s, 12);          out_uint16_le(s, 12);
479          out_uint32_le(s, 9);          out_uint32_le(s, g_console_session ? 0xb : 9);
480          out_uint32(s, 0);          out_uint32(s, 0);
481    
482          /* Client encryption settings */          /* Client encryption settings */
483          out_uint16_le(s, SEC_TAG_CLI_CRYPT);          out_uint16_le(s, SEC_TAG_CLI_CRYPT);
484          out_uint16_le(s, 12);   /* length */          out_uint16_le(s, 12);   /* length */
485          out_uint32_le(s, encryption ? 0x3 : 0); /* encryption supported, 128-bit supported */          out_uint32_le(s, g_encryption ? 0x3 : 0);       /* encryption supported, 128-bit supported */
486          out_uint32(s, 0);       /* Unknown */          out_uint32(s, 0);       /* Unknown */
487    
488          DEBUG_RDP5(("g_num_channels is %d\n", g_num_channels));          DEBUG_RDP5(("g_num_channels is %d\n", g_num_channels));
# Line 624  sec_parse_crypt_info(STREAM s, uint32 * Line 626  sec_parse_crypt_info(STREAM s, uint32 *
626          }          }
627          else          else
628          {          {
629                    uint32 certcount;
630    
631                  DEBUG_RDP5(("We're going for the RDP5-style encryption\n"));                  DEBUG_RDP5(("We're going for the RDP5-style encryption\n"));
632                  in_uint8s(s, 4);        /* Number of certificates */                  in_uint32_le(s, certcount);     /* Number of certificates */
633    
634                    if (certcount < 2)
635                    {
636                            error("Server didn't send enough X509 certificates\n");
637                            return False;
638                    }
639    
640                    for (; certcount > 2; certcount--)
641                    {               /* ignore all the certificates between the root and the signing CA */
642                            uint32 ignorelen;
643                            X509 *ignorecert;
644    
645                            DEBUG_RDP5(("Ignored certs left: %d\n", certcount));
646    
647                            in_uint32_le(s, ignorelen);
648                            DEBUG_RDP5(("Ignored Certificate length is %d\n", ignorelen));
649                            ignorecert = d2i_X509(NULL, &(s->p), ignorelen);
650    
651                            if (ignorecert == NULL)
652                            {       /* XXX: error out? */
653                                    DEBUG_RDP5(("got a bad cert: this will probably screw up the rest of the communication\n"));
654                            }
655    
656    #ifdef WITH_DEBUG_RDP5
657                            DEBUG_RDP5(("cert #%d (ignored):\n", certcount));
658                            X509_print_fp(stdout, ignorecert);
659    #endif
660                    }
661    
662                  /* Do da funky X.509 stuffy                  /* Do da funky X.509 stuffy
663    
# Line 699  sec_process_crypt_info(STREAM s) Line 731  sec_process_crypt_info(STREAM s)
731    
732          DEBUG(("Generating client random\n"));          DEBUG(("Generating client random\n"));
733          /* Generate a client random, and hence determine encryption keys */          /* Generate a client random, and hence determine encryption keys */
734          // This is what the MS client do:          /* This is what the MS client do: */
735          memset(inr, 0, SEC_RANDOM_SIZE);          memset(inr, 0, SEC_RANDOM_SIZE);
736          /*  *ARIGL!* Plaintext attack, anyone?          /*  *ARIGL!* Plaintext attack, anyone?
737             I tried doing:             I tried doing:
# Line 736  sec_process_crypt_info(STREAM s) Line 768  sec_process_crypt_info(STREAM s)
768  static void  static void
769  sec_process_srv_info(STREAM s)  sec_process_srv_info(STREAM s)
770  {  {
771          in_uint16_le(s, server_rdp_version);          in_uint16_le(s, g_server_rdp_version);
772          DEBUG_RDP5(("Server RDP version is %d\n", server_rdp_version));          DEBUG_RDP5(("Server RDP version is %d\n", g_server_rdp_version));
773          if (1 == server_rdp_version)          if (1 == g_server_rdp_version)
774                  use_rdp5 = 0;                  g_use_rdp5 = 0;
775  }  }
776    
777    
# Line 751  sec_process_mcs_data(STREAM s) Line 783  sec_process_mcs_data(STREAM s)
783          uint8 *next_tag;          uint8 *next_tag;
784          uint8 len;          uint8 len;
785    
786          in_uint8s(s, 21);       /* header (T.124 stuff, probably) */          in_uint8s(s, 21);       /* header (T.124 ConferenceCreateResponse) */
787          in_uint8(s, len);          in_uint8(s, len);
788          if (len & 0x80)          if (len & 0x80)
789                  in_uint8(s, len);                  in_uint8(s, len);
# Line 800  sec_recv(void) Line 832  sec_recv(void)
832    
833          while ((s = mcs_recv(&channel)) != NULL)          while ((s = mcs_recv(&channel)) != NULL)
834          {          {
835                  if (encryption || !g_licence_issued)                  if (g_encryption || !g_licence_issued)
836                  {                  {
837                          in_uint32_le(s, sec_flags);                          in_uint32_le(s, sec_flags);
838    
# Line 843  sec_connect(char *server, char *username Line 875  sec_connect(char *server, char *username
875          if (!mcs_connect(server, &mcs_data, username))          if (!mcs_connect(server, &mcs_data, username))
876                  return False;                  return False;
877    
878          //      sec_process_mcs_data(&mcs_data);          /*      sec_process_mcs_data(&mcs_data); */
879          if (encryption)          if (g_encryption)
880                  sec_establish_key();                  sec_establish_key();
881          xfree(mcs_data.data);          xfree(mcs_data.data);
882          return True;          return True;
Legend:
Removed from v.435  
changed lines
  Added in v.642
  ViewVC Help
Powered by ViewVC 1.1.26