summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorderaadt <>2014-04-17 10:17:56 +0000
committerderaadt <>2014-04-17 10:17:56 +0000
commit03cd8ce7162f8ebea488d803ebb42fa67350d1b0 (patch)
tree999a63f73fce963bf665c9d0c453e02a261bcbcf /src
parent756746acc117fe6a489f63c279e06597e416d759 (diff)
downloadopenbsd-03cd8ce7162f8ebea488d803ebb42fa67350d1b0.tar.gz
openbsd-03cd8ce7162f8ebea488d803ebb42fa67350d1b0.tar.bz2
openbsd-03cd8ce7162f8ebea488d803ebb42fa67350d1b0.zip
minimal fix for ', ' issue in jsing's indent script
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/apps/ca.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 7a68552c62..cf6015b73c 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -2127,12 +2127,13 @@ certify_spkac(X509 **xret, char *infile, EVP_PKEY *pkey, X509 *x509,
2127 /* Skip past any leading X. X: X, etc to allow for 2127 /* Skip past any leading X. X: X, etc to allow for
2128 * multiple instances 2128 * multiple instances
2129 */ 2129 */
2130 for (buf = cv->name; *buf; buf++) 2130 for (buf = cv->name; *buf; buf++) {
2131 if ((*buf == ':') || (*buf == ', ') || (*buf == '.')) { 2131 if ((*buf == ':') || (*buf == ',') || (*buf == '.')) {
2132 buf++; 2132 buf++;
2133 if (*buf) 2133 if (*buf)
2134 type = buf; 2134 type = buf;
2135 break; 2135 break;
2136 }
2136 } 2137 }
2137 2138
2138 buf = cv->value; 2139 buf = cv->value;
@@ -2667,7 +2668,7 @@ unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
2667 ASN1_GENERALIZEDTIME *comp_time = NULL; 2668 ASN1_GENERALIZEDTIME *comp_time = NULL;
2668 tmp = BUF_strdup(str); 2669 tmp = BUF_strdup(str);
2669 2670
2670 p = strchr(tmp, ', '); 2671 p = strchr(tmp, ',');
2671 2672
2672 rtime_str = tmp; 2673 rtime_str = tmp;
2673 2674
@@ -2675,7 +2676,7 @@ unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
2675 *p = '\0'; 2676 *p = '\0';
2676 p++; 2677 p++;
2677 reason_str = p; 2678 reason_str = p;
2678 p = strchr(p, ', '); 2679 p = strchr(p, ',');
2679 if (p) { 2680 if (p) {
2680 *p = '\0'; 2681 *p = '\0';
2681 arg_str = p + 1; 2682 arg_str = p + 1;