diff options
| author |   beck <beck@openbsd.org> | 2000-04-15 06:18:28 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2000-04-15 06:18:28 +0000 |
| commit | f6e3f26248a24c86023ecf5715f4f93988bb2af0 (patch) | |
| tree | ac021db17e92c0faf3fd3cde4f68d156321aa307 /lib/libssl/ssl.h | |
| parent | Modify to build with ncurses, not ocurses. A proper port to terminfo (diff) | |
| download | wireguard-openbsd-f6e3f26248a24c86023ecf5715f4f93988bb2af0.tar.xz wireguard-openbsd-f6e3f26248a24c86023ecf5715f4f93988bb2af0.zip | |
OpenSSL 0.9.5a merge
Diffstat (limited to 'lib/libssl/ssl.h')
| -rw-r--r-- | lib/libssl/ssl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h index f29f7753474..bb846f491c4 100644 --- a/lib/libssl/ssl.h +++ b/lib/libssl/ssl.h @@ -391,9 +391,8 @@ struct ssl_ctx_st * SSL_SESSION_free() when it has finished using it. Otherwise, * on 0, it means the callback has finished with it. * If remove_session_cb is not null, it will be called when - * a session-id is removed from the cache. Again, a return - * of 0 mens that SSLeay should not SSL_SESSION_free() since - * the application is doing something with it. */ + * a session-id is removed from the cache. After the call, + * OpenSSL will SSL_SESSION_free() it. */ int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, @@ -1215,6 +1214,7 @@ int SSL_COMP_add_compression_method(int id,char *cm); #define SSL_F_SSL2_SET_CERTIFICATE 126 #define SSL_F_SSL2_WRITE 127 #define SSL_F_SSL3_ACCEPT 128 +#define SSL_F_SSL3_CALLBACK_CTRL 233 #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 #define SSL_F_SSL3_CLIENT_HELLO 131 |