CVS: rdesktop proto.h, 1.107, 1.108 rdpsnd.h, 1.13, 1.14 ssl.c, 1.1, 1.2 ssl.h, 1.1, 1.2
Jay Sorg <[email protected]> Wed, 10 Jan 2007 19:30:21 -0800
| Newsgroups | gmane.network.rdesktop.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv3329
Modified Files:
proto.h rdpsnd.h ssl.c ssl.h
Log Message:
ran indent-all.sh
Index: proto.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/proto.h,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** proto.h 8 Jan 2007 04:47:05 -0000 1.107
--- proto.h 11 Jan 2007 03:30:18 -0000 1.108
***************
*** 102,107 ****
void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
RD_BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! RD_BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width, uint8 height,
! uint16 length, uint8 * data);
int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
RD_BOOL pstcache_init(uint8 cache_id);
--- 102,107 ----
void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp);
RD_BOOL pstcache_load_bitmap(uint8 cache_id, uint16 cache_idx);
! RD_BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width,
! uint8 height, uint16 length, uint8 * data);
int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
RD_BOOL pstcache_init(uint8 cache_id);
***************
*** 121,125 ****
void toupper_str(char *p);
RD_BOOL str_startswith(const char *s, const char *prefix);
! RD_BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler, void *data);
RD_BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data);
char *l_to_a(long N, int base);
--- 121,126 ----
void toupper_str(char *p);
RD_BOOL str_startswith(const char *s, const char *prefix);
! RD_BOOL str_handle_lines(const char *input, char **rest, str_handle_lines_t linehandler,
! void *data);
RD_BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data);
char *l_to_a(long N, int base);
***************
*** 195,199 ****
int serial_enum_devices(uint32 * id, char *optarg);
RD_BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result);
! RD_BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout, uint32 * itv_timeout);
/* tcp.c */
STREAM tcp_init(uint32 maxlen);
--- 196,201 ----
int serial_enum_devices(uint32 * id, char *optarg);
RD_BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result);
! RD_BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout,
! uint32 * itv_timeout);
/* tcp.c */
STREAM tcp_init(uint32 maxlen);
Index: rdpsnd.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rdpsnd.h 8 Jan 2007 04:47:06 -0000 1.13
--- rdpsnd.h 11 Jan 2007 03:30:18 -0000 1.14
***************
*** 34,47 ****
void (*check_fds) (fd_set * rfds, fd_set * wfds);
! RD_BOOL (*wave_out_open) (void);
void (*wave_out_close) (void);
! RD_BOOL (*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL (*wave_out_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_out_volume) (uint16 left, uint16 right);
! RD_BOOL (*wave_in_open) (void);
void (*wave_in_close) (void);
! RD_BOOL (*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL (*wave_in_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_in_volume) (uint16 left, uint16 right);
--- 34,47 ----
void (*check_fds) (fd_set * rfds, fd_set * wfds);
! RD_BOOL(*wave_out_open) (void);
void (*wave_out_close) (void);
! RD_BOOL(*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL(*wave_out_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_out_volume) (uint16 left, uint16 right);
! RD_BOOL(*wave_in_open) (void);
void (*wave_in_close) (void);
! RD_BOOL(*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx);
! RD_BOOL(*wave_in_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_in_volume) (uint16 left, uint16 right);
Index: ssl.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ssl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ssl.c 9 Jan 2007 07:24:44 -0000 1.1
--- ssl.c 11 Jan 2007 03:30:18 -0000 1.2
***************
*** 89,93 ****
uint8 * exponent)
{
! BN_CTX * ctx;
BIGNUM mod, exp, x, y;
uint8 inr[SEC_MAX_MODULUS_SIZE];
--- 89,93 ----
uint8 * exponent)
{
! BN_CTX *ctx;
BIGNUM mod, exp, x, y;
uint8 inr[SEC_MAX_MODULUS_SIZE];
***************
*** 139,144 ****
ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len)
{
! EVP_PKEY * epk = NULL;
! SSL_RKEY * lkey;
/* By some reason, Microsoft sets the OID of the Public RSA key to
the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"
--- 139,144 ----
ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len)
{
! EVP_PKEY *epk = NULL;
! SSL_RKEY *lkey;
/* By some reason, Microsoft sets the OID of the Public RSA key to
the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"
***************
*** 177,181 ****
when we connect the next time, in order to prevent
MITM-attacks.
! */
return True;
}
--- 177,181 ----
when we connect the next time, in order to prevent
MITM-attacks.
! */
return True;
}
***************
*** 218,222 ****
/* Currently, we don't check the signature
FIXME:
! */
return True;
}
--- 218,222 ----
/* Currently, we don't check the signature
FIXME:
! */
return True;
}
Index: ssl.h
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/ssl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ssl.h 9 Jan 2007 07:24:44 -0000 1.1
--- ssl.h 11 Jan 2007 03:30:18 -0000 1.2
***************
*** 41,75 ****
#define SSL_RKEY RSA
! void
! ssl_sha1_init(SSL_SHA1 * sha1);
! void
! ssl_sha1_update(SSL_SHA1 * sha1, uint8 * data, uint32 len);
! void
! ssl_sha1_final(SSL_SHA1 * sha1, uint8 * out_data);
! void
! ssl_md5_init(SSL_MD5 * md5);
! void
! ssl_md5_update(SSL_MD5 * md5, uint8 * data, uint32 len);
! void
! ssl_md5_final(SSL_MD5 * md5, uint8 * out_data);
! void
! ssl_rc4_set_key(SSL_RC4 * rc4, uint8 * key, uint32 len);
! void
! ssl_rc4_crypt(SSL_RC4 * rc4, uint8 * in_data, uint8 * out_data, uint32 len);
void
ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent);
! SSL_CERT *
! ssl_cert_read(uint8 * data, uint32 len);
! void
! ssl_cert_free(SSL_CERT * cert);
! SSL_RKEY *
! ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len);
! RD_BOOL
! ssl_certs_ok(SSL_CERT * server_cert, SSL_CERT * cacert);
! int
! ssl_cert_print_fp(FILE * fp, SSL_CERT * cert);
! void
! ssl_rkey_free(SSL_RKEY * rkey);
int
ssl_rkey_get_exp_mod(SSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus,
--- 41,61 ----
#define SSL_RKEY RSA
! void ssl_sha1_init(SSL_SHA1 * sha1);
! void ssl_sha1_update(SSL_SHA1 * sha1, uint8 * data, uint32 len);
! void ssl_sha1_final(SSL_SHA1 * sha1, uint8 * out_data);
! void ssl_md5_init(SSL_MD5 * md5);
! void ssl_md5_update(SSL_MD5 * md5, uint8 * data, uint32 len);
! void ssl_md5_final(SSL_MD5 * md5, uint8 * out_data);
! void ssl_rc4_set_key(SSL_RC4 * rc4, uint8 * key, uint32 len);
! void ssl_rc4_crypt(SSL_RC4 * rc4, uint8 * in_data, uint8 * out_data, uint32 len);
void
ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent);
! SSL_CERT *ssl_cert_read(uint8 * data, uint32 len);
! void ssl_cert_free(SSL_CERT * cert);
! SSL_RKEY *ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len);
! RD_BOOL ssl_certs_ok(SSL_CERT * server_cert, SSL_CERT * cacert);
! int ssl_cert_print_fp(FILE * fp, SSL_CERT * cert);
! void ssl_rkey_free(SSL_RKEY * rkey);
int
ssl_rkey_get_exp_mod(SSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus,
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV