summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorinoguchi <>2020-09-09 13:04:23 +0000
committerinoguchi <>2020-09-09 13:04:23 +0000
commit271a3d301ed96d1d8b3922e3d87fd84ba0337145 (patch)
tree3657ee52bdea87419290ce8beb9ab1e430758fc2 /src
parent65d503c40fc92a463c6ab5b70929e16f354e3a5e (diff)
downloadopenbsd-271a3d301ed96d1d8b3922e3d87fd84ba0337145.tar.gz
openbsd-271a3d301ed96d1d8b3922e3d87fd84ba0337145.tar.bz2
openbsd-271a3d301ed96d1d8b3922e3d87fd84ba0337145.zip
Remove space between pointer '*' and variable name in ocsp.c
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/ocsp.c78
1 files changed, 39 insertions, 39 deletions
diff --git a/src/usr.bin/openssl/ocsp.c b/src/usr.bin/openssl/ocsp.c
index 5e060715f5..f954829221 100644
--- a/src/usr.bin/openssl/ocsp.c
+++ b/src/usr.bin/openssl/ocsp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ocsp.c,v 1.16 2020/09/09 12:53:42 inoguchi Exp $ */ 1/* $OpenBSD: ocsp.c,v 1.17 2020/09/09 13:04:23 inoguchi Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 2000. 3 * project 2000.
4 */ 4 */
@@ -80,27 +80,27 @@
80#define MAX_VALIDITY_PERIOD (5 * 60) 80#define MAX_VALIDITY_PERIOD (5 * 60)
81 81
82static int 82static int
83add_ocsp_cert(OCSP_REQUEST ** req, X509 * cert, const EVP_MD * cert_id_md, X509 * issuer, 83add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md, X509 *issuer,
84 STACK_OF(OCSP_CERTID) * ids); 84 STACK_OF(OCSP_CERTID) *ids);
85static int add_ocsp_serial(OCSP_REQUEST ** req, char *serial, const EVP_MD * cert_id_md, X509 * issuer, 85static int add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD *cert_id_md, X509 *issuer,
86 STACK_OF(OCSP_CERTID) * ids); 86 STACK_OF(OCSP_CERTID) *ids);
87static int print_ocsp_summary(BIO * out, OCSP_BASICRESP * bs, OCSP_REQUEST * req, 87static int print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
88 STACK_OF(OPENSSL_STRING) * names, 88 STACK_OF(OPENSSL_STRING) *names,
89 STACK_OF(OCSP_CERTID) * ids, long nsec, 89 STACK_OF(OCSP_CERTID) *ids, long nsec,
90 long maxage); 90 long maxage);
91 91
92static int make_ocsp_response(OCSP_RESPONSE ** resp, OCSP_REQUEST * req, CA_DB * db, 92static int make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
93 X509 * ca, X509 * rcert, EVP_PKEY * rkey, 93 X509 *ca, X509 *rcert, EVP_PKEY *rkey,
94 STACK_OF(X509) * rother, unsigned long flags, 94 STACK_OF(X509) *rother, unsigned long flags,
95 int nmin, int ndays); 95 int nmin, int ndays);
96 96
97static char **lookup_serial(CA_DB * db, ASN1_INTEGER * ser); 97static char **lookup_serial(CA_DB *db, ASN1_INTEGER *ser);
98static BIO *init_responder(char *port); 98static BIO *init_responder(char *port);
99static int do_responder(OCSP_REQUEST ** preq, BIO ** pcbio, BIO * acbio, char *port); 99static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port);
100static int send_ocsp_response(BIO * cbio, OCSP_RESPONSE * resp); 100static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp);
101static OCSP_RESPONSE *query_responder(BIO * err, BIO * cbio, char *path, 101static OCSP_RESPONSE *query_responder(BIO *err, BIO *cbio, char *path,
102 STACK_OF(CONF_VALUE) * headers, 102 STACK_OF(CONF_VALUE) *headers,
103 OCSP_REQUEST * req, int req_timeout); 103 OCSP_REQUEST *req, int req_timeout);
104 104
105static struct { 105static struct {
106 int accept_count; 106 int accept_count;
@@ -109,9 +109,9 @@ static struct {
109 char *CApath; 109 char *CApath;
110 X509 *cert; 110 X509 *cert;
111 const EVP_MD *cert_id_md; 111 const EVP_MD *cert_id_md;
112 STACK_OF(CONF_VALUE) * headers; 112 STACK_OF(CONF_VALUE) *headers;
113 char *host; 113 char *host;
114 STACK_OF(OCSP_CERTID) * ids; 114 STACK_OF(OCSP_CERTID) *ids;
115 int ignore_err; 115 int ignore_err;
116 X509 *issuer; 116 X509 *issuer;
117 char *keyfile; 117 char *keyfile;
@@ -130,7 +130,7 @@ static struct {
130 int req_text; 130 int req_text;
131 int req_timeout; 131 int req_timeout;
132 char *reqin; 132 char *reqin;
133 STACK_OF(OPENSSL_STRING) * reqnames; 133 STACK_OF(OPENSSL_STRING) *reqnames;
134 char *reqout; 134 char *reqout;
135 int resp_text; 135 int resp_text;
136 char *respin; 136 char *respin;
@@ -745,7 +745,7 @@ ocsp_main(int argc, char **argv)
745 BIO *derbio = NULL; 745 BIO *derbio = NULL;
746 BIO *out = NULL; 746 BIO *out = NULL;
747 X509_STORE *store = NULL; 747 X509_STORE *store = NULL;
748 STACK_OF(X509) * sign_other = NULL, *verify_other = NULL, *rother = NULL; 748 STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL;
749 int ret = 1; 749 int ret = 1;
750 int badarg = 0; 750 int badarg = 0;
751 int i; 751 int i;
@@ -1047,8 +1047,8 @@ done_resp:
1047} 1047}
1048 1048
1049static int 1049static int
1050add_ocsp_cert(OCSP_REQUEST ** req, X509 * cert, const EVP_MD * cert_id_md, X509 * issuer, 1050add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, const EVP_MD *cert_id_md, X509 *issuer,
1051 STACK_OF(OCSP_CERTID) * ids) 1051 STACK_OF(OCSP_CERTID) *ids)
1052{ 1052{
1053 OCSP_CERTID *id; 1053 OCSP_CERTID *id;
1054 if (!issuer) { 1054 if (!issuer) {
@@ -1072,8 +1072,8 @@ add_ocsp_cert(OCSP_REQUEST ** req, X509 * cert, const EVP_MD * cert_id_md, X509
1072} 1072}
1073 1073
1074static int 1074static int
1075add_ocsp_serial(OCSP_REQUEST ** req, char *serial, const EVP_MD * cert_id_md, X509 * issuer, 1075add_ocsp_serial(OCSP_REQUEST **req, char *serial, const EVP_MD *cert_id_md, X509 *issuer,
1076 STACK_OF(OCSP_CERTID) * ids) 1076 STACK_OF(OCSP_CERTID) *ids)
1077{ 1077{
1078 OCSP_CERTID *id; 1078 OCSP_CERTID *id;
1079 X509_NAME *iname; 1079 X509_NAME *iname;
@@ -1108,9 +1108,9 @@ add_ocsp_serial(OCSP_REQUEST ** req, char *serial, const EVP_MD * cert_id_md, X5
1108} 1108}
1109 1109
1110static int 1110static int
1111print_ocsp_summary(BIO * out, OCSP_BASICRESP * bs, OCSP_REQUEST * req, 1111print_ocsp_summary(BIO *out, OCSP_BASICRESP *bs, OCSP_REQUEST *req,
1112 STACK_OF(OPENSSL_STRING) * names, 1112 STACK_OF(OPENSSL_STRING) *names,
1113 STACK_OF(OCSP_CERTID) * ids, long nsec, 1113 STACK_OF(OCSP_CERTID) *ids, long nsec,
1114 long maxage) 1114 long maxage)
1115{ 1115{
1116 OCSP_CERTID *id; 1116 OCSP_CERTID *id;
@@ -1170,9 +1170,9 @@ print_ocsp_summary(BIO * out, OCSP_BASICRESP * bs, OCSP_REQUEST * req,
1170 1170
1171 1171
1172static int 1172static int
1173make_ocsp_response(OCSP_RESPONSE ** resp, OCSP_REQUEST * req, CA_DB * db, 1173make_ocsp_response(OCSP_RESPONSE **resp, OCSP_REQUEST *req, CA_DB *db,
1174 X509 * ca, X509 * rcert, EVP_PKEY * rkey, 1174 X509 *ca, X509 *rcert, EVP_PKEY *rkey,
1175 STACK_OF(X509) * rother, unsigned long flags, 1175 STACK_OF(X509) *rother, unsigned long flags,
1176 int nmin, int ndays) 1176 int nmin, int ndays)
1177{ 1177{
1178 ASN1_TIME *thisupd = NULL, *nextupd = NULL; 1178 ASN1_TIME *thisupd = NULL, *nextupd = NULL;
@@ -1269,7 +1269,7 @@ make_ocsp_response(OCSP_RESPONSE ** resp, OCSP_REQUEST * req, CA_DB * db,
1269} 1269}
1270 1270
1271static char ** 1271static char **
1272lookup_serial(CA_DB * db, ASN1_INTEGER * ser) 1272lookup_serial(CA_DB *db, ASN1_INTEGER *ser)
1273{ 1273{
1274 int i; 1274 int i;
1275 BIGNUM *bn = NULL; 1275 BIGNUM *bn = NULL;
@@ -1319,7 +1319,7 @@ init_responder(char *port)
1319} 1319}
1320 1320
1321static int 1321static int
1322do_responder(OCSP_REQUEST ** preq, BIO ** pcbio, BIO * acbio, char *port) 1322do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port)
1323{ 1323{
1324 int have_post = 0, len; 1324 int have_post = 0, len;
1325 OCSP_REQUEST *req = NULL; 1325 OCSP_REQUEST *req = NULL;
@@ -1366,7 +1366,7 @@ do_responder(OCSP_REQUEST ** preq, BIO ** pcbio, BIO * acbio, char *port)
1366} 1366}
1367 1367
1368static int 1368static int
1369send_ocsp_response(BIO * cbio, OCSP_RESPONSE * resp) 1369send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
1370{ 1370{
1371 static const char http_resp[] = 1371 static const char http_resp[] =
1372 "HTTP/1.0 200 OK\r\nContent-type: application/ocsp-response\r\n" 1372 "HTTP/1.0 200 OK\r\nContent-type: application/ocsp-response\r\n"
@@ -1380,9 +1380,9 @@ send_ocsp_response(BIO * cbio, OCSP_RESPONSE * resp)
1380} 1380}
1381 1381
1382static OCSP_RESPONSE * 1382static OCSP_RESPONSE *
1383query_responder(BIO * err, BIO * cbio, char *path, 1383query_responder(BIO *err, BIO *cbio, char *path,
1384 STACK_OF(CONF_VALUE) * headers, 1384 STACK_OF(CONF_VALUE) *headers,
1385 OCSP_REQUEST * req, int req_timeout) 1385 OCSP_REQUEST *req, int req_timeout)
1386{ 1386{
1387 int fd; 1387 int fd;
1388 int rv; 1388 int rv;
@@ -1462,9 +1462,9 @@ query_responder(BIO * err, BIO * cbio, char *path,
1462} 1462}
1463 1463
1464OCSP_RESPONSE * 1464OCSP_RESPONSE *
1465process_responder(BIO * err, OCSP_REQUEST * req, 1465process_responder(BIO *err, OCSP_REQUEST *req,
1466 char *host, char *path, char *port, int use_ssl, 1466 char *host, char *path, char *port, int use_ssl,
1467 STACK_OF(CONF_VALUE) * headers, 1467 STACK_OF(CONF_VALUE) *headers,
1468 int req_timeout) 1468 int req_timeout)
1469{ 1469{
1470 BIO *cbio = NULL; 1470 BIO *cbio = NULL;