ran indent-all.sh

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1376 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Jay Sorg 2007-01-11 03:30:18 +00:00
parent 95c21876c1
commit 3067b9fc6a
4 changed files with 31 additions and 43 deletions

10
proto.h
View File

@ -101,8 +101,8 @@ void printercache_process(STREAM s);
/* pstcache.c */ /* pstcache.c */
void pstcache_touch_bitmap(uint8 cache_id, uint16 cache_idx, uint32 stamp); 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_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, RD_BOOL pstcache_save_bitmap(uint8 cache_id, uint16 cache_idx, uint8 * key, uint8 width,
uint16 length, uint8 * data); uint8 height, uint16 length, uint8 * data);
int pstcache_enumerate(uint8 id, HASH_KEY * keylist); int pstcache_enumerate(uint8 id, HASH_KEY * keylist);
RD_BOOL pstcache_init(uint8 cache_id); RD_BOOL pstcache_init(uint8 cache_id);
/* rdesktop.c */ /* rdesktop.c */
@ -120,7 +120,8 @@ void hexdump(unsigned char *p, unsigned int len);
char *next_arg(char *src, char needle); char *next_arg(char *src, char needle);
void toupper_str(char *p); void toupper_str(char *p);
RD_BOOL str_startswith(const char *s, const char *prefix); 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 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); RD_BOOL subprocess(char *const argv[], str_handle_lines_t linehandler, void *data);
char *l_to_a(long N, int base); char *l_to_a(long N, int base);
int load_licence(unsigned char **data); int load_licence(unsigned char **data);
@ -194,7 +195,8 @@ void sec_reset_state(void);
/* serial.c */ /* serial.c */
int serial_enum_devices(uint32 * id, char *optarg); int serial_enum_devices(uint32 * id, char *optarg);
RD_BOOL serial_get_event(RD_NTHANDLE handle, uint32 * result); 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); RD_BOOL serial_get_timeout(RD_NTHANDLE handle, uint32 length, uint32 * timeout,
uint32 * itv_timeout);
/* tcp.c */ /* tcp.c */
STREAM tcp_init(uint32 maxlen); STREAM tcp_init(uint32 maxlen);
void tcp_send(STREAM s); void tcp_send(STREAM s);

View File

@ -33,16 +33,16 @@ struct audio_driver
void (*add_fds) (int *n, fd_set * rfds, fd_set * wfds, struct timeval * tv); void (*add_fds) (int *n, fd_set * rfds, fd_set * wfds, struct timeval * tv);
void (*check_fds) (fd_set * rfds, fd_set * wfds); void (*check_fds) (fd_set * rfds, fd_set * wfds);
RD_BOOL (*wave_out_open) (void); RD_BOOL(*wave_out_open) (void);
void (*wave_out_close) (void); void (*wave_out_close) (void);
RD_BOOL (*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx); RD_BOOL(*wave_out_format_supported) (RD_WAVEFORMATEX * pwfx);
RD_BOOL (*wave_out_set_format) (RD_WAVEFORMATEX * pwfx); RD_BOOL(*wave_out_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_out_volume) (uint16 left, uint16 right); void (*wave_out_volume) (uint16 left, uint16 right);
RD_BOOL (*wave_in_open) (void); RD_BOOL(*wave_in_open) (void);
void (*wave_in_close) (void); void (*wave_in_close) (void);
RD_BOOL (*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx); RD_BOOL(*wave_in_format_supported) (RD_WAVEFORMATEX * pwfx);
RD_BOOL (*wave_in_set_format) (RD_WAVEFORMATEX * pwfx); RD_BOOL(*wave_in_set_format) (RD_WAVEFORMATEX * pwfx);
void (*wave_in_volume) (uint16 left, uint16 right); void (*wave_in_volume) (uint16 left, uint16 right);
char *name; char *name;

10
ssl.c
View File

