diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 17 | ||||
| -rwxr-xr-x | Configure | 1 | ||||
| -rw-r--r-- | apps/opt.c | 2 | ||||
| -rw-r--r-- | apps/s_time.c | 2 | ||||
| -rw-r--r-- | apps/speed.c | 2 | ||||
| -rwxr-xr-x | config | 11 | ||||
| -rw-r--r-- | crypto/rand/rand_egd.c | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 6 | ||||
| -rw-r--r-- | crypto/uid.c | 4 | ||||
| -rw-r--r-- | e_os.h | 6 | ||||
| -rw-r--r-- | include/openssl/e_os2.h | 9 | ||||
| -rw-r--r-- | include/openssl/opensslconf.h.in | 3 | ||||
| -rw-r--r-- | test/ssltest_old.c | 2 |
14 files changed, 12 insertions, 58 deletions
@@ -9,6 +9,9 @@ Changes between 1.1.1 and 3.0.0 [xx XXX xxxx] + *) Removed NextStep support and the macro OPENSSL_UNISTD + [Rich Salz] + *) RC5_32_set_key has been changed to return an int type, with 0 indicating an error and 1 indicating success. In previous versions of OpenSSL this was a void type. If a key was set longer than the maximum possible this diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 4f5e3636f4..ad85990287 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1051,23 +1051,6 @@ my %targets = ( shared_cflag => "-fPIC", }, - "nextstep" => { - inherit_from => [ "BASE_unix" ], - CC => "cc", - CFLAGS => "-O -Wall", - unistd => "<libc.h>", - bn_ops => "BN_LLONG", - thread_scheme => "(unknown)", - }, - "nextstep3.3" => { - inherit_from => [ "BASE_unix" ], - CC => "cc", - CFLAGS => "-O3 -Wall", - unistd => "<libc.h>", - bn_ops => "BN_LLONG", - thread_scheme => "(unknown)", - }, - #### SCO/Caldera targets. # # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. @@ -3314,7 +3314,6 @@ sub print_table_entry "includes", "cc", "cflags", - "unistd", "ld", "lflags", "loutflag", diff --git a/apps/opt.c b/apps/opt.c index f4a4e12581..c2a5878ef6 100644 --- a/apps/opt.c +++ b/apps/opt.c @@ -15,7 +15,7 @@ #include "internal/nelem.h" #include <string.h> #if !defined(OPENSSL_SYS_MSDOS) -# include OPENSSL_UNISTD +# include <unistd.h> #endif #include <stdlib.h> diff --git a/apps/s_time.c b/apps/s_time.c index e436b57ad0..39e3d4bb48 100644 --- a/apps/s_time.c +++ b/apps/s_time.c @@ -24,7 +24,7 @@ #include <openssl/err.h> #include <internal/sockets.h> #if !defined(OPENSSL_SYS_MSDOS) -# include OPENSSL_UNISTD +# include <unistd.h> #endif #define SSL_CONNECT_NAME "localhost:4433" diff --git a/apps/speed.c b/apps/speed.c index 0f3ca9ca76..b0cbdf43bb 100644 --- a/apps/speed.c +++ b/apps/speed.c @@ -29,7 +29,7 @@ #include <openssl/objects.h> #include <openssl/async.h> #if !defined(OPENSSL_SYS_MSDOS) -# include OPENSSL_UNISTD +# include <unistd.h> #endif #if defined(_WIN32) @@ -349,17 +349,6 @@ if [ -d /usr/apollo ]; then exit 0 fi -# Now NeXT -ISNEXT=`hostinfo 2>/dev/null` -case "$ISNEXT" in - *'NeXT Mach 3.3'*) - echo "whatever-next-nextstep3.3"; exit 0 - ;; - *NeXT*) - echo "whatever-next-nextstep"; exit 0 - ;; -esac - # At this point we gone through all the one's # we know of: Punt diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index ef552119b8..bac8d609c4 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -38,7 +38,7 @@ int RAND_egd_bytes(const char *path, int bytes) # else -# include OPENSSL_UNISTD +# include <unistd.h> # include <stddef.h> # include <sys/types.h> # include <sys/socket.h> diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 2b5e5c1f02..4c1ec554ba 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -34,11 +34,7 @@ # include <errno.h> # if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VMS) -# ifdef OPENSSL_UNISTD -# include OPENSSL_UNISTD -# else -# include <unistd.h> -# endif +# include <unistd.h> /* * If unistd.h defines _POSIX_VERSION, we conclude that we are on a POSIX * system and have sigaction and termios. diff --git a/crypto/uid.c b/crypto/uid.c index 3ae93f6b47..55e276dfe4 100644 --- a/crypto/uid.c +++ b/crypto/uid.c @@ -19,7 +19,7 @@ int OPENSSL_issetugid(void) #elif defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD__ > 2) || defined(__DragonFly__) -# include OPENSSL_UNISTD +# include <unistd.h> int OPENSSL_issetugid(void) { @@ -28,7 +28,7 @@ int OPENSSL_issetugid(void) #else -# include OPENSSL_UNISTD +# include <unistd.h> # include <sys/types.h> # if defined(__GLIBC__) && defined(__GLIBC_PREREQ) @@ -257,11 +257,7 @@ extern FILE *_imp___iob; # else /* !defined VMS */ -# ifdef OPENSSL_UNISTD -# include OPENSSL_UNISTD -# else -# include <unistd.h> -# endif +# include <unistd.h> # include <sys/types.h> # ifdef OPENSSL_SYS_WIN32_CYGWIN # include <io.h> diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index 50ce937fd1..250b3e2471 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -136,15 +136,6 @@ extern "C" { * That's it for OS-specific stuff *****************************************************************************/ -/* Specials for I/O an exit */ -# ifdef OPENSSL_SYS_MSDOS -# define OPENSSL_UNISTD_IO <io.h> -# define OPENSSL_DECLARE_EXIT extern void exit(int); -# else -# define OPENSSL_UNISTD_IO OPENSSL_UNISTD -# define OPENSSL_DECLARE_EXIT /* declared in unistd.h */ -# endif - /*- * OPENSSL_EXTERN is normally used to declare a symbol with possible extra * attributes to handle its presence in a shared library. diff --git a/include/openssl/opensslconf.h.in b/include/openssl/opensslconf.h.in index ca680bc388..0f99079c5c 100644 --- a/include/openssl/opensslconf.h.in +++ b/include/openssl/opensslconf.h.in @@ -165,9 +165,6 @@ extern "C" { /* Generate 80386 code? */ {- $config{processor} eq "386" ? "# define" : "# undef" -} I386_ONLY -# undef OPENSSL_UNISTD -# define OPENSSL_UNISTD {- $target{unistd} -} - {- $config{export_var_as_fn} ? "# define" : "# undef" -} OPENSSL_EXPORT_VAR_AS_FUNCTION /* diff --git a/test/ssltest_old.c b/test/ssltest_old.c index 390ca88bb7..971015c6e6 100644 --- a/test/ssltest_old.c +++ b/test/ssltest_old.c @@ -71,7 +71,7 @@ #ifdef OPENSSL_SYS_WINDOWS # include <winsock.h> #else -# include OPENSSL_UNISTD +# include <unistd.h> #endif static SSL_CTX *s_ctx = NULL; |