diff options
| author | Scott Deboy <sdeboy@secondstryke.com> | 2014-02-04 22:08:43 +0100 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-02-05 19:25:46 +0100 |
| commit | e9add063b50e8a460d5636055156d2760c2fe29f (patch) | |
| tree | 7306ee92958bf24088020a5f0d7b8900b751fef6 /apps/s_server.c | |
| parent | Updating DTCP authorization type to expected value (diff) | |
| download | openssl-e9add063b50e8a460d5636055156d2760c2fe29f.tar.xz openssl-e9add063b50e8a460d5636055156d2760c2fe29f.zip | |
Re-add alert variables removed during rebase
Whitespace fixes
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index 29969200b6..47fa2f361e 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) { |