Commit fddfc0af authored by Remi Gacogne's avatar Remi Gacogne Committed by Matt Caswell
Browse files

Add missing session id and tlsext_status accessors 



 * SSL_SESSION_set1_id()
 * SSL_SESSION_get0_id_context()
 * SSL_CTX_get_tlsext_status_cb()
 * SSL_CTX_get_tlsext_status_arg()

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 46117d31

doc/ssl/SSL_CTX_set_tlsext_status_cb.pod

+9 −0
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
=head1 NAME



SSL_CTX_set_tlsext_status_cb,

SSL_CTX_get_tlsext_status_cb,

SSL_CTX_set_tlsext_status_arg,

SSL_CTX_get_tlsext_status_arg,

SSL_CTX_set_tlsext_status_type,

SSL_CTX_get_tlsext_status_type,

SSL_set_tlsext_status_type,
@@ -18,7 +20,11 @@ SSL_set_tlsext_status_ocsp_resp 


 long SSL_CTX_set_tlsext_status_cb(SSL_CTX *ctx,

                                   int (*callback)(SSL *, void *));

 long SSL_CTX_get_tlsext_status_cb(SSL_CTX *ctx,

                                   int (**callback)(SSL *, void *));



 long SSL_CTX_set_tlsext_status_arg(SSL_CTX *ctx, void *arg);

 long SSL_CTX_get_tlsext_status_arg(SSL_CTX *ctx, void **arg);



 long SSL_CTX_set_tlsext_status_type(SSL_CTX *ctx, int type);

 long SSL_CTX_get_tlsext_status_type(SSL_CTX *ctx);
@@ -48,6 +54,9 @@ acceptable or not. The callback will be passed as an argument the value 
previously set via a call to SSL_CTX_set_tlsext_status_arg(). Note that the

callback will not be called in the event of a handshake where session resumption

occurs (because there are no Certificates exchanged in such a handshake).

The callback previously set via SSL_CTX_set_tlsext_status_cb() can be retrieved

by calling SSL_CTX_get_tlsext_status_cb(), and the argument by calling

SSL_CTX_get_tlsext_status_arg().



On the client side SSL_get_tlsext_status_type() can be used to determine whether

the client has previously called SSL_set_tlsext_status_type(). It will return

doc/ssl/SSL_SESSION_get0_id_context.pod

0 → 100644
+41 −0
Original line number Diff line number Diff line 
=pod



=head1 NAME



SSL_SESSION_get0_id_context - get the SSL ID context associated with a session



=head1 SYNOPSIS



 #include <openssl/ssl.h>



 const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *s,

                                                  unsigned int *len)



=head1 DESCRIPTION



SSL_SESSION_get0_id_context() returns the ID context associated with

the SSL/TLS session B<s>. The length of the ID context is written to

B<*len> if B<len> is not NULL.



The value returned is a pointer to an object maintained within B<s> and

should not be released.



=head1 SEE ALSO



L<ssl(3)>,

L<SSL_set_session_id_context(3)>



=head1 HISTORY



SSL_SESSION_get0_id_context() was first added to OpenSSL 1.1.0



=head1 COPYRIGHT



Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.



Licensed under the OpenSSL license (the "License").  You may not use

this file except in compliance with the License.  You can obtain a copy

in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



=cut

doc/ssl/SSL_SESSION_set1_id.pod

0 → 100644
+41 −0
Original line number Diff line number Diff line 
=pod



=head1 NAME



SSL_SESSION_set1_id - set the SSL session ID



=head1 SYNOPSIS



 #include <openssl/ssl.h>



 int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,

                         unsigned int sid_len);



=head1 DESCRIPTION



SSL_SESSION_set1_id() sets the the session ID for the B<ssl> SSL/TLS session

to B<sid> of length B<sid_len>.



=head1 RETURN VALUES



SSL_SESSION_set1_id() returns 1 for success and 0 for failure, for example

if the supplied session ID length exceeds B<SSL_MAX_SSL_SESSION_ID_LENGTH>.



=head1 SEE ALSO



