Commit 2d1b5717 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Previously this x509 command line was working, restore that 



openssl x509 -in server.pem -signkey privkey.pem -out server.pem

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

apps/x509.c

+5 −7
Original line number Original line Diff line number Diff line
@@ -467,10 +467,6 @@ int x509_main(int argc, char **argv) 
        goto opthelp;

        goto opthelp;

    }

    }





    out = bio_open_default(outfile, 'w', outformat);

    if (out == NULL)

        goto end;



    if (!app_passwd(passinarg, NULL, &passin, NULL)) {

    if (!app_passwd(passinarg, NULL, &passin, NULL)) {

        BIO_printf(bio_err, "Error getting password\n");

        BIO_printf(bio_err, "Error getting password\n");

        goto end;

        goto end;
@@ -596,10 +592,12 @@ int x509_main(int argc, char **argv) 
            goto end;

            goto end;

    }

    }





    if (!noout || text || next_serial) {

    out = bio_open_default(outfile, 'w', outformat);

        OBJ_create("2.99999.3", "SET.ex3", "SET x509v3 extension 3");

    if (out == NULL)

        goto end;





    }

    if (!noout || text || next_serial)

        OBJ_create("2.99999.3", "SET.ex3", "SET x509v3 extension 3");





    if (alias)

    if (alias)

        X509_alias_set1(x, (unsigned char *)alias, -1);

        X509_alias_set1(x, (unsigned char *)alias, -1);