diff options
author | tedu <> | 2007-03-20 03:40:06 +0000 |
---|---|---|
committer | tedu <> | 2007-03-20 03:40:06 +0000 |
commit | 714f67162a49eb27e900c3bb551b9d36abe03b18 (patch) | |
tree | 3bdf69ac25a44984b5e36eec230a5ee2584def49 | |
parent | 74cd9effea31702c4f9012a69b773916cbe4f4eb (diff) | |
download | openbsd-714f67162a49eb27e900c3bb551b9d36abe03b18.tar.gz openbsd-714f67162a49eb27e900c3bb551b9d36abe03b18.tar.bz2 openbsd-714f67162a49eb27e900c3bb551b9d36abe03b18.zip |
remove some bogus *p tests from charles longeau
ok deraadt millert
-rw-r--r-- | src/lib/libcrypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_ht.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/x509v3/v3_utl.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/conf/conf_mod.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/ocsp/ocsp_ht.c | 6 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/x509v3/v3_utl.c | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index d45adea851..812e60dc70 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c | |||
@@ -587,7 +587,7 @@ int CONF_parse_list(const char *list_, int sep, int nospc, | |||
587 | { | 587 | { |
588 | if (nospc) | 588 | if (nospc) |
589 | { | 589 | { |
590 | while(*lstart && isspace((unsigned char)*lstart)) | 590 | while(isspace((unsigned char)*lstart)) |
591 | lstart++; | 591 | lstart++; |
592 | } | 592 | } |
593 | p = strchr(lstart, sep); | 593 | p = strchr(lstart, sep); |
diff --git a/src/lib/libcrypto/ocsp/ocsp_ht.c b/src/lib/libcrypto/ocsp/ocsp_ht.c index 9213e58ae4..2c48171883 100644 --- a/src/lib/libcrypto/ocsp/ocsp_ht.c +++ b/src/lib/libcrypto/ocsp/ocsp_ht.c | |||
@@ -120,7 +120,7 @@ Content-Length: %d\r\n\r\n"; | |||
120 | goto err; | 120 | goto err; |
121 | } | 121 | } |
122 | /* Skip past white space to start of response code */ | 122 | /* Skip past white space to start of response code */ |
123 | while(*p && isspace((unsigned char)*p)) p++; | 123 | while(isspace((unsigned char)*p)) p++; |
124 | if(!*p) { | 124 | if(!*p) { |
125 | OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR); | 125 | OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR); |
126 | goto err; | 126 | goto err; |
@@ -137,7 +137,7 @@ Content-Length: %d\r\n\r\n"; | |||
137 | retcode = strtoul(p, &r, 10); | 137 | retcode = strtoul(p, &r, 10); |
138 | if(*r) goto err; | 138 | if(*r) goto err; |
139 | /* Skip over any leading white space in message */ | 139 | /* Skip over any leading white space in message */ |
140 | while(*q && isspace((unsigned char)*q)) q++; | 140 | while(isspace((unsigned char)*q)) q++; |
141 | if(*q) { | 141 | if(*q) { |
142 | /* Finally zap any trailing white space in message (include CRLF) */ | 142 | /* Finally zap any trailing white space in message (include CRLF) */ |
143 | /* We know q has a non white space character so this is OK */ | 143 | /* We know q has a non white space character so this is OK */ |
@@ -156,7 +156,7 @@ Content-Length: %d\r\n\r\n"; | |||
156 | /* Find blank line marking beginning of content */ | 156 | /* Find blank line marking beginning of content */ |
157 | while(BIO_gets(mem, tmpbuf, 512) > 0) | 157 | while(BIO_gets(mem, tmpbuf, 512) > 0) |
158 | { | 158 | { |
159 | for(p = tmpbuf; *p && isspace((unsigned char)*p); p++) continue; | 159 | for(p = tmpbuf; isspace((unsigned char)*p); p++) continue; |
160 | if(!*p) break; | 160 | if(!*p) break; |
161 | } | 161 | } |
162 | if(*p) { | 162 | if(*p) { |
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c index 466c91d0e8..f23a8d29a0 100644 --- a/src/lib/libcrypto/x509v3/v3_utl.c +++ b/src/lib/libcrypto/x509v3/v3_utl.c | |||
@@ -337,7 +337,7 @@ static char *strip_spaces(char *name) | |||
337 | char *p, *q; | 337 | char *p, *q; |
338 | /* Skip over leading spaces */ | 338 | /* Skip over leading spaces */ |
339 | p = name; | 339 | p = name; |
340 | while(*p && isspace((unsigned char)*p)) p++; | 340 | while(isspace((unsigned char)*p)) p++; |
341 | if(!*p) return NULL; | 341 | if(!*p) return NULL; |
342 | q = p + strlen(p) - 1; | 342 | q = p + strlen(p) - 1; |
343 | while((q != p) && isspace((unsigned char)*q)) q--; | 343 | while((q != p) && isspace((unsigned char)*q)) q--; |
diff --git a/src/lib/libssl/src/crypto/conf/conf_mod.c b/src/lib/libssl/src/crypto/conf/conf_mod.c index d45adea851..812e60dc70 100644 --- a/src/lib/libssl/src/crypto/conf/conf_mod.c +++ b/src/lib/libssl/src/crypto/conf/conf_mod.c | |||
@@ -587,7 +587,7 @@ int CONF_parse_list(const char *list_, int sep, int nospc, | |||
587 | { | 587 | { |
588 | if (nospc) | 588 | if (nospc) |
589 | { | 589 | { |
590 | while(*lstart && isspace((unsigned char)*lstart)) | 590 | while(isspace((unsigned char)*lstart)) |
591 | lstart++; | 591 | lstart++; |
592 | } | 592 | } |
593 | p = strchr(lstart, sep); | 593 | p = strchr(lstart, sep); |
diff --git a/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c b/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c index 9213e58ae4..2c48171883 100644 --- a/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c +++ b/src/lib/libssl/src/crypto/ocsp/ocsp_ht.c | |||
@@ -120,7 +120,7 @@ Content-Length: %d\r\n\r\n"; | |||
120 | goto err; | 120 | goto err; |
121 | } | 121 | } |
122 | /* Skip past white space to start of response code */ | 122 | /* Skip past white space to start of response code */ |
123 | while(*p && isspace((unsigned char)*p)) p++; | 123 | while(isspace((unsigned char)*p)) p++; |
124 | if(!*p) { | 124 | if(!*p) { |
125 | OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR); | 125 | OCSPerr(OCSP_F_OCSP_SENDREQ_BIO,OCSP_R_SERVER_RESPONSE_PARSE_ERROR); |
126 | goto err; | 126 | goto err; |
@@ -137,7 +137,7 @@ Content-Length: %d\r\n\r\n"; | |||
137 | retcode = strtoul(p, &r, 10); | 137 | retcode = strtoul(p, &r, 10); |
138 | if(*r) goto err; | 138 | if(*r) goto err; |
139 | /* Skip over any leading white space in message */ | 139 | /* Skip over any leading white space in message */ |
140 | while(*q && isspace((unsigned char)*q)) q++; | 140 | while(isspace((unsigned char)*q)) q++; |
141 | if(*q) { | 141 | if(*q) { |
142 | /* Finally zap any trailing white space in message (include CRLF) */ | 142 | /* Finally zap any trailing white space in message (include CRLF) */ |
143 | /* We know q has a non white space character so this is OK */ | 143 | /* We know q has a non white space character so this is OK */ |
@@ -156,7 +156,7 @@ Content-Length: %d\r\n\r\n"; | |||
156 | /* Find blank line marking beginning of content */ | 156 | /* Find blank line marking beginning of content */ |
157 | while(BIO_gets(mem, tmpbuf, 512) > 0) | 157 | while(BIO_gets(mem, tmpbuf, 512) > 0) |
158 | { | 158 | { |
159 | for(p = tmpbuf; *p && isspace((unsigned char)*p); p++) continue; | 159 | for(p = tmpbuf; isspace((unsigned char)*p); p++) continue; |
160 | if(!*p) break; | 160 | if(!*p) break; |
161 | } | 161 | } |
162 | if(*p) { | 162 | if(*p) { |
diff --git a/src/lib/libssl/src/crypto/x509v3/v3_utl.c b/src/lib/libssl/src/crypto/x509v3/v3_utl.c index 466c91d0e8..f23a8d29a0 100644 --- a/src/lib/libssl/src/crypto/x509v3/v3_utl.c +++ b/src/lib/libssl/src/crypto/x509v3/v3_utl.c | |||
@@ -337,7 +337,7 @@ static char *strip_spaces(char *name) | |||
337 | char *p, *q; | 337 | char *p, *q; |
338 | /* Skip over leading spaces */ | 338 | /* Skip over leading spaces */ |
339 | p = name; | 339 | p = name; |
340 | while(*p && isspace((unsigned char)*p)) p++; | 340 | while(isspace((unsigned char)*p)) p++; |
341 | if(!*p) return NULL; | 341 | if(!*p) return NULL; |
342 | q = p + strlen(p) - 1; | 342 | q = p + strlen(p) - 1; |
343 | while((q != p) && isspace((unsigned char)*q)) q--; | 343 | while((q != p) && isspace((unsigned char)*q)) q--; |