Commit 135e8062 authored by Dr. Matthias St. Pierre's avatar Dr. Matthias St. Pierre
Browse files

Fix: 'openssl ca' command crashes when used with 'rand_serial' option 



Commit ffb46830 introduced the 'rand_serial' option. When it is used,
the 'serialfile' does not get initialized, i.e. it remains a NULL pointer.
This causes a crash when the NULL pointer is passed to the rotate_serial()
call.

This commit fixes the crash and unifies the pointer checking before
calling the rotate_serial() and save_serial() commands.

Fixes #7412

Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7417)

(cherry picked from commit aeec793b4bee929cef8ae35ec4b5a783a6e1d7ed)
parent 695bc60f

apps/ca.c

+10 −9
Original line number Diff line number Diff line
@@ -976,7 +976,7 @@ end_of_options: 
            BIO_printf(bio_err, "Write out database with %d new entries\n",

                       sk_X509_num(cert_sk));



            if (!rand_ser

            if (serialfile != NULL

                    && !save_serial(serialfile, "new", serial, NULL))

                goto end;
@@ -1044,7 +1044,8 @@ end_of_options: 


        if (sk_X509_num(cert_sk)) {

            /* Rename the database and the serial file */

            if (!rotate_serial(serialfile, "new", "old"))

            if (serialfile != NULL

                    && !rotate_serial(serialfile, "new", "old"))

                goto end;



            if (!rotate_index(dbfile, "new", "old"))
@@ -1177,8 +1178,7 @@ end_of_options: 
        }



        /* we have a CRL number that need updating */

        if (crlnumberfile != NULL)

            if (!rand_ser

        if (crlnumberfile != NULL

                && !save_serial(crlnumberfile, "new", crlnumber, NULL))

            goto end;
@@ -1195,8 +1195,9 @@ end_of_options: 


        PEM_write_bio_X509_CRL(Sout, crl);



        if (crlnumberfile != NULL) /* Rename the crlnumber file */

            if (!rotate_serial(crlnumberfile, "new", "old"))

        /* Rename the crlnumber file */

        if (crlnumberfile != NULL

                && !rotate_serial(crlnumberfile, "new", "old"))

            goto end;



    }