diff options
| author | Richard Levitte <levitte@openssl.org> | 2002-11-14 06:51:18 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2002-11-14 06:51:18 +0000 |
| commit | 83411793b68921c6bd8ed0b15ecc36dfe30c3712 (patch) | |
| tree | da3e1f308fdf3a910d9e6b9b2496f1eeb015052c | |
| parent | 65caee44ffeeb80c6adcc0d6484ce25d3cf66597 (diff) | |
Handle last lines that aren't properly terminated.
PR: 308
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | crypto/conf/conf_def.c | 7 |
2 files changed, 8 insertions, 3 deletions
@@ -2082,6 +2082,10 @@ des-cbc 3624.96k 5258.21k 5530.91k 5624.30k 5628.26k Changes between 0.9.6g and 0.9.6h [xx XXX xxxx] + *) Change the default configuration reader to deal with last line not + being properly terminated. + [Richard Levitte] + *) Change X509_NAME_cmp() so it applies the special rules on handling DN values that are of type PrintableString, as well as RDNs of type emailAddress where the value has the type ia5String. diff --git a/crypto/conf/conf_def.c b/crypto/conf/conf_def.c index 806677dc10..57d2739ae0 100644 --- a/crypto/conf/conf_def.c +++ b/crypto/conf/conf_def.c @@ -253,9 +253,9 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) section_sk=(STACK_OF(CONF_VALUE) *)sv->value; bufnum=0; + again=0; for (;;) { - again=0; if (!BUF_MEM_grow(buff,bufnum+CONFBUFSIZE)) { CONFerr(CONF_F_CONF_LOAD_BIO,ERR_R_BUF_LIB); @@ -266,7 +266,8 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) BIO_gets(in, p, CONFBUFSIZE-1); p[CONFBUFSIZE-1]='\0'; ii=i=strlen(p); - if (i == 0) break; + if (i == 0 && !again) break; + again=0; while (i > 0) { if ((p[i-1] != '\r') && (p[i-1] != '\n')) @@ -276,7 +277,7 @@ static int def_load_bio(CONF *conf, BIO *in, long *line) } /* we removed some trailing stuff so there is a new * line on the end. */ - if (i == ii) + if (ii && i == ii) again=1; /* long line */ else { |