@ -88,7 +88,7 @@ void
ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent) uint8 * exponent)
{ {
BN_CTX * ctx; BN_CTX *ctx;
BIGNUM mod, exp, x, y; BIGNUM mod, exp, x, y;
uint8 inr[SEC_MAX_MODULUS_SIZE]; uint8 inr[SEC_MAX_MODULUS_SIZE];
int outlen; int outlen;
@ -138,8 +138,8 @@ ssl_cert_free(SSL_CERT * cert)
SSL_RKEY * SSL_RKEY *
ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len) ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len)
{ {
EVP_PKEY * epk = NULL; EVP_PKEY *epk = NULL;
SSL_RKEY * lkey; SSL_RKEY *lkey;
/* By some reason, Microsoft sets the OID of the Public RSA key to /* By some reason, Microsoft sets the OID of the Public RSA key to
the oid for "MD5 with RSA Encryption" instead of "RSA Encryption" the oid for "MD5 with RSA Encryption" instead of "RSA Encryption"
@ -176,7 +176,7 @@ ssl_certs_ok(SSL_CERT * server_cert, SSL_CERT * cacert)
server we are connecting to as key, and compare it server we are connecting to as key, and compare it
when we connect the next time, in order to prevent when we connect the next time, in order to prevent
MITM-attacks. MITM-attacks.
*/ */
return True; return True;
} }
@ -217,6 +217,6 @@ ssl_sig_ok(uint8 * exponent, uint32 exp_len, uint8 * modulus, uint32 mod_len,
{ {
/* Currently, we don't check the signature /* Currently, we don't check the signature
FIXME: FIXME:
*/ */
return True; return True;
} }

42
ssl.h
View File

@ -40,37 +40,23 @@
#define SSL_CERT X509 #define SSL_CERT X509
#define SSL_RKEY RSA #define SSL_RKEY RSA
void void ssl_sha1_init(SSL_SHA1 * sha1);
ssl_sha1_init(SSL_SHA1 * sha1); void ssl_sha1_update(SSL_SHA1 * sha1, uint8 * data, uint32 len);
void void ssl_sha1_final(SSL_SHA1 * sha1, uint8 * out_data);
ssl_sha1_update(SSL_SHA1 * sha1, uint8 * data, uint32 len); void ssl_md5_init(SSL_MD5 * md5);
void void ssl_md5_update(SSL_MD5 * md5, uint8 * data, uint32 len);
ssl_sha1_final(SSL_SHA1 * sha1, uint8 * out_data); void ssl_md5_final(SSL_MD5 * md5, uint8 * out_data);
void void ssl_rc4_set_key(SSL_RC4 * rc4, uint8 * key, uint32 len);
ssl_md5_init(SSL_MD5 * md5); void ssl_rc4_crypt(SSL_RC4 * rc4, uint8 * in_data, uint8 * out_data, uint32 len);
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 void
ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus, ssl_rsa_encrypt(uint8 * out, uint8 * in, int len, uint32 modulus_size, uint8 * modulus,
uint8 * exponent); uint8 * exponent);
SSL_CERT * SSL_CERT *ssl_cert_read(uint8 * data, uint32 len);
ssl_cert_read(uint8 * data, uint32 len); void ssl_cert_free(SSL_CERT * cert);
void SSL_RKEY *ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len);
ssl_cert_free(SSL_CERT * cert); RD_BOOL ssl_certs_ok(SSL_CERT * server_cert, SSL_CERT * cacert);
SSL_RKEY * int ssl_cert_print_fp(FILE * fp, SSL_CERT * cert);
ssl_cert_to_rkey(SSL_CERT * cert, uint32 * key_len); void ssl_rkey_free(SSL_RKEY * rkey);
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 int
ssl_rkey_get_exp_mod(SSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus, ssl_rkey_get_exp_mod(SSL_RKEY * rkey, uint8 * exponent, uint32 max_exp_len, uint8 * modulus,
uint32 max_mod_len); uint32 max_mod_len);