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

remove horrible pragma macro and remove __owur from SSL_CTX_add_session() declaration

Browse source 
Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4014)
This commit is contained in:
Lingmo Zhu 2017-08-02 20:55:40 +08:00 committed by Matt Caswell
parent e29bb83479
commit 5bd05e5799
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/openssl/ssl.h
View file

@ -1559,7 +1559,7 @@ int SSL_SESSION_up_ref(SSL_SESSION *ses);
void SSL_SESSION_free(SSL_SESSION *ses);
__owur int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp);
__owur int SSL_set_session(SSL *to, SSL_SESSION *session);
__owur int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
int SSL_CTX_add_session(SSL_CTX *s, SSL_SESSION *c);
int SSL_CTX_remove_session(SSL_CTX *, SSL_SESSION *c);
__owur int SSL_CTX_set_generate_session_id(SSL_CTX *, GEN_SESSION_CB);
__owur int SSL_set_generate_session_id(SSL *, GEN_SESSION_CB);

3
ssl/ssl_sess.c
View file

@ -549,10 +549,7 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al)
* interrupt the session resumption process. The return
* value is intentionally ignored.
*/
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-result"
SSL_CTX_add_session(s->session_ctx, ret);
#pragma GCC diagnostic pop
}
}
}