summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-11-21 12:10:35 +0000
committerMatt Caswell <matt@openssl.org>2016-11-23 15:31:22 +0000
commitf5ca0b04bbc98b5b8a41f5cd7b4ee35e345c1e6c (patch)
tree3fef7ec0fef9056550c00166c4c538278d730773 /apps
parentc805f6189e7384d8f27e82c09ee8cae202ade876 (diff)
Fix some style issues identified during review
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps')
-rw-r--r--apps/s_server.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 7eee91083a..eebbb56ba3 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -451,16 +451,16 @@ static int ssl_servername_cb(SSL *s, int *ad, void *arg)
/* Structure passed to cert status callback */
typedef struct tlsextstatusctx_st {
+ int timeout;
/* File to load OCSP Response from (or NULL if no file) */
char *respin;
/* Default responder to use */
char *host, *path, *port;
int use_ssl;
- int timeout;
int verbose;
} tlsextstatusctx;
-static tlsextstatusctx tlscstatp = { NULL, NULL, NULL, NULL, 0, -1, 0 };
+static tlsextstatusctx tlscstatp = { -1 };
#ifndef OPENSSL_NO_OCSP
@@ -553,7 +553,7 @@ static int get_ocsp_resp_from_responder(SSL *s, tlsextstatusctx *srctx,
err:
ret = SSL_TLSEXT_ERR_ALERT_FATAL;
done:
- if (aia) {
+ if (aia != NULL) {
OPENSSL_free(host);
OPENSSL_free(path);
OPENSSL_free(port);
@@ -589,7 +589,7 @@ static int cert_status_cb(SSL *s, void *arg)
}
resp = d2i_OCSP_RESPONSE_bio(derbio, NULL);
BIO_free(derbio);
- if (!resp) {
+ if (resp == NULL) {
BIO_puts(bio_err, "cert_status: Error reading OCSP response\n");
goto err;
}