summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinoguchi <>2020-07-27 12:29:51 +0000
committerinoguchi <>2020-07-27 12:29:51 +0000
commit407f7d98a914db77baf1ed3b08e34fc86b3e06bb (patch)
tree96944f7075dab31f3b5435f951c305959482783f /src
parentb35c8d607b9342a2a3f664a4c96d072776b31258 (diff)
downloadopenbsd-407f7d98a914db77baf1ed3b08e34fc86b3e06bb.tar.gz
openbsd-407f7d98a914db77baf1ed3b08e34fc86b3e06bb.tar.bz2
openbsd-407f7d98a914db77baf1ed3b08e34fc86b3e06bb.zip
Remove space between '*' and pointer variable in s_server.c
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/s_server.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/usr.bin/openssl/s_server.c b/src/usr.bin/openssl/s_server.c
index 115524921e..ebabd41d3e 100644
--- a/src/usr.bin/openssl/s_server.c
+++ b/src/usr.bin/openssl/s_server.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s_server.c,v 1.40 2020/07/27 12:19:51 inoguchi Exp $ */ 1/* $OpenBSD: s_server.c,v 1.41 2020/07/27 12:29:51 inoguchi Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -181,10 +181,10 @@ static int sv_body(char *hostname, int s, unsigned char *context);
181static int www_body(char *hostname, int s, unsigned char *context); 181static int www_body(char *hostname, int s, unsigned char *context);
182static void close_accept_socket(void); 182static void close_accept_socket(void);
183static void sv_usage(void); 183static void sv_usage(void);
184static int init_ssl_connection(SSL * s); 184static int init_ssl_connection(SSL *s);
185static void print_stats(BIO * bp, SSL_CTX * ctx); 185static void print_stats(BIO *bp, SSL_CTX *ctx);
186static int 186static int
187generate_session_id(const SSL * ssl, unsigned char *id, 187generate_session_id(const SSL *ssl, unsigned char *id,
188 unsigned int *id_len); 188 unsigned int *id_len);
189#ifndef OPENSSL_NO_DH 189#ifndef OPENSSL_NO_DH
190static DH *load_dh_param(const char *dhfile); 190static DH *load_dh_param(const char *dhfile);
@@ -1006,7 +1006,7 @@ static int local_argc = 0;
1006static char **local_argv; 1006static char **local_argv;
1007 1007
1008static int 1008static int
1009ssl_servername_cb(SSL * s, int *ad, void *arg) 1009ssl_servername_cb(SSL *s, int *ad, void *arg)
1010{ 1010{
1011 tlsextctx *p = (tlsextctx *) arg; 1011 tlsextctx *p = (tlsextctx *) arg;
1012 const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name); 1012 const char *servername = SSL_get_servername(s, TLSEXT_NAMETYPE_host_name);
@@ -1039,7 +1039,7 @@ ssl_servername_cb(SSL * s, int *ad, void *arg)
1039 */ 1039 */
1040 1040
1041static int 1041static int
1042cert_status_cb(SSL * s, void *arg) 1042cert_status_cb(SSL *s, void *arg)
1043{ 1043{
1044 tlsextstatusctx *srctx = arg; 1044 tlsextstatusctx *srctx = arg;
1045 BIO *err = srctx->err; 1045 BIO *err = srctx->err;
@@ -1047,14 +1047,14 @@ cert_status_cb(SSL * s, void *arg)
1047 int use_ssl; 1047 int use_ssl;
1048 unsigned char *rspder = NULL; 1048 unsigned char *rspder = NULL;
1049 int rspderlen; 1049 int rspderlen;
1050 STACK_OF(OPENSSL_STRING) * aia = NULL; 1050 STACK_OF(OPENSSL_STRING) *aia = NULL;
1051 X509 *x = NULL; 1051 X509 *x = NULL;
1052 X509_STORE_CTX inctx; 1052 X509_STORE_CTX inctx;
1053 X509_OBJECT obj; 1053 X509_OBJECT obj;
1054 OCSP_REQUEST *req = NULL; 1054 OCSP_REQUEST *req = NULL;
1055 OCSP_RESPONSE *resp = NULL; 1055 OCSP_RESPONSE *resp = NULL;
1056 OCSP_CERTID *id = NULL; 1056 OCSP_CERTID *id = NULL;
1057 STACK_OF(X509_EXTENSION) * exts; 1057 STACK_OF(X509_EXTENSION) *exts;
1058 int ret = SSL_TLSEXT_ERR_NOACK; 1058 int ret = SSL_TLSEXT_ERR_NOACK;
1059 int i; 1059 int i;
1060 1060
@@ -1605,7 +1605,7 @@ s_server_main(int argc, char *argv[])
1605} 1605}
1606 1606
1607static void 1607static void
1608print_stats(BIO * bio, SSL_CTX * ssl_ctx) 1608print_stats(BIO *bio, SSL_CTX *ssl_ctx)
1609{ 1609{
1610 BIO_printf(bio, "%4ld items in the session cache\n", 1610 BIO_printf(bio, "%4ld items in the session cache\n",
1611 SSL_CTX_sess_number(ssl_ctx)); 1611 SSL_CTX_sess_number(ssl_ctx));
@@ -1948,7 +1948,7 @@ close_accept_socket(void)
1948} 1948}
1949 1949
1950static int 1950static int
1951init_ssl_connection(SSL * con) 1951init_ssl_connection(SSL *con)
1952{ 1952{
1953 int i; 1953 int i;
1954 const char *str; 1954 const char *str;
@@ -2130,7 +2130,7 @@ www_body(char *hostname, int s, unsigned char *context)
2130 ((s_server_config.www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) { 2130 ((s_server_config.www == 2) && (strncmp("GET /stats ", buf, 11) == 0))) {
2131 char *p; 2131 char *p;
2132 X509 *peer; 2132 X509 *peer;
2133 STACK_OF(SSL_CIPHER) * sk; 2133 STACK_OF(SSL_CIPHER) *sk;
2134 static const char *space = " "; 2134 static const char *space = " ";
2135 2135
2136 BIO_puts(io, "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n"); 2136 BIO_puts(io, "HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
@@ -2343,7 +2343,7 @@ www_body(char *hostname, int s, unsigned char *context)
2343 2343
2344#define MAX_SESSION_ID_ATTEMPTS 10 2344#define MAX_SESSION_ID_ATTEMPTS 10
2345static int 2345static int
2346generate_session_id(const SSL * ssl, unsigned char *id, 2346generate_session_id(const SSL *ssl, unsigned char *id,
2347 unsigned int *id_len) 2347 unsigned int *id_len)
2348{ 2348{
2349 unsigned int count = 0; 2349 unsigned int count = 0;