projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Detect symmetric crypto errors in PKCS7_decrypt.
[oweals/openssl.git]
/
crypto
/
opensslconf.h.in
diff --git
a/crypto/opensslconf.h.in
b/crypto/opensslconf.h.in
index 522545e0aa0f0045a1fb28b54dc4c49a0c24e0e5..97e37455634df6559483b37601fff2f4bd9aa3bf 100644
(file)
--- a/
crypto/opensslconf.h.in
+++ b/
crypto/opensslconf.h.in
@@
-1,17
+1,20
@@
-/* crypto/opensslconf.h */
-/* WARNING: This file is autogenerated by Configure */
+/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define ENGINESDIR "/usr/local/lib/engines"
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif
+#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#define OPENSSL_UNISTD <unistd.h>
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
@@
-45,7
+48,7
@@
#endif
#endif
#endif
#endif
-#if
defined(HEADER_DES_H
) && !defined(DES_LONG)
+#if
(defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)
) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
@@
-60,14
+63,9
@@
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
-/* The prime number generation stuff may not work when
- * EIGHT_BIT but I don't care since I've only used this mode
- * for debuging the bignum libraries */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
-#undef SIXTEEN_BIT
-#undef EIGHT_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
@@
-145,7
+143,7
@@
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
-#elif defined(
i386 )
/* x86 boxes, should be gcc */
+#elif defined(
i386) || defined(__i386__)
/* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL