diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index f29f775347..bb846f491c 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -391,9 +391,8 @@ struct ssl_ctx_st | |||
391 | * SSL_SESSION_free() when it has finished using it. Otherwise, | 391 | * SSL_SESSION_free() when it has finished using it. Otherwise, |
392 | * on 0, it means the callback has finished with it. | 392 | * on 0, it means the callback has finished with it. |
393 | * If remove_session_cb is not null, it will be called when | 393 | * If remove_session_cb is not null, it will be called when |
394 | * a session-id is removed from the cache. Again, a return | 394 | * a session-id is removed from the cache. After the call, |
395 | * of 0 mens that SSLeay should not SSL_SESSION_free() since | 395 | * OpenSSL will SSL_SESSION_free() it. */ |
396 | * the application is doing something with it. */ | ||
397 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); | 396 | int (*new_session_cb)(struct ssl_st *ssl,SSL_SESSION *sess); |
398 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); | 397 | void (*remove_session_cb)(struct ssl_ctx_st *ctx,SSL_SESSION *sess); |
399 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, | 398 | SSL_SESSION *(*get_session_cb)(struct ssl_st *ssl, |
@@ -1215,6 +1214,7 @@ int SSL_COMP_add_compression_method(int id,char *cm); | |||
1215 | #define SSL_F_SSL2_SET_CERTIFICATE 126 | 1214 | #define SSL_F_SSL2_SET_CERTIFICATE 126 |
1216 | #define SSL_F_SSL2_WRITE 127 | 1215 | #define SSL_F_SSL2_WRITE 127 |
1217 | #define SSL_F_SSL3_ACCEPT 128 | 1216 | #define SSL_F_SSL3_ACCEPT 128 |
1217 | #define SSL_F_SSL3_CALLBACK_CTRL 233 | ||
1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 | 1218 | #define SSL_F_SSL3_CHANGE_CIPHER_STATE 129 |
1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 | 1219 | #define SSL_F_SSL3_CHECK_CERT_AND_ALGORITHM 130 |
1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 | 1220 | #define SSL_F_SSL3_CLIENT_HELLO 131 |