[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Mon Jan 25 14:44:49 UTC 2016
The branch master has been updated
via dc193c9c5e914c74fd0f51fe4fe86fbd5910536e (commit)
from 2dc4be513b1ab59cce3f578488a870124dcff1b8 (commit)
- Log -----------------------------------------------------------------
commit dc193c9c5e914c74fd0f51fe4fe86fbd5910536e
Author: Rich Salz <rsalz at openssl.org>
Date: Mon Jan 25 09:44:08 2016 -0500
Move & split opensslconf.h.in
Move opensslconf.h.in to include/openssl.
Split off DES,BN,RC4 stuff into separate header file
templates in crypto/include/internal/*_conf.h.in
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 +-
Configure | 20 +-
crypto/bf/bf_locl.h | 3 +-
crypto/bn/bn_lcl.h | 1 +
crypto/des/des_locl.h | 2 +
.../include/internal/bf_conf.h.in | 24 +-
.../include/internal/bn_conf.h.in | 22 +-
.../e_old.c => include/internal/des_conf.h.in} | 157 +++++------
.../include/internal/rc4_conf.h.in | 28 +-
crypto/opensslconf.h.in | 300 ---------------------
crypto/rc4/rc4_locl.h | 1 +
include/openssl/opensslconf.h.in | 173 ++++++++++++
12 files changed, 301 insertions(+), 433 deletions(-)
copy test/nptest.c => crypto/include/internal/bf_conf.h.in (89%)
copy test/nptest.c => crypto/include/internal/bn_conf.h.in (85%)
copy crypto/{evp/e_old.c => include/internal/des_conf.h.in} (54%)
copy test/nptest.c => crypto/include/internal/rc4_conf.h.in (82%)
delete mode 100644 crypto/opensslconf.h.in
create mode 100644 include/openssl/opensslconf.h.in
diff --git a/.gitignore b/.gitignore
index 0a3f054..e8d5105 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,8 @@
# Auto generated headers
/crypto/buildinf.h
-/crypto/opensslconf.h
+/openssl/include/opensslconf.h
+/crypto/include/internal/*_conf.h
# Auto generated assembly language source files
*.s
diff --git a/Configure b/Configure
index 5e973c6..276a143 100755
--- a/Configure
+++ b/Configure
@@ -1413,10 +1413,24 @@ print "RANLIB =$target{ranlib}\n";
print "ARFLAGS =$target{arflags}\n";
print "PERL =$config{perl}\n";
-system("$config{perl} -I. -Mconfigdata util/dofile.pl < crypto/opensslconf.h.in > include/openssl/opensslconf.h.new");
-exit 1 if $? != 0;
-rename("include/openssl/opensslconf.h.new","include/openssl/opensslconf.h") || die "unable to rename include/openssl/opensslconf.h.new\n";
+sub
+run_dofile()
+{
+ my $in = shift;
+ my $out = shift;
+
+ # should we remove $out ?
+ system("$config{perl} -I. -Mconfigdata util/dofile.pl <$in >$out.new");
+ exit 1 if $? != 0;
+ rename("$out.new", $out) || die "Can't rename $out.new, $!";
+}
+&run_dofile("include/openssl/opensslconf.h.in", "include/openssl/opensslconf.h");
+
+foreach my $alg ( 'bf', 'bn', 'des', 'rc4' ) {
+ &run_dofile("crypto/include/internal/${alg}_conf.h.in",
+ "crypto/include/internal/${alg}_conf.h");
+}
# Fix the date
diff --git a/crypto/bf/bf_locl.h b/crypto/bf/bf_locl.h
index 9448aed..fe2c9db 100644
--- a/crypto/bf/bf_locl.h
+++ b/crypto/bf/bf_locl.h
@@ -58,7 +58,8 @@
#ifndef HEADER_BF_LOCL_H
# define HEADER_BF_LOCL_H
-# include <openssl/opensslconf.h>/* BF_PTR, BF_PTR2 */
+# include <openssl/opensslconf.h>
+# include "internal/bf_conf.h"
# undef c2l
# define c2l(c,l) (l =((unsigned long)(*((c)++))) , \
diff --git a/crypto/bn/bn_lcl.h b/crypto/bn/bn_lcl.h
index e4281a3..1bdaee8 100644
--- a/crypto/bn/bn_lcl.h
+++ b/crypto/bn/bn_lcl.h
@@ -112,6 +112,7 @@
#ifndef HEADER_BN_LCL_H
# define HEADER_BN_LCL_H
+# include "internal/bn_conf.h"
# include "internal/bn_int.h"
#ifdef __cplusplus
diff --git a/crypto/des/des_locl.h b/crypto/des/des_locl.h
index 23ea9d3..cfd15c3 100644
--- a/crypto/des/des_locl.h
+++ b/crypto/des/des_locl.h
@@ -61,6 +61,8 @@
# include <openssl/e_os2.h>
+# include "internal/des_conf.h"
+
# if defined(OPENSSL_SYS_WIN32)
# ifndef OPENSSL_SYS_MSDOS
# define OPENSSL_SYS_MSDOS
diff --git a/test/nptest.c b/crypto/include/internal/bf_conf.h.in
similarity index 89%
copy from test/nptest.c
copy to crypto/include/internal/bf_conf.h.in
index 9528851..5b6e5e7 100644
--- a/test/nptest.c
+++ b/crypto/include/internal/bf_conf.h.in
@@ -1,5 +1,5 @@
/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2016 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -52,15 +52,17 @@
*
*/
+#ifndef HEADER_BF_CONF_H
+# define HEADER_BF_CONF_H
-#include <stdio.h>
-#include <string.h>
+{-
+ if ($config{bf_ptr} == 0) {
+ "#undef BF_PTR";
+ } elsif ($config{bf_ptr} == 1) {
+ "#define BF_PTR";
+ } elsif ($config{bf_ptr} == 2) {
+ "#define BF_PTR2";
+ }
+-}
-int main()
-{
- char *p = NULL;
- char bytes[sizeof(p)];
-
- memset(bytes, 0, sizeof bytes);
- return memcmp(&p, bytes, sizeof(bytes)) == 0 ? 0 : 1;
-}
+#endif
diff --git a/test/nptest.c b/crypto/include/internal/bn_conf.h.in
similarity index 85%
copy from test/nptest.c
copy to crypto/include/internal/bn_conf.h.in
index 9528851..a75e964 100644
--- a/test/nptest.c
+++ b/crypto/include/internal/bn_conf.h.in
@@ -1,5 +1,5 @@
/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2016 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -52,15 +52,17 @@
*
*/
+#ifndef HEADER_BN_CONF_H
+# define HEADER_BN_CONF_H
-#include <stdio.h>
-#include <string.h>
+# if !defined(OPENSSL_SYS_UEFI)
-int main()
-{
- char *p = NULL;
- char bytes[sizeof(p)];
+/* Should we define BN_DIV2W here? */
- memset(bytes, 0, sizeof bytes);
- return memcmp(&p, bytes, sizeof(bytes)) == 0 ? 0 : 1;
-}
+/* Only one for the following should be defined */
+{- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG
+{- $config{b64} ? "#define" : "#undef" -} SIXTY_FOUR_BIT
+{- $config{b32} ? "#define" : "#undef" -} THIRTY_TWO_BIT
+# endif
+
+#endif
diff --git a/crypto/evp/e_old.c b/crypto/include/internal/des_conf.h.in
similarity index 54%
copy from crypto/evp/e_old.c
copy to crypto/include/internal/des_conf.h.in
index d5c4b4e..43ab5eb 100644
--- a/crypto/evp/e_old.c
+++ b/crypto/include/internal/des_conf.h.in
@@ -1,10 +1,5 @@
-/* crypto/evp/e_old.c */
-/*
- * Written by Richard Levitte (richard at levitte.org) for the OpenSSL project
- * 2004.
- */
/* ====================================================================
- * Copyright (c) 2004 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2016 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -57,110 +52,78 @@
*
*/
-#include <openssl/opensslconf.h>
-
-#if OPENSSL_API_COMPAT >= 0x00908000L
-static void *dummy = &dummy;
-#else
-
-# include <openssl/evp.h>
-
-/*
- * Define some deprecated functions, so older programs don't crash and burn
- * too quickly. On Windows and VMS, these will never be used, since
- * functions and variables in shared libraries are selected by entry point
- * location, not by name.
- */
-
-# ifndef OPENSSL_NO_BF
-# undef EVP_bf_cfb
-const EVP_CIPHER *EVP_bf_cfb(void);
-const EVP_CIPHER *EVP_bf_cfb(void)
-{
- return EVP_bf_cfb64();
-}
-# endif
-
-# ifndef OPENSSL_NO_DES
-# undef EVP_des_cfb
-const EVP_CIPHER *EVP_des_cfb(void);
-const EVP_CIPHER *EVP_des_cfb(void)
-{
- return EVP_des_cfb64();
-}
+#ifndef HEADER_DES_CONF_H
+# define HEADER_DES_CONF_H
-# undef EVP_des_ede3_cfb
-const EVP_CIPHER *EVP_des_ede3_cfb(void);
-const EVP_CIPHER *EVP_des_ede3_cfb(void)
-{
- return EVP_des_ede3_cfb64();
-}
-
-# undef EVP_des_ede_cfb
-const EVP_CIPHER *EVP_des_ede_cfb(void);
-const EVP_CIPHER *EVP_des_ede_cfb(void)
-{
- return EVP_des_ede_cfb64();
-}
+/* the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
+# ifndef DES_PTR
+{- $config{des_ptr} ? "#define" : "#undef" -} DES_PTR
# endif
-# ifndef OPENSSL_NO_IDEA
-# undef EVP_idea_cfb
-const EVP_CIPHER *EVP_idea_cfb(void);
-const EVP_CIPHER *EVP_idea_cfb(void)
-{
- return EVP_idea_cfb64();
-}
+/* This helps C compiler generate the correct code for multiple functional
+ * units. It reduces register dependancies at the expense of 2 more
+ * registers */
+# ifndef DES_RISC1
+{- $config{des_risc1} ? "#define" : "#undef" -} DES_RISC1
# endif
-# ifndef OPENSSL_NO_RC2
-# undef EVP_rc2_cfb
-const EVP_CIPHER *EVP_rc2_cfb(void);
-const EVP_CIPHER *EVP_rc2_cfb(void)
-{
- return EVP_rc2_cfb64();
-}
+# ifndef DES_RISC2
+{- $config{des_risc2} ? "#define" : "#undef" -} DES_RISC2
# endif
-# ifndef OPENSSL_NO_CAST
-# undef EVP_cast5_cfb
-const EVP_CIPHER *EVP_cast5_cfb(void);
-const EVP_CIPHER *EVP_cast5_cfb(void)
-{
- return EVP_cast5_cfb64();
-}
+# if defined(DES_RISC1) && defined(DES_RISC2)
+# error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
# endif
-# ifndef OPENSSL_NO_RC5
-# undef EVP_rc5_32_12_16_cfb
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void);
-const EVP_CIPHER *EVP_rc5_32_12_16_cfb(void)
-{
- return EVP_rc5_32_12_16_cfb64();
-}
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Very mucy CPU dependant */
+# ifndef DES_UNROLL
+{- $config{des_unroll} ? "#define" : "#undef" -} DES_UNROLL
# endif
-# ifndef OPENSSL_NO_AES
-# undef EVP_aes_128_cfb
-const EVP_CIPHER *EVP_aes_128_cfb(void);
-const EVP_CIPHER *EVP_aes_128_cfb(void)
-{
- return EVP_aes_128_cfb128();
-}
+/*
+ * These default values were supplied by
+ * Peter Gutman <pgut001 at cs.auckland.ac.nz>
+ * They are only used if nothing else has been defined
+ */
+# if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-# undef EVP_aes_192_cfb
-const EVP_CIPHER *EVP_aes_192_cfb(void);
-const EVP_CIPHER *EVP_aes_192_cfb(void)
-{
- return EVP_aes_192_cfb128();
-}
+/*
+ * Special defines which change the way the code is built depending on the
+ * CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+ * even newer MIPS CPU's, but at the moment one size fits all for
+ * optimization options. Older Sparc's work better with only UNROLL, but
+ * there's no way to tell at compile time what it is you're running on.
+ */
+
+# if defined(sparc) || defined(__sparc__) /* Newer Sparc's */
+# define DES_PTR
+# define DES_RISC1
+# define DES_UNROLL
+# elif defined( __ultrix ) /* Older MIPS */
+# define DES_PTR
+# define DES_RISC2
+# define DES_UNROLL
+# elif defined( __osf1__ ) /* Alpha */
+# define DES_PTR
+# define DES_RISC2
+# elif defined ( _AIX ) /* RS6000 */
+ /* Unknown */
+# elif defined( __hpux ) /* HP-PA */
+ /* Unknown */
+# elif defined( __aux ) /* 68K */
+ /* Unknown */
+# elif defined( __sgi ) /* Newer MIPS */
+# define DES_PTR
+# define DES_RISC2
+# define DES_UNROLL
+# elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
+# define DES_PTR
+# define DES_RISC1
+# define DES_UNROLL
+# endif
-# undef EVP_aes_256_cfb
-const EVP_CIPHER *EVP_aes_256_cfb(void);
-const EVP_CIPHER *EVP_aes_256_cfb(void)
-{
- return EVP_aes_256_cfb128();
-}
# endif
#endif
diff --git a/test/nptest.c b/crypto/include/internal/rc4_conf.h.in
similarity index 82%
copy from test/nptest.c
copy to crypto/include/internal/rc4_conf.h.in
index 9528851..5f23357 100644
--- a/test/nptest.c
+++ b/crypto/include/internal/rc4_conf.h.in
@@ -1,5 +1,5 @@
/* ====================================================================
- * Copyright (c) 2015 The OpenSSL Project. All rights reserved.
+ * Copyright (c) 2016 The OpenSSL Project. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -52,15 +52,23 @@
*
*/
+#ifndef HEADER_RC4_CONF_H
+# define HEADER_RC4_CONF_H
-#include <stdio.h>
-#include <string.h>
+# if !defined(RC4_CHUNK)
+/*
+ * This enables code handling data aligned at natural CPU word
+ * boundary. See crypto/rc4/rc4_enc.c for further details.
+ */
+{-
+ $config{rc4_chunk}
+ ? "#define RC4_CHUNK ".$config{rc4_chunk}
+ : "#undef RC4_CHUNK";
+-}
+# endif
-int main()
-{
- char *p = NULL;
- char bytes[sizeof(p)];
+/* if this is defined data[i] is used instead of *data, this is a %20
+ * speedup on x86 */
+{- $config{rc4_idx} ? "#define" : "#undef" -} RC4_INDEX
- memset(bytes, 0, sizeof bytes);
- return memcmp(&p, bytes, sizeof(bytes)) == 0 ? 0 : 1;
-}
+#endif
diff --git a/crypto/opensslconf.h.in b/crypto/opensslconf.h.in
deleted file mode 100644
index 00bc866..0000000
--- a/crypto/opensslconf.h.in
+++ /dev/null
@@ -1,300 +0,0 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* OpenSSL was configured with the following options: */
-{-
- if (@{$config{openssl_sys_defines}}) {
- foreach (@{$config{openssl_sys_defines}}) {
- $OUT .= "#ifndef $_\n";
- $OUT .= "# define $_ 1\n";
- $OUT .= "#endif\n";
- }
- }
- "";
--}
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-{-
- if (@{$config{openssl_experimental_defines}}) {
- foreach (@{$config{openssl_experimental_defines}}) {
- (my $ex = $_) =~ s/_NO_/_EXPERIMENTAL_/;
- $OUT .= "#ifndef $ex\n";
- $OUT .= "# ifndef $_\n";
- $OUT .= "# define $_\n";
- $OUT .= "# endif\n";
- $OUT .= "#endif\n";
- }
- }
- "";
--}
-{-
- foreach (@{$config{openssl_api_defines}}) {
- (my $macro, my $value) = $_ =~ /^(.*?)=(.*?)$/;
- $OUT .= "#define OPENSSL_MIN_API $value\n";
- }
--}
-{-
- if (@{$config{openssl_algorithm_defines}}) {
- foreach (@{$config{openssl_algorithm_defines}}) {
- $OUT .= "#ifndef $_\n";
- $OUT .= "# define $_\n";
- $OUT .= "#endif\n";
- }
- } else {
- " /* no ciphers excluded */\n";
- }
--}
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-{-
- if (@{$config{openssl_thread_defines}}) {
- foreach (@{$config{openssl_thread_defines}}) {
- $OUT .= "#ifndef $_\n";
- $OUT .= "# define $_\n";
- $OUT .= "#endif\n";
- }
- }
- "";
--}
-{-
- if (@{$config{openssl_other_defines}}) {
- foreach (@{$config{openssl_other_defines}}) {
- $OUT .= "#ifndef $_\n";
- $OUT .= "# define $_\n";
- $OUT .= "#endif\n";
- }
- }
- "";
--}
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
- asks for it. This is a transient feature that is provided for those
- who haven't had the time to do the appropriate changes in their
- applications. */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-{-
- if (@{$config{openssl_algorithm_defines}}) {
- foreach (@{$config{openssl_algorithm_defines}}) {
- (my $ex = $_) =~ s/^OPENSSL_//;
- $OUT .= "# if defined($_) \&\& !defined($ex)\n";
- $OUT .= "# define $ex\n";
- $OUT .= "# endif\n";
- }
- }
- "";
--}
-#endif
-
-{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -}
-
-/*
- * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
- * declarations of functions deprecated in or before <version>. Otherwise, they
- * still won't see them if the library has been built to disable deprecated
- * functions.
- */
-#if defined(OPENSSL_NO_DEPRECATED)
-# define DECLARE_DEPRECATED(f)
-#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
-# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
-#else
-# define DECLARE_DEPRECATED(f) f;
-#endif
-
-#ifndef OPENSSL_MIN_API
-#define OPENSSL_MIN_API 0
-#endif
-
-#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
-#undef OPENSSL_API_COMPAT
-#define OPENSSL_API_COMPAT OPENSSL_MIN_API
-#endif
-
-#if OPENSSL_API_COMPAT < 0x10100000L
-# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_1_1_0(f)
-#endif
-
-#if OPENSSL_API_COMPAT < 0x10000000L
-# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_1_0_0(f)
-#endif
-
-#if OPENSSL_API_COMPAT < 0x00908000L
-# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
-#else
-# define DEPRECATEDIN_0_9_8(f)
-#endif
-
-/* Generate 80386 code? */
-{- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR {- quotify1($config{enginesdir}) -}
-#define OPENSSLDIR {- quotify1($config{openssldir}) -}
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD {- $target{unistd} -}
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-{- $config{export_var_as_fn} ? "#define OPENSSL_EXPORT_VAR_AS_FUNCTION" : "" -}
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT {- $config{idea_int} -}
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT {- $config{md2_int} -}
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT {- $config{rc2_int} -}
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT {- $config{rc4_int} -}
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-{-
- $config{rc4_chunk}
- ? "#define RC4_CHUNK ".$config{rc4_chunk}
- : "#undef RC4_CHUNK";
--}
-#endif
-#endif
-
-#ifndef OSSL_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 OSSL_DES_LONG
-#define OSSL_DES_LONG {- $config{des_int} -}
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H) && !defined(OPENSSL_SYS_UEFI)
-#define CONFIG_HEADER_BN_H
-{- $config{bn_ll} ? "#define" : "#undef" -} BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-{- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG
-{- $config{b64} ? "#define" : "#undef" -} SIXTY_FOUR_BIT
-{- $config{b32} ? "#define" : "#undef" -} THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-{- $config{rc4_idx} ? "#define" : "#undef" -} RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-{-
- if ($config{bf_ptr} == 0) {
- "#undef BF_PTR";
- } elsif ($config{bf_ptr} == 1) {
- "#define BF_PTR";
- } elsif ($config{bf_ptr} == 2) {
- "#define BF_PTR2";
- }
--}
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-{- $config{des_ptr} ? "#define" : "#undef" -} DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units. It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-{- $config{des_risc1} ? "#define" : "#undef" -} DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-{- $config{des_risc2} ? "#define" : "#undef" -} DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-#error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-{- $config{des_unroll} ? "#define" : "#undef" -} DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001 at cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
- CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
- even newer MIPS CPU's, but at the moment one size fits all for
- optimization options. Older Sparc's work better with only UNROLL, but
- there's no way to tell at compile time what it is you're running on */
-
-#if defined(sparc) || defined(__sparc__) /* Newer Sparc's */
-# define DES_PTR
-# define DES_RISC1
-# define DES_UNROLL
-#elif defined( __ultrix ) /* Older MIPS */
-# define DES_PTR
-# define DES_RISC2
-# define DES_UNROLL
-#elif defined( __osf1__ ) /* Alpha */
-# define DES_PTR
-# define DES_RISC2
-#elif defined ( _AIX ) /* RS6000 */
- /* Unknown */
-#elif defined( __hpux ) /* HP-PA */
- /* Unknown */
-#elif defined( __aux ) /* 68K */
- /* Unknown */
-#elif defined( __sgi ) /* Newer MIPS */
-# define DES_PTR
-# define DES_RISC2
-# define DES_UNROLL
-#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
-# define DES_PTR
-# define DES_RISC1
-# define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
-#ifdef __cplusplus
-}
-#endif
diff --git a/crypto/rc4/rc4_locl.h b/crypto/rc4/rc4_locl.h
index 2f09b7c..3ed48d8 100644
--- a/crypto/rc4/rc4_locl.h
+++ b/crypto/rc4/rc4_locl.h
@@ -2,4 +2,5 @@
# define HEADER_RC4_LOCL_H
# include <openssl/opensslconf.h>
# include "internal/cryptlib.h"
+# include "internal/rc4_conf.h"
#endif
diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in
new file mode 100644
index 0000000..3d7137e
--- /dev/null
+++ b/include/openssl/opensslconf.h.in
@@ -0,0 +1,173 @@
+/* opensslconf.h */
+/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+/* OpenSSL was configured with the following options: */
+{-
+ if (@{$config{openssl_sys_defines}}) {
+ foreach (@{$config{openssl_sys_defines}}) {
+ $OUT .= "#ifndef $_\n";
+ $OUT .= "# define $_ 1\n";
+ $OUT .= "#endif\n";
+ }
+ }
+ "";
+-}
+#ifndef OPENSSL_DOING_MAKEDEPEND
+
+{-
+ if (@{$config{openssl_experimental_defines}}) {
+ foreach (@{$config{openssl_experimental_defines}}) {
+ (my $ex = $_) =~ s/_NO_/_EXPERIMENTAL_/;
+ $OUT .= "#ifndef $ex\n";
+ $OUT .= "# ifndef $_\n";
+ $OUT .= "# define $_\n";
+ $OUT .= "# endif\n";
+ $OUT .= "#endif\n";
+ }
+ }
+ "";
+-}
+{-
+ foreach (@{$config{openssl_api_defines}}) {
+ (my $macro, my $value) = $_ =~ /^(.*?)=(.*?)$/;
+ $OUT .= "#define OPENSSL_MIN_API $value\n";
+ }
+-}
+{-
+ if (@{$config{openssl_algorithm_defines}}) {
+ foreach (@{$config{openssl_algorithm_defines}}) {
+ $OUT .= "#ifndef $_\n";
+ $OUT .= "# define $_\n";
+ $OUT .= "#endif\n";
+ }
+ } else {
+ " /* no ciphers excluded */\n";
+ }
+-}
+
+#endif /* OPENSSL_DOING_MAKEDEPEND */
+
+{-
+ if (@{$config{openssl_thread_defines}}) {
+ foreach (@{$config{openssl_thread_defines}}) {
+ $OUT .= "#ifndef $_\n";
+ $OUT .= "# define $_\n";
+ $OUT .= "#endif\n";
+ }
+ }
+ "";
+-}
+{-
+ if (@{$config{openssl_other_defines}}) {
+ foreach (@{$config{openssl_other_defines}}) {
+ $OUT .= "#ifndef $_\n";
+ $OUT .= "# define $_\n";
+ $OUT .= "#endif\n";
+ }
+ }
+ "";
+-}
+
+/* The OPENSSL_NO_* macros are also defined as NO_* if the application
+ asks for it. This is a transient feature that is provided for those
+ who haven't had the time to do the appropriate changes in their
+ applications. */
+#ifdef OPENSSL_ALGORITHM_DEFINES
+{-
+ if (@{$config{openssl_algorithm_defines}}) {
+ foreach (@{$config{openssl_algorithm_defines}}) {
+ (my $ex = $_) =~ s/^OPENSSL_//;
+ $OUT .= "# if defined($_) \&\& !defined($ex)\n";
+ $OUT .= "# define $ex\n";
+ $OUT .= "# endif\n";
+ }
+ }
+ "";
+-}
+#endif
+
+{- $target{cpuid_obj} ne "mem_clr.o" ? "#define OPENSSL_CPUID_OBJ" : "" -}
+
+/*
+ * Applications should use -DOPENSSL_API_COMPAT=<version> to suppress the
+ * declarations of functions deprecated in or before <version>. Otherwise, they
+ * still won't see them if the library has been built to disable deprecated
+ * functions.
+ */
+#if defined(OPENSSL_NO_DEPRECATED)
+# define DECLARE_DEPRECATED(f)
+#elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ > 0)
+# define DECLARE_DEPRECATED(f) f __attribute__ ((deprecated));
+#else
+# define DECLARE_DEPRECATED(f) f;
+#endif
+
+#ifndef OPENSSL_MIN_API
+#define OPENSSL_MIN_API 0
+#endif
+
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < OPENSSL_MIN_API
+#undef OPENSSL_API_COMPAT
+#define OPENSSL_API_COMPAT OPENSSL_MIN_API
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10100000L
+# define DEPRECATEDIN_1_1_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_1_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x10000000L
+# define DEPRECATEDIN_1_0_0(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_1_0_0(f)
+#endif
+
+#if OPENSSL_API_COMPAT < 0x00908000L
+# define DEPRECATEDIN_0_9_8(f) DECLARE_DEPRECATED(f)
+#else
+# define DEPRECATEDIN_0_9_8(f)
+#endif
+
+/* Generate 80386 code? */
+{- $config{processor} eq "386" ? "#define" : "#undef" -} I386_ONLY
+
+#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
+#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define ENGINESDIR {- quotify1($config{enginesdir}) -}
+#define OPENSSLDIR {- quotify1($config{openssldir}) -}
+#endif
+#endif
+
+#undef OPENSSL_UNISTD
+#define OPENSSL_UNISTD {- $target{unistd} -}
+
+#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
+{- $config{export_var_as_fn} ? "#define OPENSSL_EXPORT_VAR_AS_FUNCTION" : "" -}
+
+/*
+ * The following are cipher-specific, but are part of the public API.
+ */
+
+#define OSSL_DES_LONG {- $config{des_int} -}
+
+#if !defined(OPENSSL_SYS_UEFI)
+{- $config{bn_ll} ? "#define" : "#undef" -} BN_LLONG
+
+/* Only one for the following should be defined */
+{- $config{b64l} ? "#define" : "#undef" -} SIXTY_FOUR_BIT_LONG
+{- $config{b64} ? "#define" : "#undef" -} SIXTY_FOUR_BIT
+{- $config{b32} ? "#define" : "#undef" -} THIRTY_TWO_BIT
+#endif
+
+# define RC2_INT {- $config{rc2_int} -}
+# define IDEA_INT {- $config{idea_int} -}
+# define MD2_INT {- $config{md2_int} -}
+# define RC4_INT {- $config{rc4_int} -}
+
+#ifdef __cplusplus
+}
+#endif
More information about the openssl-commits
mailing list