Commit 5534c16a authored by Richard Levitte's avatar Richard Levitte
Browse files

Stop using and deprecate ENGINE_setup_bsd_cryptodev 



The calls we made to it were redundant, as the same initialization is
done later in OPENSSL_init_crypto() anyway.

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent b77a8653

crypto/init.c

+0 −10
Original line number Diff line number Diff line
@@ -116,11 +116,6 @@ static void ossl_init_add_all_ciphers(void) 
                    "openssl_add_all_ciphers_int()\n");

# endif

    openssl_add_all_ciphers_int();

# ifndef OPENSSL_NO_ENGINE

#  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)

    ENGINE_setup_bsd_cryptodev();

#  endif

# endif

#endif

}
@@ -137,11 +132,6 @@ static void ossl_init_add_all_digests(void) 
                    "openssl_add_all_digests()\n");

# endif

    openssl_add_all_digests_int();

# ifndef OPENSSL_NO_ENGINE

#  if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)

    ENGINE_setup_bsd_cryptodev();

#  endif

# endif

#endif

}

include/openssl/engine.h

+1 −1
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ typedef int (*dynamic_bind_engine) (ENGINE *e, const char *id, 
void *ENGINE_get_static_state(void);



# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)

void ENGINE_setup_bsd_cryptodev(void);

DEPRECATEDIN_1_1_0(void ENGINE_setup_bsd_cryptodev(void))

# endif



/* BEGIN ERROR CODES */