projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ec/ecp_nistp*.c] restyle: use {} around `else` too
[oweals/openssl.git]
/
crypto
/
ocsp
/
ocsp_ht.c
diff --git
a/crypto/ocsp/ocsp_ht.c
b/crypto/ocsp/ocsp_ht.c
index 680edfa5c222762d9b4da8a37370592ed1aa9eaf..42c3686431353401723fdcd2e7771eadc6e2039d 100644
(file)
--- a/
crypto/ocsp/ocsp_ht.c
+++ b/
crypto/ocsp/ocsp_ht.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright 2001-201
6
The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2001-201
7
The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
*
* Licensed under the OpenSSL license (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
@@
-7,11
+7,11
@@
* https://www.openssl.org/source/license.html
*/
* https://www.openssl.org/source/license.html
*/
+#include "e_os.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
-#include
<ctype.h>
+#include
"internal/ctype.h"
#include <string.h>
#include <string.h>
-#include "e_os.h"
#include <openssl/asn1.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
#include <openssl/asn1.h>
#include <openssl/ocsp.h>
#include <openssl/err.h>
@@
-209,7
+209,7
@@
static int parse_http_line1(char *line)
char *p, *q, *r;
/* Skip to first white space (passed protocol info) */
char *p, *q, *r;
/* Skip to first white space (passed protocol info) */
- for (p = line; *p && !
isspace((unsigned char)
*p); p++)
+ for (p = line; *p && !
ossl_isspace(
*p); p++)
continue;
if (!*p) {
OCSPerr(OCSP_F_PARSE_HTTP_LINE1, OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
continue;
if (!*p) {
OCSPerr(OCSP_F_PARSE_HTTP_LINE1, OCSP_R_SERVER_RESPONSE_PARSE_ERROR);
@@
-217,7
+217,7
@@
static int parse_http_line1(char *line)
}
/* Skip past white space to start of response code */
}
/* Skip past white space to start of response code */
- while (*p &&
isspace((unsigned char)
*p))
+ while (*p &&
ossl_isspace(
*p))
p++;
if (!*p) {
p++;
if (!*p) {
@@
-226,7
+226,7
@@
static int parse_http_line1(char *line)
}
/* Find end of response code: first whitespace after start of code */
}
/* Find end of response code: first whitespace after start of code */
- for (q = p; *q && !
isspace((unsigned char)
*q); q++)
+ for (q = p; *q && !
ossl_isspace(
*q); q++)
continue;
if (!*q) {
continue;
if (!*q) {
@@
-244,7
+244,7
@@
static int parse_http_line1(char *line)
return 0;
/* Skip over any leading white space in message */
return 0;
/* Skip over any leading white space in message */
- while (*q &&
isspace((unsigned char)
*q))
+ while (*q &&
ossl_isspace(
*q))
q++;
if (*q) {
q++;
if (*q) {
@@
-253,7
+253,7
@@
static int parse_http_line1(char *line)
*/
/* We know q has a non white space character so this is OK */
*/
/* We know q has a non white space character so this is OK */
- for (r = q + strlen(q) - 1;
isspace((unsigned char)
*r); r--)
+ for (r = q + strlen(q) - 1;
ossl_isspace(
*r); r--)
*r = 0;
}
if (retcode != 200) {
*r = 0;
}
if (retcode != 200) {
@@
-298,10
+298,12
@@
int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx)
}
rctx->state = OHS_ASN1_WRITE_INIT;
}
rctx->state = OHS_ASN1_WRITE_INIT;
+ /* fall thru */
case OHS_ASN1_WRITE_INIT:
rctx->asn1_len = BIO_get_mem_data(rctx->mem, NULL);
rctx->state = OHS_ASN1_WRITE;
case OHS_ASN1_WRITE_INIT:
rctx->asn1_len = BIO_get_mem_data(rctx->mem, NULL);
rctx->state = OHS_ASN1_WRITE;
+ /* fall thru */
case OHS_ASN1_WRITE:
n = BIO_get_mem_data(rctx->mem, &p);
case OHS_ASN1_WRITE:
n = BIO_get_mem_data(rctx->mem, &p);
@@
-323,6
+325,7
@@
int OCSP_REQ_CTX_nbio(OCSP_REQ_CTX *rctx)
(void)BIO_reset(rctx->mem);
(void)BIO_reset(rctx->mem);
+ /* fall thru */
case OHS_ASN1_FLUSH:
i = BIO_flush(rctx->io);
case OHS_ASN1_FLUSH:
i = BIO_flush(rctx->io);