projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Configure, e_aes.c: allow for XTS assembler implementation [from HEAD].
[oweals/openssl.git]
/
crypto
/
evp
/
c_all.c
diff --git
a/crypto/evp/c_all.c
b/crypto/evp/c_all.c
index 5ffd352ea0c784c9817287b9675a5713e65f095b..766c4cecdf7e4bbea6ab9ed502ef9d13347c41a2 100644
(file)
--- a/
crypto/evp/c_all.c
+++ b/
crypto/evp/c_all.c
@@
-59,16
+59,32
@@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
+#ifndef OPENSSL_NO_ENGINE
+#include <openssl/engine.h>
+#endif
+#if 0
#undef OpenSSL_add_all_algorithms
void OpenSSL_add_all_algorithms(void)
{
OPENSSL_add_all_algorithms_noconf();
}
#undef OpenSSL_add_all_algorithms
void OpenSSL_add_all_algorithms(void)
{
OPENSSL_add_all_algorithms_noconf();
}
+#endif
void OPENSSL_add_all_algorithms_noconf(void)
{
void OPENSSL_add_all_algorithms_noconf(void)
{
+ /*
+ * For the moment OPENSSL_cpuid_setup does something
+ * only on IA-32, but we reserve the option for all
+ * platforms...
+ */
+ OPENSSL_cpuid_setup();
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
+#ifndef OPENSSL_NO_ENGINE
+# if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(HAVE_CRYPTODEV)
+ ENGINE_setup_bsd_cryptodev();
+# endif
+#endif
}
}