diff options
Diffstat (limited to 'src/lib/libssl/ssl.h')
-rw-r--r-- | src/lib/libssl/ssl.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h index 5904872c92..dce72d8c25 100644 --- a/src/lib/libssl/ssl.h +++ b/src/lib/libssl/ssl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl.h,v 1.108 2017/01/23 01:04:23 jsing Exp $ */ | 1 | /* $OpenBSD: ssl.h,v 1.109 2017/01/23 01:22:08 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -464,28 +464,23 @@ struct ssl_session_st { | |||
464 | 464 | ||
465 | int master_key_length; | 465 | int master_key_length; |
466 | unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH]; | 466 | unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH]; |
467 | |||
467 | /* session_id - valid? */ | 468 | /* session_id - valid? */ |
468 | unsigned int session_id_length; | 469 | unsigned int session_id_length; |
469 | unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH]; | 470 | unsigned char session_id[SSL_MAX_SSL_SESSION_ID_LENGTH]; |
471 | |||
470 | /* this is used to determine whether the session is being reused in | 472 | /* this is used to determine whether the session is being reused in |
471 | * the appropriate context. It is up to the application to set this, | 473 | * the appropriate context. It is up to the application to set this, |
472 | * via SSL_new */ | 474 | * via SSL_new */ |
473 | unsigned int sid_ctx_length; | 475 | unsigned int sid_ctx_length; |
474 | unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH]; | 476 | unsigned char sid_ctx[SSL_MAX_SID_CTX_LENGTH]; |
475 | 477 | ||
476 | /* Used to indicate that session resumption is not allowed. | ||
477 | * Applications can also set this bit for a new session via | ||
478 | * not_resumable_session_cb to disable session caching and tickets. */ | ||
479 | int not_resumable; | ||
480 | |||
481 | /* The cert is the certificate used to establish this connection */ | ||
482 | struct sess_cert_st /* SESS_CERT */ *sess_cert; | ||
483 | |||
484 | /* This is the cert for the other end. | 478 | /* This is the cert for the other end. |
485 | * On clients, it will be the same as sess_cert->peer_key->x509 | 479 | * On clients, it will be the same as sess_cert->peer_key->x509 |
486 | * (the latter is not enough as sess_cert is not retained | 480 | * (the latter is not enough as sess_cert is not retained |
487 | * in the external representation of sessions, see ssl_asn1.c). */ | 481 | * in the external representation of sessions, see ssl_asn1.c). */ |
488 | X509 *peer; | 482 | X509 *peer; |
483 | |||
489 | /* when app_verify_callback accepts a session where the peer's certificate | 484 | /* when app_verify_callback accepts a session where the peer's certificate |
490 | * is not ok, we must remember the error for session reuse: */ | 485 | * is not ok, we must remember the error for session reuse: */ |
491 | long verify_result; /* only for servers */ | 486 | long verify_result; /* only for servers */ |