Commit a4c467c9 authored by David von Oheimb's avatar David von Oheimb Committed by Matt Caswell
Browse files

remove needless empty lines when printing certificates 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6226)
parent c13d2ab4

crypto/dsa/dsa_ameth.c

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ static int dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg, 
        DSA_SIG_free(dsa_sig);

        return rv;

    }

    if (BIO_puts(bp, "\n") <= 0)

        return 0;

    return X509_signature_dump(bp, sig, indent);

}

crypto/rsa/rsa_ameth.c

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ static int rsa_sig_print(BIO *bp, const X509_ALGOR *sigalg, 
        RSA_PSS_PARAMS_free(pss);

        if (!rv)

            return 0;

    } else if (!sig && BIO_puts(bp, "\n") <= 0) {

    } else if (BIO_puts(bp, "\n") <= 0) {

        return 0;

    }

    if (sig)

crypto/x509/t_x509.c

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ int X509_signature_dump(BIO *bp, const ASN1_STRING *sig, int indent) 
    s = sig->data;

    for (i = 0; i < n; i++) {

        if ((i % 18) == 0) {

            if (BIO_write(bp, "\n", 1) <= 0)

            if (i > 0 && BIO_write(bp, "\n", 1) <= 0)

                return 0;

            if (BIO_indent(bp, indent, indent) <= 0)

                return 0;
@@ -317,10 +317,10 @@ int X509_signature_print(BIO *bp, const X509_ALGOR *sigalg, 
                return ameth->sig_print(bp, sigalg, sig, 9, 0);

        }

    }

    if (BIO_write(bp, "\n", 1) != 1)

        return 0;

    if (sig)

        return X509_signature_dump(bp, sig, 9);

    else if (BIO_puts(bp, "\n") <= 0)

        return 0;

    return 1;

}

crypto/x509v3/v3_alt.c

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ int GENERAL_NAME_print(BIO *out, GENERAL_NAME *gen) 
                BIO_printf(out, ":%X", p[0] << 8 | p[1]);

                p += 2;

            }

            BIO_puts(out, "\n");

        } else {

            BIO_printf(out, "IP Address:<invalid>");

            break;

crypto/x509v3/v3_cpols.c

+14 −7
Original line number Diff line number Diff line
@@ -403,13 +403,16 @@ static int i2r_certpol(X509V3_EXT_METHOD *method, STACK_OF(POLICYINFO) *pol, 
    POLICYINFO *pinfo;

    /* First print out the policy OIDs */

    for (i = 0; i < sk_POLICYINFO_num(pol); i++) {

        if (i > 0)

            BIO_puts(out, "\n");

        pinfo = sk_POLICYINFO_value(pol, i);

        BIO_printf(out, "%*sPolicy: ", indent, "");

        i2a_ASN1_OBJECT(out, pinfo->policyid);

        if (pinfo->qualifiers) {

            BIO_puts(out, "\n");

        if (pinfo->qualifiers)

            print_qualifiers(out, pinfo->qualifiers, indent + 2);

        }

    }

    return 1;

}
@@ -419,10 +422,12 @@ static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals, 
    POLICYQUALINFO *qualinfo;

    int i;

    for (i = 0; i < sk_POLICYQUALINFO_num(quals); i++) {

        if (i > 0)

            BIO_puts(out, "\n");

        qualinfo = sk_POLICYQUALINFO_value(quals, i);

        switch (OBJ_obj2nid(qualinfo->pqualid)) {

        case NID_id_qt_cps:

            BIO_printf(out, "%*sCPS: %s\n", indent, "",

            BIO_printf(out, "%*sCPS: %s", indent, "",

                       qualinfo->d.cpsuri->data);

            break;
@@ -435,7 +440,6 @@ static void print_qualifiers(BIO *out, STACK_OF(POLICYQUALINFO) *quals, 
            BIO_printf(out, "%*sUnknown Qualifier: ", indent + 2, "");



            i2a_ASN1_OBJECT(out, qualinfo->pqualid);

            BIO_puts(out, "\n");

            break;

        }

    }
@@ -467,10 +471,11 @@ static void print_notice(BIO *out, USERNOTICE *notice, int indent) 
                OPENSSL_free(tmp);

            }

        }

        if (notice->exptext)

            BIO_puts(out, "\n");

    }

    if (notice->exptext)

        BIO_printf(out, "%*sExplicit Text: %s\n", indent, "",

        BIO_printf(out, "%*sExplicit Text: %s", indent, "",

                   notice->exptext->data);

}
@@ -484,8 +489,10 @@ void X509_POLICY_NODE_print(BIO *out, X509_POLICY_NODE *node, int indent) 
    BIO_puts(out, "\n");

    BIO_printf(out, "%*s%s\n", indent + 2, "",

               node_data_critical(dat) ? "Critical" : "Non Critical");

    if (dat->qualifier_set)

    if (dat->qualifier_set) {

        print_qualifiers(out, dat->qualifier_set, indent + 2);

        BIO_puts(out, "\n");

    }

    else

        BIO_printf(out, "%*sNo Qualifiers\n", indent + 2, "");

}