projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix (most) WIN32 warnings and errors.
[openssl.git]
/
crypto
/
evp
/
c_all.c
diff --git
a/crypto/evp/c_all.c
b/crypto/evp/c_all.c
index 879d84ae79baa3f991557a4c708356cc560a4319..a5da52e62d8b03ef8625fe39eb64df4f59faf97e 100644
(file)
--- a/
crypto/evp/c_all.c
+++ b/
crypto/evp/c_all.c
@@
-59,7
+59,9
@@
#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>
#include <openssl/engine.h>
+#endif
#if 0
#undef OpenSSL_add_all_algorithms
#if 0
#undef OpenSSL_add_all_algorithms
@@
-72,6
+74,12
@@
void OpenSSL_add_all_algorithms(void)
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();
#ifndef OPENSSL_NO_ENGINE
OpenSSL_add_all_ciphers();
OpenSSL_add_all_digests();
#ifndef OPENSSL_NO_ENGINE