summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBen Laurie <ben@links.org>2014-02-05 00:16:46 +0100
committerBen Laurie <ben@links.org>2014-02-05 19:25:46 +0100
commit0a6028757a77769f09d5c6dd3a541971224a5d81 (patch)
treed62033cf3aec65dc649046ac32e4720925c7206b /apps
parentRe-add alert variables removed during rebase (diff)
downloadopenssl-0a6028757a77769f09d5c6dd3a541971224a5d81.tar.xz
openssl-0a6028757a77769f09d5c6dd3a541971224a5d81.zip
Fix whitespace, new-style comments.
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c40
-rw-r--r--apps/s_server.c40
2 files changed, 40 insertions, 40 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 236dbd31fc..af88ffdaad 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -236,22 +236,22 @@ static int server_provided_client_authz = 0;
static const unsigned char auth_ext_data[]={TLSEXT_AUTHZDATAFORMAT_dtcp};
static int suppdata_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char *in,
- unsigned short inlen, int *al,
- void *arg);
+ const unsigned char *in,
+ unsigned short inlen, int *al,
+ void *arg);
static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char **out,
- unsigned short *outlen, int *al, void *arg);
+ const unsigned char **out,
+ unsigned short *outlen, int *al, void *arg);
static int authz_tlsext_generate_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);
static int authz_tlsext_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);
#endif
#ifndef OPENSSL_NO_PSK
@@ -2439,9 +2439,9 @@ static int ocsp_resp_cb(SSL *s, void *arg)
}
static int authz_tlsext_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)
{
if (TLSEXT_TYPE_server_authz == ext_type)
server_provided_server_authz
@@ -2455,8 +2455,8 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type,
}
static int authz_tlsext_generate_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)
{
if (c_auth)
{
@@ -2474,9 +2474,9 @@ static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type,
}
static int suppdata_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char *in,
- unsigned short inlen, int *al,
- void *arg)
+ const unsigned char *in,
+ unsigned short inlen, int *al,
+ void *arg)
{
if (supp_data_type == TLSEXT_SUPPLEMENTALDATATYPE_authz_data)
{
@@ -2487,8 +2487,8 @@ static int suppdata_cb(SSL *s, unsigned short supp_data_type,
}
static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char **out,
- unsigned short *outlen, int *al, void *arg)
+ const unsigned char **out,
+ unsigned short *outlen, int *al, void *arg)
{
if (c_auth && server_provided_client_authz && server_provided_server_authz)
{
diff --git a/apps/s_server.c b/apps/s_server.c
index 47fa2f361e..f757f3caa1 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -331,22 +331,22 @@ static int cert_chain = 0;
#ifndef OPENSSL_NO_TLSEXT
static int suppdata_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char *in,
- unsigned short inlen, int *al,
- void *arg);
+ const unsigned char *in,
+ unsigned short inlen, int *al,
+ void *arg);
static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char **out,
- unsigned short *outlen, int *al, void *arg);
+ const unsigned char **out,
+ unsigned short *outlen, int *al, void *arg);
static int authz_tlsext_generate_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);
static int authz_tlsext_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);
static BIO *serverinfo_in = NULL;
static const char *s_serverinfo_file = NULL;
@@ -3585,9 +3585,9 @@ static void free_sessions(void)
#ifndef OPENSSL_NO_TLSEXT
static int authz_tlsext_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)
{
if (TLSEXT_TYPE_server_authz == ext_type)
client_provided_server_authz
@@ -3601,8 +3601,8 @@ static int authz_tlsext_cb(SSL *s, unsigned short ext_type,
}
static int authz_tlsext_generate_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)
{
if (c_auth && client_provided_client_authz && client_provided_server_authz)
{
@@ -3621,9 +3621,9 @@ static int authz_tlsext_generate_cb(SSL *s, unsigned short ext_type,
}
static int suppdata_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char *in,
- unsigned short inlen, int *al,
- void *arg)
+ const unsigned char *in,
+ unsigned short inlen, int *al,
+ void *arg)
{
if (supp_data_type == TLSEXT_SUPPLEMENTALDATATYPE_authz_data)
{
@@ -3634,8 +3634,8 @@ static int suppdata_cb(SSL *s, unsigned short supp_data_type,
}
static int auth_suppdata_generate_cb(SSL *s, unsigned short supp_data_type,
- const unsigned char **out,
- unsigned short *outlen, int *al, void *arg)
+ const unsigned char **out,
+ unsigned short *outlen, int *al, void *arg)
{
if (c_auth && client_provided_client_authz && client_provided_server_authz)
{