Commit 3f524f77 authored by Matt Caswell's avatar Matt Caswell
Browse files

Ensure dhparams can handle X9.42 params in DER 



dhparams correctly handles X9.42 params in PEM format. However it failed
to correctly processes them when reading/writing DER format.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3112)
parent 1f3b0fe0

apps/dhparam.c

+18 −6
Original line number Diff line number Diff line
@@ -381,10 +381,19 @@ int MAIN(int argc, char **argv) 
        } else

# endif

        {

            if (informat == FORMAT_ASN1)

            if (informat == FORMAT_ASN1) {

                /*

                 * We have no PEM header to determine what type of DH params it

                 * is. We'll just try both.

                 */

                dh = d2i_DHparams_bio(in, NULL);

            else                /* informat == FORMAT_PEM */

                /* BIO_reset() returns 0 for success for file BIOs only!!! */

                if (dh == NULL && BIO_reset(in) == 0)

                    dh = d2i_DHxparams_bio(in, NULL);

            } else {

                /* informat == FORMAT_PEM */

                dh = PEM_read_bio_DHparams(in, NULL, NULL, NULL);

            }



            if (dh == NULL) {

                BIO_printf(bio_err, "unable to load DH parameters\n");
@@ -484,10 +493,13 @@ int MAIN(int argc, char **argv) 
    }



    if (!noout) {

        if (outformat == FORMAT_ASN1)

        if (outformat == FORMAT_ASN1) {

            if (dh->q != NULL)

                i = i2d_DHxparams_bio(out, dh);

            else

                i = i2d_DHparams_bio(out, dh);

        else if (outformat == FORMAT_PEM) {

            if (dh->q)

        } else if (outformat == FORMAT_PEM) {

            if (dh->q != NULL)

                i = PEM_write_bio_DHxparams(out, dh);

            else

                i = PEM_write_bio_DHparams(out, dh);