Commit 617b49db authored by Rich Salz's avatar Rich Salz
Browse files

Remove remaining NETWARE ifdef's 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5028)
parent 9422d45d

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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

































apps/ocsp.c



+0
−15






























Original line number
Diff line number
Diff line








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

















































crypto/bio/b_sock.c



+0
−8






























Original line number
Diff line number
Diff line








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

















































crypto/bio/bss_dgram.c



+0
−5






























Original line number
Diff line number
Diff line








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

































crypto/bio/bss_log.c



+0
−2






























Original line number
Diff line number
Diff line








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