diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-30 05:47:33 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-30 05:47:33 +0300 |
| commit | 1134f794d02ff93b97fa77c7b506e4e49458a0e0 (patch) | |
| tree | 0582cae1e998f68646afadd54d447b29857a843c /include/violite.h | |
| parent | 097f690276abd66881f80fe1fd39824b6a7dd4de (diff) | |
| parent | 6e8704ee0993b4f06d1c3626291346d20c6d60cb (diff) | |
| download | mariadb-git-1134f794d02ff93b97fa77c7b506e4e49458a0e0.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
Diffstat (limited to 'include/violite.h')
| -rw-r--r-- | include/violite.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/violite.h b/include/violite.h index 947b874c46a..c59f6124838 100644 --- a/include/violite.h +++ b/include/violite.h @@ -169,9 +169,6 @@ struct st_VioSSLAcceptorFd state_connect = 1, state_accept = 2 }; -// BIO* bio_; -// char desc_[100]; -// Vio* sd_; /* function pointers which are only once for SSL server Vio*(*sslaccept)(struct st_VioSSLAcceptorFd*,Vio*); */ @@ -184,15 +181,17 @@ struct st_VioSSLConnectorFd SSL_METHOD* ssl_method_; /* function pointers which are only once for SSL client */ }; -void sslaccept(struct st_VioSSLAcceptorFd*, Vio*); -void sslconnect(struct st_VioSSLConnectorFd*, Vio*); +void sslaccept(struct st_VioSSLAcceptorFd*, Vio*, long timeout); +void sslconnect(struct st_VioSSLConnectorFd*, Vio*, long timeout); struct st_VioSSLConnectorFd *new_VioSSLConnectorFd(const char* key_file, const char* cert_file, - const char* ca_file, const char* ca_path); + const char* ca_file, const char* ca_path, + const char* cipher); struct st_VioSSLAcceptorFd *new_VioSSLAcceptorFd(const char* key_file, const char* cert_file, - const char* ca_file,const char* ca_path); + const char* ca_file,const char* ca_path, + const char* cipher); Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #ifdef __cplusplus @@ -200,6 +199,9 @@ Vio* new_VioSSL(struct st_VioSSLAcceptorFd* fd, Vio* sd,int state); #endif #endif /* HAVE_OPENSSL */ +/* This enumerator is used in parser - should be always visible */ +enum SSL_type {SSL_TYPE_NONE, SSL_TYPE_ANY, SSL_TYPE_X509, SSL_TYPE_SPECIFIED}; + #ifndef EMBEDDED_LIBRARY /* This structure is for every connection on both sides */ struct st_vio @@ -229,10 +231,8 @@ struct st_vio my_bool (*poll_read)(Vio*,uint); #ifdef HAVE_OPENSSL - BIO* bio_; SSL* ssl_; my_bool open_; - char *ssl_cip_; #endif /* HAVE_OPENSSL */ #endif /* HAVE_VIO */ }; |