projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makes SCT_LIST_set_source return the number of successes
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index d46770ece575e9194106658955a35e65229ffb29..d2ae1ecde0f27f43f06860fedf2d267afada9f12 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-1,4
+1,3
@@
-/* e_os.h */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@
-72,17
+71,31
@@
extern "C" {
#endif
/* Used to checking reference counts, most while doing perl5 stuff :-) */
#endif
/* Used to checking reference counts, most while doing perl5 stuff :-) */
-# ifdef REF_PRINT
-# undef REF_PRINT
-# define REF_PRINT(a,b) fprintf(stderr,"%08X:%4d:%s\n",(int)b,b->references,a)
+# if defined(OPENSSL_NO_STDIO)
+# if defined(REF_DEBUG)
+# error "REF_DEBUG requires stdio"
+# endif
+# if defined(REF_PRINT)
+# error "REF_PRINT requires stdio"
+# endif
# endif
# endif
-# if defined(OPENSSL_NO_STDIO) && defined(REF_CHECK)
-# error "Cannot have REF_CHECK with no-stdio"
+
+# if defined(REF_DEBUG)
+# define REF_ASSERT_ISNT(test) \
+ (void)((test) ? (OPENSSL_die("refcount error", __FILE__, __LINE__), 1) : 0)
+# else
+# define REF_ASSERT_ISNT(i)
# endif
# endif
-# if defined(OPENSSL_NO_STDIO) && defined(REF_PRINT)
-# error "Cannot have REF_PRINT with no-stdio"
+# ifdef REF_PRINT
+# define REF_PRINT_COUNT(a, b) \
+ fprintf(stderr, "%p:%4d:%s\n", b, b->references, a)
+# else
+# define REF_PRINT_COUNT(a, b)
# endif
# endif
+# define osslargused(x) (void)x
+# define OPENSSL_CONF "openssl.cnf"
+
# ifndef DEVRANDOM
/*
* set this to a comma-separated list of 'random' device files to try out. My
# ifndef DEVRANDOM
/*
* set this to a comma-separated list of 'random' device files to try out. My
@@
-325,9
+338,6
@@
extern FILE *_imp___iob;
# ifndef R_OK
# define R_OK 4
# endif
# ifndef R_OK
# define R_OK 4
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define NUL_DEV "nul"
-# define RFILE ".rnd"
# ifdef OPENSSL_SYS_WINCE
# define DEFAULT_HOME ""
# else
# ifdef OPENSSL_SYS_WINCE
# define DEFAULT_HOME ""
# else
@@
-357,10
+367,7
@@
extern FILE *_imp___iob;
# else
# include <unixlib.h>
# endif
# else
# include <unixlib.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ','
# define LIST_SEPARATOR_CHAR ','
-# define NUL_DEV "NLA0:"
/* We don't have any well-defined random devices on VMS, yet... */
# undef DEVRANDOM
/*-
/* We don't have any well-defined random devices on VMS, yet... */
# undef DEVRANDOM
/*-
@@
-410,8
+417,6
@@
extern int kbhit(void);
# define _kbhit kbhit
# define _O_TEXT O_TEXT
# define _O_BINARY O_BINARY
# define _kbhit kbhit
# define _O_TEXT O_TEXT
# define _O_BINARY O_BINARY
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ';'
# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
# define LIST_SEPARATOR_CHAR ';'
# define EXIT(n) { if (n) printf("ERROR: %d\n", (int)n); exit(n); }
@@
-430,15
+435,10
@@
extern int kbhit(void);
# include <fcntl.h>
# endif
# include <fcntl.h>
# endif
-# define OPENSSL_CONF "openssl.cnf"
-# define RFILE ".rnd"
# define LIST_SEPARATOR_CHAR ':'
# define LIST_SEPARATOR_CHAR ':'
-# define NUL_DEV "/dev/null"
# define EXIT(n) exit(n)
# endif
# define EXIT(n) exit(n)
# endif
-# define OpenSSL_getpid() getpid()
-
# endif
/*************/
# endif
/*************/
@@
-452,10
+452,6
@@
extern int kbhit(void);
/* windows world */
# ifdef OPENSSL_NO_SOCK
/* windows world */
# ifdef OPENSSL_NO_SOCK
-# define OpenSSL_Write(a,b,c) (-1)
-# define OpenSSL_Read(a,b,c) (-1)
-# define SHUTDOWN(fd) close(fd)
-# define SHUTDOWN2(fd) close(fd)
# elif !defined(__DJGPP__)
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
# elif !defined(__DJGPP__)
# if defined(_WIN32_WCE) && _WIN32_WCE<410
# define getservbyname _masked_declaration_getservbyname
@@
-481,15
+477,7
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# define socket(d,t,p) ((int)socket(d,t,p))
# define accept(s,f,l) ((int)accept(s,f,l))
# endif
# define socket(d,t,p) ((int)socket(d,t,p))
# define accept(s,f,l) ((int)accept(s,f,l))
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
-# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); }
-# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); }
# else
# else
-# define OpenSSL_Write(a,b,c) write_s(a,b,c,0)
-# define OpenSSL_Read(a,b,c) read_s(a,b,c)
-# define SHUTDOWN(fd) close_s(fd)
-# define SHUTDOWN2(fd) close_s(fd)
# endif
# elif defined(OPENSSL_SYS_NETWARE)
# endif
# elif defined(OPENSSL_SYS_NETWARE)
@@
-498,6
+486,7
@@
struct servent *PASCAL getservbyname(const char *, const char *);
* configured for BSD
*/
# if defined(NETWARE_BSDSOCK)
* configured for BSD
*/
# if defined(NETWARE_BSDSOCK)
+# include <netdb.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <sys/time.h>
# include <sys/socket.h>
# include <netinet/in.h>
# include <sys/time.h>
@@
-510,10
+499,6
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# else
# include <novsock2.h>
# endif
# else
# include <novsock2.h>
# endif
-# define OpenSSL_Write(a,b,c) send((a),(b),(c),0)
-# define OpenSSL_Read(a,b,c) recv((a),(b),(c),0)
-# define SHUTDOWN(fd) { shutdown((fd),0); closesocket(fd); }
-# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket(fd); }
# else
# else
@@
-546,6
+531,7
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# endif
# include <netinet/in.h>
# include <arpa/inet.h>
# endif
# include <netinet/in.h>
# include <arpa/inet.h>
+# include <netinet/tcp.h>
# endif
# ifdef OPENSSL_SYS_AIX
# endif
# ifdef OPENSSL_SYS_AIX
@@
-572,10
+558,6
@@
struct servent *PASCAL getservbyname(const char *, const char *);
# endif
# endif
# endif
# endif
-# define OpenSSL_Read(a,b,c) read((a),(b),(c))
-# define OpenSSL_Write(a,b,c) write((a),(b),(c))
-# define SHUTDOWN(fd) { shutdown((fd),0); closesocket((fd)); }
-# define SHUTDOWN2(fd) { shutdown((fd),2); closesocket((fd)); }
# ifndef INVALID_SOCKET
# define INVALID_SOCKET (-1)
# endif /* INVALID_SOCKET */
# ifndef INVALID_SOCKET
# define INVALID_SOCKET (-1)
# endif /* INVALID_SOCKET */