Commit 88806cfc authored by Rich Salz's avatar Rich Salz
Browse files

Fix main build breakage. 



A variable declaration got dropped during a merge.
And if a compiler inlines strcmp() and you put a strcmp in an
assert message, the resultant stringification exceeds ANSI string
limits.

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 2f58faad

apps/ocsp.c

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ int ocsp_main(int argc, char **argv) 
    STACK_OF(OCSP_CERTID) *ids = NULL;

    STACK_OF(OPENSSL_STRING) *reqnames = NULL;

    STACK_OF(X509) *sign_other = NULL, *verify_other = NULL, *rother = NULL;

    STACK_OF(X509) *issuers = NULL;

    X509 *issuer = NULL, *cert = NULL, *rca_cert = NULL;

    X509 *signer = NULL, *rsigner = NULL;

    X509_STORE *store = NULL;

apps/opt.c

+5 −4
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ char *opt_init(int ac, char **av, const OPTIONS *o) 
    for (; o->name; ++o) {

        const OPTIONS *next;

#ifndef NDEBUG

        int i;

        int duplicated, i;

#endif



        if (o->name == OPT_HELP_STR || o->name == OPT_MORE_STR)
@@ -188,11 +188,12 @@ char *opt_init(int ac, char **av, const OPTIONS *o) 
               || i == 'f' || i == 'F');



        /* Make sure there are no duplicates. */

        for (next = o; (++next)->name;) {

        for (next = o + 1; next->name; ++next) {

            /*

             * do allow aliases: assert(o->retval != next->retval);

             * Some compilers inline strcmp and the assert string is too long.

             */

            assert(strcmp(o->name, next->name) != 0);

            duplicated = strcmp(o->name, next->name) == 0;

            assert(!duplicated);

        }

#endif

        if (o->name[0] == '\0') {