summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_rsa.c
diff options
context:
space:
mode:
authorBen Laurie <ben@links.org>2014-02-04 23:16:46 +0000
committerScott Deboy <sdeboy@secondstryke.com>2014-02-08 16:19:30 -0800
commit130ebe34c8e16985c9af740d0c9945f429b77431 (patch)
treef29633109c2541edd7073d1f09400b06ab4ad17d /ssl/ssl_rsa.c
parent7612511b3b54e5d729caa9897a1cfb5beb224266 (diff)
Fix whitespace, new-style comments.
Diffstat (limited to 'ssl/ssl_rsa.c')
-rw-r--r--ssl/ssl_rsa.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index 799210f5e2..49bd03596a 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -844,17 +844,19 @@ static int serverinfo_find_extension(const unsigned char *serverinfo,
}
static int serverinfo_srv_first_cb(SSL *s, unsigned short ext_type,
- const unsigned char *in,
- unsigned short inlen, int *al,
- void *arg)
+ const unsigned char *in,
+ unsigned short inlen, int *al,
+ void *arg)
{
size_t i = 0;
+
if (inlen != 0)
{
*al = SSL_AD_DECODE_ERROR;
return 0;
}
- //if already in list, error out
+
+ /* if already in list, error out */
for (i = 0; i < s->s3->serverinfo_client_tlsext_custom_types_count; i++)
{
if (s->s3->serverinfo_client_tlsext_custom_types[i] == ext_type)
@@ -880,8 +882,8 @@ static int serverinfo_srv_first_cb(SSL *s, unsigned short ext_type,
}
static int serverinfo_srv_second_cb(SSL *s, unsigned short ext_type,
- const unsigned char **out, unsigned short *outlen,
- int *al, void *arg)
+ const unsigned char **out, unsigned short *outlen,
+ int *al, void *arg)
{
const unsigned char *serverinfo = NULL;
size_t serverinfo_length = 0;
@@ -898,17 +900,17 @@ static int serverinfo_srv_second_cb(SSL *s, unsigned short ext_type,
}
if (!match)
{
- //extension not sent by client...don't send extension
+ /* extension not sent by client...don't send extension */
return -1;
}
/* Is there serverinfo data for the chosen server cert? */
if ((ssl_get_server_cert_serverinfo(s, &serverinfo,
- &serverinfo_length)) != 0)
+ &serverinfo_length)) != 0)
{
/* Find the relevant extension from the serverinfo */
int retval = serverinfo_find_extension(serverinfo, serverinfo_length,
- ext_type, out, outlen);
+ ext_type, out, outlen);
if (retval == 0)
return 0; /* Error */
if (retval == -1)