X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=ssl%2Fssl_locl.h;h=4f3d56f0d3d68e598e37804b0febb9435f696a8c;hp=1a907514d997446d9ea323dfcf87601d6bf9e789;hb=8d1157c71c477be91bbf276ff0b0e6b1d4c139c5;hpb=413c4f45ed0508d2242638696b7665f499d68265 diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 1a907514d9..4f3d56f0d3 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -63,17 +63,17 @@ #include #include -#include "e_os.h" - -#include "buffer.h" -#include "comp.h" -#include "bio.h" -#include "crypto.h" -#include "evp.h" -#include "stack.h" -#include "x509.h" -#include "err.h" -#include "ssl.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #define PKCS1_CHECK @@ -192,13 +192,25 @@ #define SSL_SHA (SSL_SHA1) #define SSL_EXP_MASK 0x00300000L -#define SSL_EXP 0x00100000L +#define SSL_EXP40 0x00100000L #define SSL_NOT_EXP 0x00200000L -#define SSL_EXPORT SSL_EXP +#define SSL_EXP56 0x00300000L +#define SSL_IS_EXPORT(a) ((a)&SSL_EXP40) +#define SSL_IS_EXPORT56(a) (((a)&SSL_EXP_MASK) == SSL_EXP56) +#define SSL_IS_EXPORT40(a) (((a)&SSL_EXP_MASK) == SSL_EXP40) +#define SSL_C_IS_EXPORT(c) SSL_IS_EXPORT((c)->algorithms) +#define SSL_C_IS_EXPORT56(c) SSL_IS_EXPORT56((c)->algorithms) +#define SSL_C_IS_EXPORT40(c) SSL_IS_EXPORT40((c)->algorithms) +#define SSL_EXPORT_KEYLENGTH(a) (SSL_IS_EXPORT40(a) ? 5 : \ + ((a)&SSL_ENC_MASK) == SSL_DES ? 8 : 7) +#define SSL_EXPORT_PKEYLENGTH(a) (SSL_IS_EXPORT40(a) ? 512 : 1024) +#define SSL_C_EXPORT_KEYLENGTH(c) SSL_EXPORT_KEYLENGTH((c)->algorithms) +#define SSL_C_EXPORT_PKEYLENGTH(c) SSL_EXPORT_PKEYLENGTH((c)->algorithms) #define SSL_SSL_MASK 0x00c00000L #define SSL_SSLV2 0x00400000L #define SSL_SSLV3 0x00800000L +#define SSL_TLSV1 SSL_SSLV3 /* for now */ #define SSL_STRONG_MASK 0x07000000L #define SSL_LOW 0x01000000L @@ -235,7 +247,6 @@ typedef struct cert_pkey_st { X509 *x509; -/* EVP_PKEY *publickey; *//* when extracted */ EVP_PKEY *privatekey; } CERT_PKEY; @@ -243,16 +254,6 @@ typedef struct cert_st { int cert_type; -#ifdef undef - X509 *x509; - EVP_PKEY *publickey; /* when extracted */ - EVP_PKEY *privatekey; - - pkeys[SSL_PKEY_RSA_ENC].x509 -/* pkeys[SSL_PKEY_RSA_ENC].publickey */ - pkeys[SSL_PKEY_RSA_ENC].privatekey -#endif - /* Current active set */ CERT_PKEY *key; @@ -261,18 +262,31 @@ typedef struct cert_st int valid; unsigned long mask; unsigned long export_mask; - +#ifndef NO_RSA RSA *rsa_tmp; + RSA *(*rsa_tmp_cb)(SSL *ssl,int export,int keysize); +#endif +#ifndef NO_DH DH *dh_tmp; - RSA *(*rsa_tmp_cb)(); - DH *(*dh_tmp_cb)(); + DH *(*dh_tmp_cb)(SSL *ssl,int export,int keysize); +#endif + CERT_PKEY pkeys[SSL_PKEY_NUM]; - STACK *cert_chain; + STACK_OF(X509) *cert_chain; /* XXX should only exist in sess_cert_st */ - int references; + int references; /* XXX should only exist in sess_cert_st */ } CERT; + +#if 0 /* XXX not yet */ +typedef struct sess_cert_st +{ + /* anything that we want to keep per session */ +} SESS_CERT; +#endif + + /*#define MAC_DEBUG */ /*#define ERR_DEBUG */ @@ -284,12 +298,7 @@ typedef struct cert_st /*#define RSA_DEBUG */ /*#define IDEA_DEBUG */ -#ifndef NOPROTO #define FP_ICC (int (*)(const void *,const void *)) -#else -#define FP_ICC -#endif - #define ssl_put_cipher_by_char(ssl,ciph,ptr) \ ((ssl)->method->put_cipher_by_char((ciph),(ptr))) #define ssl_get_cipher_by_char(ssl,ptr) \ @@ -327,7 +336,6 @@ extern SSL3_ENC_METHOD ssl3_undef_enc_method; extern SSL_CIPHER ssl2_ciphers[]; extern SSL_CIPHER ssl3_ciphers[]; -#ifndef NOPROTO SSL_METHOD *ssl_bad_method(int ver); SSL_METHOD *sslv2_base_method(void); @@ -337,26 +345,30 @@ SSL_METHOD *sslv3_base_method(void); void ssl_clear_cipher_ctx(SSL *s); int ssl_clear_bad_session(SSL *s); CERT *ssl_cert_new(void); +int ssl_cert_instantiate(CERT **o, CERT *d); void ssl_cert_free(CERT *c); int ssl_set_cert_type(CERT *c, int type); int ssl_get_new_session(SSL *s, int session); int ssl_get_prev_session(SSL *s, unsigned char *session,int len); int ssl_cipher_id_cmp(SSL_CIPHER *a,SSL_CIPHER *b); int ssl_cipher_ptr_id_cmp(SSL_CIPHER **ap,SSL_CIPHER **bp); -STACK *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num,STACK **skp); -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); +STACK_OF(SSL_CIPHER) *ssl_bytes_to_cipher_list(SSL *s,unsigned char *p,int num, + STACK_OF(SSL_CIPHER) **skp); +int ssl_cipher_list_to_bytes(SSL *s,STACK_OF(SSL_CIPHER) *sk,unsigned char *p); +STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(SSL_METHOD *meth, + STACK_OF(SSL_CIPHER) **pref, + STACK_OF(SSL_CIPHER) **sorted, + char *str); void ssl_update_cache(SSL *s, int mode); -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_cipher_get_evp(SSL_SESSION *s,const EVP_CIPHER **enc,const EVP_MD **md, + SSL_COMP **comp); +int ssl_verify_cert_chain(SSL *s,STACK_OF(X509) *sk); int ssl_undefined_function(SSL *s); X509 *ssl_get_server_send_cert(SSL *); EVP_PKEY *ssl_get_sign_pkey(SSL *,SSL_CIPHER *); int ssl_cert_type(X509 *x,EVP_PKEY *pkey); -void ssl_set_cert_masks(CERT *c); -STACK *ssl_get_ciphers_by_id(SSL *s); +void ssl_set_cert_masks(CERT *c,CERT *default_cert,SSL_CIPHER *cipher); +STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s); int ssl_verify_alarm_type(long type); int ssl2_enc_init(SSL *s, int client); @@ -376,9 +388,9 @@ int ssl2_new(SSL *s); void ssl2_free(SSL *s); int ssl2_accept(SSL *s); int ssl2_connect(SSL *s); -int ssl2_read(SSL *s, char *buf, int len); +int ssl2_read(SSL *s, void *buf, int len); int ssl2_peek(SSL *s, char *buf, int len); -int ssl2_write(SSL *s, const char *buf, int len); +int ssl2_write(SSL *s, const void *buf, int len); int ssl2_shutdown(SSL *s); void ssl2_clear(SSL *s); long ssl2_ctrl(SSL *s,int cmd, long larg, char *parg); @@ -406,25 +418,26 @@ SSL_CIPHER *ssl3_get_cipher(unsigned int u); int ssl3_renegotiate(SSL *ssl); int ssl3_renegotiate_check(SSL *ssl); int ssl3_dispatch_alert(SSL *s); -int ssl3_read_bytes(SSL *s, int type, char *buf, int len); +int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len); int ssl3_part_read(SSL *s, int i); -int ssl3_write_bytes(SSL *s, int type, char *buf, int len); +int ssl3_write_bytes(SSL *s, int type, const void *buf, int len); int ssl3_final_finish_mac(SSL *s, EVP_MD_CTX *ctx1,EVP_MD_CTX *ctx2, unsigned char *sender, int slen,unsigned char *p); int ssl3_cert_verify_mac(SSL *s, EVP_MD_CTX *in, unsigned char *p); -void ssl3_finish_mac(SSL *s, unsigned char *buf, int len); +void ssl3_finish_mac(SSL *s, const unsigned char *buf, int len); int ssl3_enc(SSL *s, int send_data); int ssl3_mac(SSL *ssl, unsigned char *md, int send_data); unsigned long ssl3_output_cert_chain(SSL *s, X509 *x); -SSL_CIPHER *ssl3_choose_cipher(SSL *ssl,STACK *have,STACK *pref); +SSL_CIPHER *ssl3_choose_cipher(SSL *ssl,STACK_OF(SSL_CIPHER) *have, + STACK_OF(SSL_CIPHER) *pref); int ssl3_setup_buffers(SSL *s); int ssl3_new(SSL *s); void ssl3_free(SSL *s); int ssl3_accept(SSL *s); int ssl3_connect(SSL *s); -int ssl3_read(SSL *s, char *buf, int len); +int ssl3_read(SSL *s, void *buf, int len); int ssl3_peek(SSL *s,char *buf, int len); -int ssl3_write(SSL *s, const char *buf, int len); +int ssl3_write(SSL *s, const void *buf, int len); int ssl3_shutdown(SSL *s); void ssl3_clear(SSL *s); long ssl3_ctrl(SSL *s,int cmd, long larg, char *parg); @@ -458,136 +471,8 @@ 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 - -SSL_METHOD *ssl_bad_method(); -SSL_METHOD *sslv2_base_method(); -SSL_METHOD *sslv23_base_method(); -SSL_METHOD *sslv3_base_method(); - -void ssl_clear_cipher_ctx(); -int ssl_clear_bad_session(); -CERT *ssl_cert_new(); -void ssl_cert_free(); -int ssl_set_cert_type(); -int ssl_get_new_session(); -int ssl_get_prev_session(); -int ssl_cipher_id_cmp(); -int ssl_cipher_ptr_id_cmp(); -STACK *ssl_bytes_to_cipher_list(); -int ssl_cipher_list_to_bytes(); -STACK *ssl_create_cipher_list(); -void ssl_update_cache(); -int ssl_session_get_ciphers(); -int ssl_verify_cert_chain(); -int ssl_undefined_function(); -X509 *ssl_get_server_send_cert(); -EVP_PKEY *ssl_get_sign_pkey(); -int ssl_cert_type(); -void ssl_set_cert_masks(); -STACK *ssl_get_ciphers_by_id(); -int ssl_verify_alarm_type(); - -int ssl2_enc_init(); -void ssl2_generate_key_material(); -void ssl2_enc(); -void ssl2_mac(); -SSL_CIPHER *ssl2_get_cipher_by_char(); -int ssl2_put_cipher_by_char(); -int ssl2_part_read(); -int ssl2_do_write(); -int ssl2_set_certificate(); -void ssl2_return_error(); -void ssl2_write_error(); -int ssl2_num_ciphers(); -SSL_CIPHER *ssl2_get_cipher(); -int ssl2_new(); -void ssl2_free(); -int ssl2_accept(); -int ssl2_connect(); -int ssl2_read(); -int ssl2_peek(); -int ssl2_write(); -int ssl2_shutdown(); -void ssl2_clear(); -long ssl2_ctrl(); -long ssl2_ctx_ctrl(); -int ssl2_pending(); - -SSL_CIPHER *ssl3_get_cipher_by_char(); -int ssl3_put_cipher_by_char(); -void ssl3_init_finished_mac(); -int ssl3_send_server_certificate(); -int ssl3_get_finished(); -int ssl3_setup_key_block(); -int ssl3_send_change_cipher_spec(); -int ssl3_change_cipher_state(); -void ssl3_cleanup_key_block(); -int ssl3_do_write(); -void ssl3_send_alert(); -int ssl3_generate_master_secret(); -int ssl3_get_req_cert_type(); -long ssl3_get_message(); -int ssl3_send_finished(); -int ssl3_num_ciphers(); -SSL_CIPHER *ssl3_get_cipher(); -int ssl3_renegotiate(); -int ssl3_renegotiate_check(); -int ssl3_dispatch_alert(); -int ssl3_read_bytes(); -int ssl3_part_read(); -int ssl3_write_bytes(); -int ssl3_final_finish_mac(); -void ssl3_finish_mac(); -int ssl3_enc(); -int ssl3_mac(); -unsigned long ssl3_output_cert_chain(); -SSL_CIPHER *ssl3_choose_cipher(); -int ssl3_setup_buffers(); -int ssl3_new(); -void ssl3_free(); -int ssl3_accept(); -int ssl3_connect(); -int ssl3_read(); -int ssl3_peek(); -int ssl3_write(); -int ssl3_shutdown(); -void ssl3_clear(); -long ssl3_ctrl(); -long ssl3_ctx_ctrl(); -int ssl3_pending(); - -int ssl23_accept(); -int ssl23_connect(); -int ssl23_read_bytes(); -int ssl23_write_bytes(); - -int ssl_init_wbio_buffer(); -void ssl_free_wbio_buffer(); - -int ssl3_cert_verify_mac(); -int ssl3_alert_code(); -int tls1_new(); -void tls1_free(); -void tls1_clear(); -long tls1_ctrl(); -SSL_METHOD *tlsv1_base_method(); -int tls1_change_cipher_state(); -int tls1_setup_key_block(); -int tls1_enc(); -int tls1_final_finish_mac(); -int tls1_cert_verify_mac(); -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(); +SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); +STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); -#endif #endif