diff options
| author | Mark J. Cox <mark@openssl.org> | 1999-02-16 09:22:21 +0000 |
|---|---|---|
| committer | Mark J. Cox <mark@openssl.org> | 1999-02-16 09:22:21 +0000 |
| commit | 413c4f45ed0508d2242638696b7665f499d68265 (patch) | |
| tree | 5a5e667f7fc9cb548ab3b24dd02fff78e1b8f282 /ssl/ssl_locl.h | |
| parent | a8236c8c322101c273d14c62282f264555e147c4 (diff) | |
Updates to the new SSL compression code
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Fix so that the version number in the master secret, when passed
via RSA, checks that if TLS was proposed, but we roll back to SSLv3
(because the server will not accept higher), that the version number
is 0x03,0x01, not 0x03,0x00
[Eric A. Young, (from changes to C2Net SSLeay, integrated by Mark Cox)]
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index f2442544e3..1a907514d9 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -348,7 +348,8 @@ int ssl_cipher_list_to_bytes(SSL *s,STACK *sk,unsigned char *p); STACK *ssl_create_cipher_list(SSL_METHOD *meth,STACK **pref, STACK **sorted,char *str); void ssl_update_cache(SSL *s, int mode); -int ssl_cipher_get_evp(SSL_CIPHER *c, EVP_CIPHER **enc, EVP_MD **md); +int ssl_cipher_get_evp(SSL_SESSION *s, EVP_CIPHER **enc, EVP_MD **md, + SSL_COMP **comp); int ssl_verify_cert_chain(SSL *s,STACK *sk); int ssl_undefined_function(SSL *s); X509 *ssl_get_server_send_cert(SSL *); @@ -442,6 +443,7 @@ long tls1_ctrl(SSL *s,int cmd, long larg, char *parg); SSL_METHOD *tlsv1_base_method(void ); int ssl_init_wbio_buffer(SSL *s, int push); +void ssl_free_wbio_buffer(SSL *s); int tls1_change_cipher_state(SSL *s, int which); int tls1_setup_key_block(SSL *s); @@ -456,6 +458,9 @@ int tls1_alert_code(int code); int ssl3_alert_code(int code); int ssl_ok(SSL *s); +SSL_COMP *ssl3_comp_find(STACK *sk, int n); +STACK *SSL_COMP_get_compression_methods(void); + #else @@ -562,10 +567,8 @@ int ssl23_read_bytes(); int ssl23_write_bytes(); int ssl_init_wbio_buffer(); +void ssl_free_wbio_buffer(); -#endif - -#endif int ssl3_cert_verify_mac(); int ssl3_alert_code(); int tls1_new(); @@ -582,3 +585,9 @@ int tls1_mac(); int tls1_generate_master_secret(); int tls1_alert_code(); int ssl_ok(); +SSL_COMP *ssl3_comp_find(); +STACK *SSL_COMP_get_compression_methods(); + +#endif + +#endif |