root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Use OPENSSL_SYS_TANDEM instead of OPENSSL_SYSNAME_TANDEM 

This streamlines with all other config targets, and draws from the
'sys_id' config attribute.

Fixes #12858

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12933)
This commit is contained in:
Richard Levitte 2020-09-21 13:14:26 +02:00
parent 37fe90ad17
commit cdb5129e5c
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/ca.c
View File

@ -26,7 +26,7 @@
#ifndef W_OK #ifndef W_OK
# ifdef OPENSSL_SYS_VMS # ifdef OPENSSL_SYS_VMS
# include <unistd.h> # include <unistd.h>
# elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYSNAME_TANDEM) # elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_TANDEM)
# include <sys/file.h> # include <sys/file.h>
# endif # endif
#endif #endif

2
apps/lib/apps.c
View File

@ -2410,7 +2410,7 @@ int raw_write_stdout(const void *buf, int siz)
else else
return -1; return -1;
} }
#elif defined(OPENSSL_SYSNAME_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_) #elif defined(OPENSSL_SYS_TANDEM) && defined(OPENSSL_THREADS) && defined(_SPT_MODEL_)
# if defined(__TANDEM) # if defined(__TANDEM)
# if defined(OPENSSL_TANDEM_FLOSS) # if defined(OPENSSL_TANDEM_FLOSS)
# include <floss.h(floss_write)> # include <floss.h(floss_write)>

6
crypto/rand/rand_egd.c
View File

@ -54,7 +54,7 @@ struct sockaddr_un {
# include <string.h> # include <string.h>
# include <errno.h> # include <errno.h>
# if defined(OPENSSL_SYSNAME_TANDEM) # if defined(OPENSSL_SYS_TANDEM)
/* /*
* HPNS: * HPNS:
* *
@ -125,7 +125,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
return -1; return -1;
strcpy(addr.sun_path, path); strcpy(addr.sun_path, path);
i = offsetof(struct sockaddr_un, sun_path) + strlen(path); i = offsetof(struct sockaddr_un, sun_path) + strlen(path);
#if defined(OPENSSL_SYSNAME_TANDEM) #if defined(OPENSSL_SYS_TANDEM)
fd = hpns_socket(AF_UNIX, SOCK_STREAM, 0, AF_UNIX_COMPATIBILITY); fd = hpns_socket(AF_UNIX, SOCK_STREAM, 0, AF_UNIX_COMPATIBILITY);
#else #else
fd = socket(AF_UNIX, SOCK_STREAM, 0); fd = socket(AF_UNIX, SOCK_STREAM, 0);
@ -158,7 +158,7 @@ int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes)
/* No error, try again */ /* No error, try again */
break; break;
default: default:
# if defined(OPENSSL_SYSNAME_TANDEM) # if defined(OPENSSL_SYS_TANDEM)
if (hpns_connect_attempt == 0) { if (hpns_connect_attempt == 0) {
/* try the other kind of AF_UNIX socket */ /* try the other kind of AF_UNIX socket */
close(fd); close(fd);

2
include/internal/sockets.h
View File

@ -145,7 +145,7 @@ struct servent *PASCAL getservbyname(const char *, const char *);
# define closesocket(s) close(s) # define closesocket(s) close(s)
# define readsocket(s,b,n) read((s),(b),(n)) # define readsocket(s,b,n) read((s),(b),(n))
# define writesocket(s,b,n) write((s),(char *)(b),(n)) # define writesocket(s,b,n) write((s),(char *)(b),(n))
# elif defined(OPENSSL_SYSNAME_TANDEM) # elif defined(OPENSSL_SYS_TANDEM)
# if defined(OPENSSL_TANDEM_FLOSS) # if defined(OPENSSL_TANDEM_FLOSS)
# include <floss.h(floss_read, floss_write)> # include <floss.h(floss_read, floss_write)>
# define readsocket(s,b,n) floss_read((s),(b),(n)) # define readsocket(s,b,n) floss_read((s),(b),(n))