projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some SSLv2 references
[openssl.git]
/
ssl
/
ssl_locl.h
diff --git
a/ssl/ssl_locl.h
b/ssl/ssl_locl.h
index 24ce4f752ac2179dc05fb38f3076581c540f48a3..5a9406656ecfd1d4dbe5db7f06b5fba235c56b6c 100644
(file)
--- a/
ssl/ssl_locl.h
+++ b/
ssl/ssl_locl.h
@@
-555,7
+555,7
@@
struct ssl_cipher_st {
int alg_bits; /* Number of bits for algorithm */
};
int alg_bits; /* Number of bits for algorithm */
};
-/* Used to hold
functions for SSLv2 or SSLv3/TLSv1
functions */
+/* Used to hold
SSL/TLS
functions */
struct ssl_method_st {
int version;
int (*ssl_new) (SSL *s);
struct ssl_method_st {
int version;
int (*ssl_new) (SSL *s);
@@
-986,8
+986,7
@@
struct ssl_st {
* request needs re-doing when in SSL_accept or SSL_connect
*/
int rwstate;
* request needs re-doing when in SSL_accept or SSL_connect
*/
int rwstate;
- /* true when we are actually in SSL_accept() or SSL_connect() */
- int in_handshake;
+
int (*handshake_func) (SSL *);
/*
* Imagine that here's a boolean member "init" that is switched as soon
int (*handshake_func) (SSL *);
/*
* Imagine that here's a boolean member "init" that is switched as soon
@@
-1010,7
+1009,7
@@
struct ssl_st {
/* we have shut things down, 0x01 sent, 0x02 for received */
int shutdown;
/* where we are */
/* we have shut things down, 0x01 sent, 0x02 for received */
int shutdown;
/* where we are */
- STATEM statem;
+
OSSL_
STATEM statem;
BUF_MEM *init_buf; /* buffer used during init */
void *init_msg; /* pointer to handshake message body, set by
BUF_MEM *init_buf; /* buffer used during init */
void *init_msg; /* pointer to handshake message body, set by
@@
-1982,7
+1981,6
@@
__owur unsigned int dtls_raw_hello_verify_request(unsigned char *buf,
unsigned char cookie_len);
__owur int dtls1_send_newsession_ticket(SSL *s);
__owur unsigned int dtls1_min_mtu(SSL *s);
unsigned char cookie_len);
__owur int dtls1_send_newsession_ticket(SSL *s);
__owur unsigned int dtls1_min_mtu(SSL *s);
-__owur unsigned int dtls1_link_min_mtu(void);
void dtls1_hm_fragment_free(hm_fragment *frag);
__owur int dtls1_query_mtu(SSL *s);
void dtls1_hm_fragment_free(hm_fragment *frag);
__owur int dtls1_query_mtu(SSL *s);