Commit 907c6c86 authored by Richard Levitte's avatar Richard Levitte
Browse files

apps: instead of varying implementation, make setup_engine a function always 



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

apps/apps.c

+3 −1
Original line number Diff line number Diff line
@@ -1251,11 +1251,13 @@ static ENGINE *try_load_engine(const char *engine) 
    }

    return e;

}

#endif



ENGINE *setup_engine(const char *engine, int debug)

{

    ENGINE *e = NULL;



#ifndef OPENSSL_NO_ENGINE

    if (engine) {

        if (strcmp(engine, "auto") == 0) {

            BIO_printf(bio_err, "enabling auto ENGINE support\n");
@@ -1281,9 +1283,9 @@ ENGINE *setup_engine(const char *engine, int debug) 


        BIO_printf(bio_err, "engine \"%s\" set.\n", ENGINE_get_id(e));

    }

#endif

    return e;

}

#endif



void release_engine(ENGINE *e)

{

apps/apps.h

+1 −4
Original line number Diff line number Diff line
@@ -430,12 +430,9 @@ __owur int ctx_set_ctlog_list_file(SSL_CTX *ctx, const char *path); 


#endif



# ifdef OPENSSL_NO_ENGINE

#  define setup_engine(engine, debug) NULL

# else

ENGINE *setup_engine(const char *engine, int debug);

# endif

void release_engine(ENGINE *e);



# ifndef OPENSSL_NO_OCSP

OCSP_RESPONSE *process_responder(OCSP_REQUEST *req,

                                 const char *host, const char *path,