summaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorPauli <paul.dale@oracle.com>2020-12-01 11:30:10 +1000
committerPauli <paul.dale@oracle.com>2020-12-03 11:22:06 +1000
commita7e6a3d8ef4eea0e211441392b80a7acfd4a16b2 (patch)
tree5b75dcf0190ec0e37e648ba3ebf61f6272c7dbb5 /ssl
parente442cdaea2fbd049fc7798a4ad39fb986f55d4de (diff)
downloadopenssl-new-a7e6a3d8ef4eea0e211441392b80a7acfd4a16b2.tar.gz
tag unused function arguments as ossl_unused
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org> (Merged from https://github.com/openssl/openssl/pull/13577)
Diffstat (limited to 'ssl')
-rw-r--r--ssl/record/ssl3_record_tls13.c2
-rw-r--r--ssl/statem/extensions.c4
-rw-r--r--ssl/statem/extensions_clnt.c5
-rw-r--r--ssl/statem/extensions_srvr.c12
-rw-r--r--ssl/statem/statem_lib.c3
5 files changed, 16 insertions, 10 deletions
diff --git a/ssl/record/ssl3_record_tls13.c b/ssl/record/ssl3_record_tls13.c
index 71ae51f570..0e4b310148 100644
--- a/ssl/record/ssl3_record_tls13.c
+++ b/ssl/record/ssl3_record_tls13.c
@@ -21,7 +21,7 @@
* 1: if the record encryption/decryption was successful.
*/
int tls13_enc(SSL *s, SSL3_RECORD *recs, size_t n_recs, int sending,
- SSL_MAC_BUF *mac, size_t macsize)
+ ossl_unused SSL_MAC_BUF *mac, ossl_unused size_t macsize)
{
EVP_CIPHER_CTX *ctx;
unsigned char iv[EVP_MAX_IV_LENGTH], recheader[SSL3_RT_HEADER_LENGTH];
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index c702abb315..a4e60d417c 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -1129,7 +1129,7 @@ static int init_sig_algs(SSL *s, unsigned int context)
return 1;
}
-static int init_sig_algs_cert(SSL *s, unsigned int context)
+static int init_sig_algs_cert(SSL *s, ossl_unused unsigned int context)
{
/* Clear any signature algorithms extension received */
OPENSSL_free(s->s3.tmp.peer_cert_sigalgs);
@@ -1674,7 +1674,7 @@ static int final_maxfragmentlen(SSL *s, unsigned int context, int sent)
return 1;
}
-static int init_post_handshake_auth(SSL *s, unsigned int context)
+static int init_post_handshake_auth(SSL *s, ossl_unused unsigned int context)
{
s->post_handshake_auth = SSL_PHA_NONE;
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index f01cb3c2f3..14dd7cfc76 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -1158,8 +1158,9 @@ EXT_RETURN tls_construct_ctos_psk(SSL *s, WPACKET *pkt, unsigned int context,
}
EXT_RETURN tls_construct_ctos_post_handshake_auth(SSL *s, WPACKET *pkt,
- unsigned int context,
- X509 *x, size_t chainidx)
+ ossl_unused unsigned int context,
+ ossl_unused X509 *x,
+ ossl_unused size_t chainidx)
{
#ifndef OPENSSL_NO_TLS1_3
if (!s->pha_enabled)
diff --git a/ssl/statem/extensions_srvr.c b/ssl/statem/extensions_srvr.c
index c3657f7e3f..2a6d89558b 100644
--- a/ssl/statem/extensions_srvr.c
+++ b/ssl/statem/extensions_srvr.c
@@ -267,8 +267,10 @@ int tls_parse_ctos_session_ticket(SSL *s, PACKET *pkt, unsigned int context,
return 1;
}
-int tls_parse_ctos_sig_algs_cert(SSL *s, PACKET *pkt, unsigned int context,
- X509 *x, size_t chainidx)
+int tls_parse_ctos_sig_algs_cert(SSL *s, PACKET *pkt,
+ ossl_unused unsigned int context,
+ ossl_unused X509 *x,
+ ossl_unused size_t chainidx)
{
PACKET supported_sig_algs;
@@ -1214,8 +1216,10 @@ err:
return 0;
}
-int tls_parse_ctos_post_handshake_auth(SSL *s, PACKET *pkt, unsigned int context,
- X509 *x, size_t chainidx)
+int tls_parse_ctos_post_handshake_auth(SSL *s, PACKET *pkt,
+ ossl_unused unsigned int context,
+ ossl_unused X509 *x,
+ ossl_unused size_t chainidx)
{
if (PACKET_remaining(pkt) != 0) {
SSLfatal(s, SSL_AD_DECODE_ERROR,
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 0773b42e0e..5d89b75c05 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -1043,7 +1043,8 @@ unsigned long ssl3_output_cert_chain(SSL *s, WPACKET *pkt, CERT_PKEY *cpk)
* in NBIO events. If |clearbufs| is set then init_buf and the wbio buffer is
* freed up as well.
*/
-WORK_STATE tls_finish_handshake(SSL *s, WORK_STATE wst, int clearbufs, int stop)
+WORK_STATE tls_finish_handshake(SSL *s, ossl_unused WORK_STATE wst,
+ int clearbufs, int stop)
{
void (*cb) (const SSL *ssl, int type, int val) = NULL;
int cleanuphand = s->statem.cleanuphand;