Commit 480506bd authored by Bodo Möller's avatar Bodo Möller
Browse files

remove some functions from exported headers

parent 0d5ea761

ssl/dtls1.h

+0 −27
Original line number Diff line number Diff line
@@ -201,33 +201,6 @@ typedef struct dtls1_record_data_st 
	SSL3_RECORD    rrec;

	} DTLS1_RECORD_DATA;



/* client methods */

int dtls1_client_hello(SSL *s);

int dtls1_send_client_certificate(SSL *s);

int dtls1_send_client_key_exchange(SSL *s);

int dtls1_send_client_verify(SSL *s);





/* server methods */

int dtls1_send_hello_request(SSL *s);

int dtls1_send_server_hello(SSL *s);

int dtls1_send_server_certificate(SSL *s);

int dtls1_send_server_key_exchange(SSL *s);

int dtls1_send_certificate_request(SSL *s);

int dtls1_send_server_done(SSL *s);



/* common methods */

int dtls1_send_change_cipher_spec(SSL *s, int a, int b);

int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);

unsigned long dtls1_output_cert_chain(SSL *s, X509 *x);

int dtls1_read_failed(SSL *s, int code);

int dtls1_buffer_message(SSL *s, int ccs);

int dtls1_retransmit_message(SSL *s, unsigned short seq, 

	unsigned long frag_off, int *found);

void dtls1_clear_record_buffer(SSL *s);

void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr);

void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);

void dtls1_reset_seq_numbers(SSL *s, int rw);



/* Timeout multipliers (timeout slice is defined in apps/timeouts.h */

#define DTLS1_TMO_READ_COUNT                      2

ssl/ssl3.h

+0 −28
Original line number Diff line number Diff line
@@ -438,34 +438,6 @@ typedef struct ssl3_state_st 
	} SSL3_STATE;





/* client methods */

int ssl3_client_hello(SSL *s);

int ssl3_get_server_hello(SSL *s);

int ssl3_get_certificate_request(SSL *s);

int ssl3_get_server_done(SSL *s);

int ssl3_send_client_verify(SSL *s);

int ssl3_send_client_certificate(SSL *s);

int ssl3_send_client_key_exchange(SSL *s);

int ssl3_get_key_exchange(SSL *s);

int ssl3_get_server_certificate(SSL *s);

int ssl3_check_cert_and_algorithm(SSL *s);



/* server methods */

int ssl3_get_client_hello(SSL *s);

int ssl3_send_server_hello(SSL *s);

int ssl3_send_hello_request(SSL *s);

int ssl3_send_server_key_exchange(SSL *s);

int ssl3_send_certificate_request(SSL *s);

int ssl3_send_server_done(SSL *s);

int ssl3_check_client_hello(SSL *s);

int ssl3_get_client_certificate(SSL *s);

int ssl3_get_client_key_exchange(SSL *s);

int ssl3_get_cert_verify(SSL *s);



/* utility functions */

void ssl3_record_sequence_update(unsigned char *seq);

int ssl3_do_change_cipher_spec(SSL *ssl);



/* SSLv3 */

/*client */

/* extra state */

ssl/ssl_locl.h

+27 −2
Original line number Diff line number Diff line
@@ -638,7 +638,20 @@ unsigned char *dtls1_set_message_header(SSL *s, 
int dtls1_write_app_data_bytes(SSL *s, int type, const void *buf, int len);

int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);



/* client functionality */

int dtls1_send_change_cipher_spec(SSL *s, int a, int b);

int dtls1_send_finished(SSL *s, int a, int b, const char *sender, int slen);

unsigned long dtls1_output_cert_chain(SSL *s, X509 *x);

int dtls1_read_failed(SSL *s, int code);

int dtls1_buffer_message(SSL *s, int ccs);

int dtls1_retransmit_message(SSL *s, unsigned short seq, 

	unsigned long frag_off, int *found);

void dtls1_clear_record_buffer(SSL *s);

void dtls1_get_message_header(unsigned char *data, struct hm_header_st *msg_hdr);

void dtls1_get_ccs_header(unsigned char *data, struct ccs_header_st *ccs_hdr);

void dtls1_reset_seq_numbers(SSL *s, int rw);





/* some client-only functions */

int ssl3_client_hello(SSL *s);

int ssl3_get_server_hello(SSL *s);

int ssl3_get_certificate_request(SSL *s);
@@ -650,7 +663,12 @@ int ssl3_get_key_exchange(SSL *s); 
int ssl3_get_server_certificate(SSL *s);

int ssl3_check_cert_and_algorithm(SSL *s);



/* server functionality */

int dtls1_client_hello(SSL *s);

int dtls1_send_client_certificate(SSL *s);

int dtls1_send_client_key_exchange(SSL *s);

int dtls1_send_client_verify(SSL *s);



/* some server-only functions */

int ssl3_get_client_hello(SSL *s);

int ssl3_send_server_hello(SSL *s);

int ssl3_send_hello_request(SSL *s);
@@ -662,6 +680,13 @@ int ssl3_get_client_certificate(SSL *s); 
int ssl3_get_client_key_exchange(SSL *s);

int ssl3_get_cert_verify(SSL *s);



int dtls1_send_hello_request(SSL *s);

int dtls1_send_server_hello(SSL *s);

int dtls1_send_server_certificate(SSL *s);

int dtls1_send_server_key_exchange(SSL *s);

int dtls1_send_certificate_request(SSL *s);

int dtls1_send_server_done(SSL *s);







int ssl23_accept(SSL *s);