[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Sun Jan 7 15:25:58 UTC 2018
The branch master has been updated
via 617b49db14fa4c1211bfc5d0e88294d0f159c9a9 (commit)
from 9422d45de2b70cabec5f6e6a5c812e0647e6d3ab (commit)
- Log -----------------------------------------------------------------
commit 617b49db14fa4c1211bfc5d0e88294d0f159c9a9
Author: Rich Salz <rsalz at openssl.org>
Date: Sat Jan 6 11:49:53 2018 -0500
Remove remaining NETWARE ifdef's
Reviewed-by: Richard Levitte <levitte at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5028)
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 4 ++++
apps/ocsp.c | 15 ---------------
crypto/bio/b_sock.c | 8 --------
crypto/bio/bss_dgram.c | 5 -----
crypto/bio/bss_log.c | 2 --
crypto/perlasm/x86asm.pl | 7 +------
crypto/perlasm/x86nasm.pl | 2 +-
include/internal/sockets.h | 9 +++------
8 files changed, 9 insertions(+), 43 deletions(-)
diff --git a/CHANGES b/CHANGES
index cad7ac6..a6bb6dc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@
Changes between 1.1.0f and 1.1.1 [xx XXX xxxx]
+ *) The last traces of Netware support, first removed in 1.1.0, have
+ now been removed.
+ [Rich Salz]
+
*) Get rid of Makefile.shared, and in the process, make the processing
of certain files (rc.obj, or the .def/.map/.opt files produced from
the ordinal files) more visible and hopefully easier to trace and
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 87c841d..5d4fa78 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -33,21 +33,6 @@ NON_EMPTY_TRANSLATION_UNIT
# include <openssl/bn.h>
# include <openssl/x509v3.h>
-# if defined(NETWARE_CLIB)
-# ifdef NETWARE_BSDSOCK
-# include <sys/socket.h>
-# include <sys/bsdskt.h>
-# else
-# include <novsock2.h>
-# endif
-# elif defined(NETWARE_LIBC)
-# ifdef NETWARE_BSDSOCK
-# include <sys/select.h>
-# else
-# include <novsock2.h>
-# endif
-# endif
-
/* Maximum leeway in validity period: default 5 minutes */
# define MAX_VALIDITY_PERIOD (5 * 60)
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index b3e8943..3243eca 100644
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -11,10 +11,6 @@
#include <stdlib.h>
#include <errno.h>
#include "bio_lcl.h"
-#if defined(NETWARE_CLIB)
-# include <sys/ioctl.h>
-NETDB_DEFINE_CONTEXT
-#endif
#ifndef OPENSSL_NO_SOCK
# define SOCKET_PROTOCOL IPPROTO_TCP
# ifdef SO_MAXCONN
@@ -114,11 +110,7 @@ struct hostent *BIO_gethostbyname(const char *name)
* Caching gethostbyname() results forever is wrong, so we have to let
* the true gethostbyname() worry about this
*/
-# if (defined(NETWARE_BSDSOCK) && !defined(__NOVELL_LIBC__))
- return gethostbyname((char *)name);
-# else
return gethostbyname(name);
-# endif
}
# endif
diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 90fe3c8..1b2b5c7 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -339,13 +339,8 @@ static int dgram_write(BIO *b, const char *in, int inl)
else {
int peerlen = BIO_ADDR_sockaddr_size(&data->peer);
-# if defined(NETWARE_CLIB) && defined(NETWARE_BSDSOCK)
- ret = sendto(b->num, (char *)in, inl, 0,
- BIO_ADDR_sockaddr(&data->peer), peerlen);
-# else
ret = sendto(b->num, in, inl, 0,
BIO_ADDR_sockaddr(&data->peer), peerlen);
-# endif
}
BIO_clear_retry_flags(b);
diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c
index c26b10e..a1c0327 100644
--- a/crypto/bio/bss_log.c
+++ b/crypto/bio/bss_log.c
@@ -39,8 +39,6 @@ void *_malloc32(__size_t);
# endif /* __INITIAL_POINTER_SIZE == 64 */
# endif /* __INITIAL_POINTER_SIZE && defined
* _ANSI_C_SOURCE */
-#elif defined(OPENSSL_SYS_NETWARE)
-# define NO_SYSLOG
#elif (!defined(MSDOS) || defined(WATT32)) && !defined(OPENSSL_SYS_VXWORKS) && !defined(NO_SYSLOG)
# include <syslog.h>
#endif
diff --git a/crypto/perlasm/x86asm.pl b/crypto/perlasm/x86asm.pl
index fef94b3..cab6284 100644
--- a/crypto/perlasm/x86asm.pl
+++ b/crypto/perlasm/x86asm.pl
@@ -263,7 +263,7 @@ sub ::asm_init
$i386=$cpu;
- $elf=$cpp=$coff=$aout=$macosx=$win32=$netware=$mwerks=$android=0;
+ $elf=$cpp=$coff=$aout=$macosx=$win32=$mwerks=$android=0;
if (($type eq "elf"))
{ $elf=1; require "x86gas.pl"; }
elsif (($type eq "elf-1"))
@@ -274,10 +274,6 @@ sub ::asm_init
{ $coff=1; require "x86gas.pl"; }
elsif (($type eq "win32n"))
{ $win32=1; require "x86nasm.pl"; }
- elsif (($type eq "nw-nasm"))
- { $netware=1; require "x86nasm.pl"; }
- #elsif (($type eq "nw-mwasm"))
- #{ $netware=1; $mwerks=1; require "x86nasm.pl"; }
elsif (($type eq "win32"))
{ $win32=1; require "x86masm.pl"; }
elsif (($type eq "macosx"))
@@ -291,7 +287,6 @@ Pick one target type from
a.out - DJGPP, elder OpenBSD, etc.
coff - GAS/COFF such as Win32 targets
win32n - Windows 95/Windows NT NASM format
- nw-nasm - NetWare NASM format
macosx - Mac OS X
EOF
exit(1);
diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index b4d4e2a..9f52b4a 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -12,7 +12,7 @@ package x86nasm;
*out=\@::out;
$::lbdecor="L\$"; # local label decoration
-$nmdecor=$::netware?"":"_"; # external name decoration
+$nmdecor="_"; # external name decoration
$drdecor=$::mwerks?".":""; # directive decoration
$initseg="";
diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index fa958c4..3758b92 100644
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -116,14 +116,11 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# endif
/*
- * Some IPv6 implementations are broken, disable them in known bad versions.
+ * Some IPv6 implementations are broken, you can disable them in known
+ * bad versions.
*/
# if !defined(OPENSSL_USE_IPV6)
-# if defined(AF_INET6) && !defined(NETWARE_CLIB)
-# define OPENSSL_USE_IPV6 1
-# else
-# define OPENSSL_USE_IPV6 0
-# endif
+# define OPENSSL_USE_IPV6 1
# endif
# define get_last_socket_error() errno
More information about the openssl-commits
mailing list