diff options
Diffstat (limited to 'src/lib/libssl/ssl_sess.c')
| -rw-r--r-- | src/lib/libssl/ssl_sess.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_sess.c b/src/lib/libssl/ssl_sess.c index cbfff0b398..c67ae1c22f 100644 --- a/src/lib/libssl/ssl_sess.c +++ b/src/lib/libssl/ssl_sess.c | |||
| @@ -147,16 +147,16 @@ static void SSL_SESSION_list_remove(SSL_CTX *ctx, SSL_SESSION *s); | |||
| 147 | static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s); | 147 | static void SSL_SESSION_list_add(SSL_CTX *ctx, SSL_SESSION *s); |
| 148 | static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck); | 148 | static int remove_session_lock(SSL_CTX *ctx, SSL_SESSION *c, int lck); |
| 149 | 149 | ||
| 150 | SSL_SESSION | ||
| 151 | *SSL_get_session(const SSL *ssl) | ||
| 152 | /* aka SSL_get0_session; gets 0 objects, just returns a copy of the pointer */ | 150 | /* aka SSL_get0_session; gets 0 objects, just returns a copy of the pointer */ |
| 151 | SSL_SESSION * | ||
| 152 | SSL_get_session(const SSL *ssl) | ||
| 153 | { | 153 | { |
| 154 | return (ssl->session); | 154 | return (ssl->session); |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | SSL_SESSION | ||
| 158 | *SSL_get1_session(SSL *ssl) | ||
| 159 | /* variant of SSL_get_session: caller really gets something */ | 157 | /* variant of SSL_get_session: caller really gets something */ |
| 158 | SSL_SESSION * | ||
| 159 | SSL_get1_session(SSL *ssl) | ||
| 160 | { | 160 | { |
| 161 | SSL_SESSION *sess; | 161 | SSL_SESSION *sess; |
| 162 | /* Need to lock this all up rather than just use CRYPTO_add so that | 162 | /* Need to lock this all up rather than just use CRYPTO_add so that |
| @@ -184,14 +184,14 @@ SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg) | |||
| 184 | return (CRYPTO_set_ex_data(&s->ex_data, idx, arg)); | 184 | return (CRYPTO_set_ex_data(&s->ex_data, idx, arg)); |
| 185 | } | 185 | } |
| 186 | 186 | ||
| 187 | void | 187 | void * |
| 188 | *SSL_SESSION_get_ex_data(const SSL_SESSION *s, int idx) | 188 | SSL_SESSION_get_ex_data(const SSL_SESSION *s, int idx) |
| 189 | { | 189 | { |
| 190 | return (CRYPTO_get_ex_data(&s->ex_data, idx)); | 190 | return (CRYPTO_get_ex_data(&s->ex_data, idx)); |
| 191 | } | 191 | } |
| 192 | 192 | ||
| 193 | SSL_SESSION | 193 | SSL_SESSION * |
| 194 | *SSL_SESSION_new(void) | 194 | SSL_SESSION_new(void) |
| 195 | { | 195 | { |
| 196 | SSL_SESSION *ss; | 196 | SSL_SESSION *ss; |
| 197 | 197 | ||
| @@ -230,8 +230,8 @@ SSL_SESSION | |||
| 230 | return (ss); | 230 | return (ss); |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | const unsigned char | 233 | const unsigned char * |
| 234 | *SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) | 234 | SSL_SESSION_get_id(const SSL_SESSION *s, unsigned int *len) |
| 235 | { | 235 | { |
| 236 | if (len) | 236 | if (len) |
| 237 | *len = s->session_id_length; | 237 | *len = s->session_id_length; |
| @@ -824,8 +824,8 @@ SSL_SESSION_set_time(SSL_SESSION *s, long t) | |||
| 824 | return (t); | 824 | return (t); |
| 825 | } | 825 | } |
| 826 | 826 | ||
| 827 | X509 | 827 | X509 * |
| 828 | *SSL_SESSION_get0_peer(SSL_SESSION *s) | 828 | SSL_SESSION_get0_peer(SSL_SESSION *s) |
| 829 | { | 829 | { |
| 830 | return s->peer; | 830 | return s->peer; |
| 831 | } | 831 | } |
