fix warnings, and harmonize indentation

This commit is contained in:
Bodo Möller 2002-10-23 13:11:38 +00:00
parent e1c191fe44
commit 907a8f1e6e

View file

@ -3055,68 +3055,72 @@ X509_NAME *do_subject(char *subject, long chtype)
int nid;
if (!buf || !ne_types || !ne_values)
{
{
BIO_printf(bio_err, "malloc error\n");
goto error;
}
}
if (*subject != '/')
{
{
BIO_printf(bio_err, "Subject does not start with '/'.\n");
goto error;
}
}
sp++; /* skip leading / */
while (*sp)
{
{
/* collect type */
ne_types[ne_num] = bp;
while (*sp)
{
{
if (*sp == '\\') /* is there anything to escape in the type...? */
{
if (*++sp)
*bp++ = *sp++;
else
{
else
{
BIO_printf(bio_err, "escape character at end of string\n");
goto error;
}
}
}
else if (*sp == '=')
{
{
sp++;
*bp++ = '\0';
break;
}
}
else
*bp++ = *sp++;
}
}
if (!*sp)
{
{
BIO_printf(bio_err, "end of string encountered while processing type of subject name element #%d\n", ne_num);
goto error;
}
}
ne_values[ne_num] = bp;
while (*sp)
{
{
if (*sp == '\\')
{
if (*++sp)
*bp++ = *sp++;
else
{
{
BIO_printf(bio_err, "escape character at end of string\n");
goto error;
}
}
else if (*sp == '/')
{
{
sp++;
break;
}
}
else
*bp++ = *sp++;
}
}
*bp++ = '\0';
ne_num++;
}
}
if (!(n = X509_NAME_new()))
goto error;