Commit e105098b authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1974 (partial) 

Submitted by: David McCullough <david_mccullough@securecomputing.com>
Approved by: steve@openssl.org

If -DHAVE_CRYPTODEV is set enable cryptodev support
parent 9852e7e4

INSTALL

+6 −0
Original line number Diff line number Diff line
@@ -103,6 +103,12 @@ 
                define preprocessor symbols, specify additional libraries,

                library directories or other compiler options.



  -DHAVE_CRYPTODEV Enable the BSD cryptodev engine even if we are not using

		BSD. Useful if you are running ocf-linux or something

		similar. Once enabled you can also enable the use of

		cryptodev digests, which is usually slower unless you have

		large amounts data. Use -DUSE_CRYPTODEV_DIGESTS to force

		it.



 Installation in Detail

 ----------------------

crypto/engine/eng_all.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void ENGINE_load_builtin_engines(void) 
	 * *no* builtin implementations). */

	ENGINE_load_openssl();

#endif

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

#if !defined(OPENSSL_NO_HW) && (defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV))

	ENGINE_load_cryptodev();

#endif

	ENGINE_load_dynamic();
@@ -114,7 +114,7 @@ void ENGINE_load_builtin_engines(void) 
#endif

	}



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

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

void ENGINE_setup_bsd_cryptodev(void) {

	static int bsd_cryptodev_default_loaded = 0;

	if (!bsd_cryptodev_default_loaded) {

crypto/engine/engine.h

+1 −1
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id, 
 * values. */

void *ENGINE_get_static_state(void);



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

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

void ENGINE_setup_bsd_cryptodev(void);

#endif

crypto/evp/c_all.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void OPENSSL_add_all_algorithms_noconf(void) 
	OpenSSL_add_all_ciphers();

	OpenSSL_add_all_digests();

#ifndef OPENSSL_NO_ENGINE

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

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

	ENGINE_setup_bsd_cryptodev();

# endif

#endif