Browse Source

Remove NextStep support

Because of that we can remove OPENSSL_UNISTD and some other
macros from e_os2.h and opensslconf.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9204)
master
Rich Salz 3 years ago
parent
commit
6b10d29c1a
14 changed files with 12 additions and 58 deletions
  1. +3
    -0
      CHANGES
  2. +0
    -17
      Configurations/10-main.conf
  3. +0
    -1
      Configure
  4. +1
    -1
      apps/opt.c
  5. +1
    -1
      apps/s_time.c
  6. +1
    -1
      apps/speed.c
  7. +0
    -11
      config
  8. +1
    -1
      crypto/rand/rand_egd.c
  9. +1
    -5
      crypto/ui/ui_openssl.c
  10. +2
    -2
      crypto/uid.c
  11. +1
    -5
      e_os.h
  12. +0
    -9
      include/openssl/e_os2.h
  13. +0
    -3
      include/openssl/opensslconf.h.in
  14. +1
    -1
      test/ssltest_old.c

+ 3
- 0
CHANGES View File

@ -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


+ 0
- 17
Configurations/10-main.conf View File

@ -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.


+ 0
- 1
Configure View File

@ -3314,7 +3314,6 @@ sub print_table_entry
"includes",
"cc",
"cflags",
"unistd",
"ld",
"lflags",
"loutflag",


+ 1
- 1
apps/opt.c View File

@ -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>


+ 1
- 1
apps/s_time.c View File

@ -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"


+ 1
- 1
apps/speed.c View File

@ -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)


+ 0
- 11
config View File

@ -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


+ 1
- 1
crypto/rand/rand_egd.c View File

@ -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>


+ 1
- 5
crypto/ui/ui_openssl.c View File

@ -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.


+ 2
- 2
crypto/uid.c View File

@ -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)


+ 1
- 5
e_os.h View File

@ -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>


+ 0
- 9
include/openssl/e_os2.h View File

@ -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.


+ 0
- 3
include/openssl/opensslconf.h.in View File

@ -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
/*


+ 1
- 1
test/ssltest_old.c View File

@ -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;


Loading…
Cancel
Save