wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

const-ify some input SSL * arguments

Browse source 
These tiny functions only read from the input SSL, and we are
about to use them from functions that only have a const SSL* available,
so propagate const a bit further.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6378)
This commit is contained in:
Benjamin Kaduk 2018-05-30 09:28:03 -05:00 committed by Benjamin Kaduk
parent f20aa69e33
commit 4cc968df40
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/man3/SSL_in_init.pod
View file

@ -14,9 +14,9 @@ SSL_get_state
#include <openssl/ssl.h>
int SSL_in_init(SSL *s);
int SSL_in_before(SSL *s);
int SSL_is_init_finished(SSL *s);
int SSL_in_init(const SSL *s);
int SSL_in_before(const SSL *s);
int SSL_is_init_finished(const SSL *s);
int SSL_in_connect_init(SSL *s);
int SSL_in_accept_init(SSL *s);

6
include/openssl/ssl.h
View file

@ -1058,9 +1058,9 @@ typedef enum {
/* Is the SSL_connection established? */
# define SSL_in_connect_init(a) (SSL_in_init(a) && !SSL_is_server(a))
# define SSL_in_accept_init(a) (SSL_in_init(a) && SSL_is_server(a))
int SSL_in_init(SSL *s);
int SSL_in_before(SSL *s);
int SSL_is_init_finished(SSL *s);
int SSL_in_init(const SSL *s);
int SSL_in_before(const SSL *s);
int SSL_is_init_finished(const SSL *s);
/*
* The following 3 states are kept in ssl->rlayer.rstate when reads fail, you

6
ssl/statem/statem.c
View file

@ -68,17 +68,17 @@ OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl)
return ssl->statem.hand_state;
}
int SSL_in_init(SSL *s)
int SSL_in_init(const SSL *s)
{
return s->statem.in_init;
}
int SSL_is_init_finished(SSL *s)
int SSL_is_init_finished(const SSL *s)
{
return !(s->statem.in_init) && (s->statem.hand_state == TLS_ST_OK);
}
int SSL_in_before(SSL *s)
int SSL_in_before(const SSL *s)
{
/*
* Historically being "in before" meant before anything had happened. In the