L<ssl(3)>



=head1 HISTORY



SSL_SESSION_set1_id() was first added to OpenSSL 1.1.0



=head1 COPYRIGHT



Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.



Licensed under the OpenSSL license (the "License").  You may not use

this file except in compliance with the License.  You can obtain a copy

in the file LICENSE in the source distribution or at

L<https://www.openssl.org/source/license.html>.



=cut

include/openssl/ssl.h

+8 −0
Original line number Diff line number Diff line
@@ -1137,6 +1137,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION) 
# define SSL_CTRL_SET_SPLIT_SEND_FRAGMENT        125

# define SSL_CTRL_SET_MAX_PIPELINES              126

# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_TYPE     127

# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB       128

# define SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG   129

# define SSL_CERT_SET_FIRST                      1

# define SSL_CERT_SET_NEXT                       2

# define SSL_CERT_SET_SERVER                     3
@@ -1406,10 +1408,14 @@ __owur int SSL_copy_session_id(SSL *to, const SSL *from); 
__owur X509 *SSL_SESSION_get0_peer(SSL_SESSION *s);

__owur int SSL_SESSION_set1_id_context(SSL_SESSION *s, const unsigned char *sid_ctx,

                                unsigned int sid_ctx_len);

__owur int SSL_SESSION_set1_id(SSL_SESSION *s, const unsigned char *sid,

                               unsigned int sid_len);



__owur SSL_SESSION *SSL_SESSION_new(void);

const unsigned char *SSL_SESSION_get_id(const SSL_SESSION *s,

                                        unsigned int *len);

const unsigned char *SSL_SESSION_get0_id_context(const SSL_SESSION *s,

                                                unsigned int *len);

__owur unsigned int SSL_SESSION_get_compress_id(const SSL_SESSION *s);

# ifndef OPENSSL_NO_STDIO

int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *ses);
@@ -2169,6 +2175,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_F_SSL_SESSION_DUP                            348

# define SSL_F_SSL_SESSION_NEW                            189

# define SSL_F_SSL_SESSION_PRINT_FP                       190

# define SSL_F_SSL_SESSION_SET1_ID                        423

# define SSL_F_SSL_SESSION_SET1_ID_CONTEXT                312

# define SSL_F_SSL_SET_ALPN_PROTOS                        344

# define SSL_F_SSL_SET_CERT                               191
@@ -2448,6 +2455,7 @@ int ERR_load_SSL_strings(void); 
# define SSL_R_SSL_SECTION_NOT_FOUND                      136

# define SSL_R_SSL_SESSION_ID_CALLBACK_FAILED             301

# define SSL_R_SSL_SESSION_ID_CONFLICT                    302

# define SSL_R_SSL_SESSION_ID_TOO_LONG                    408

# define SSL_R_SSL_SESSION_ID_CONTEXT_TOO_LONG            273

# define SSL_R_SSL_SESSION_ID_HAS_BAD_LENGTH              303

# define SSL_R_SSL_SESSION_VERSION_MISMATCH               210

include/openssl/tls1.h

+4 −0
Original line number Diff line number Diff line
@@ -292,9 +292,13 @@ SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG,0, (void *)arg) 
# define SSL_CTX_set_tlsext_ticket_keys(ctx, keys, keylen) \

        SSL_CTX_ctrl((ctx),SSL_CTRL_SET_TLSEXT_TICKET_KEYS,(keylen),(keys))



# define SSL_CTX_get_tlsext_status_cb(ssl, cb) \

SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB,0, (void (**)(void))cb)

# define SSL_CTX_set_tlsext_status_cb(ssl, cb) \

SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB,(void (*)(void))cb)



# define SSL_CTX_get_tlsext_status_arg(ssl, arg) \

SSL_CTX_ctrl(ssl,SSL_CTRL_GET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg

# define SSL_CTX_set_tlsext_status_arg(ssl, arg) \

SSL_CTX_ctrl(ssl,SSL_CTRL_SET_TLSEXT_STATUS_REQ_CB_ARG,0, (void *)arg)