diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-07-06 15:28:35 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-06 17:54:56 -0400 |
| commit | 1ef454181394b474ed590c551f659b4ce11aa093 (patch) | |
| tree | af494d00ab192423438b4f04de53d3be86d877e4 /crypto | |
| parent | 59e539e6429d9c3b5c4db07569f09ec6acc5a7e9 (diff) | |
Remove some now-unneeded VMS controls
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3875)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rand/randfile.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index c60022c45b..4005f7805e 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -48,23 +48,14 @@ #endif #define RAND_FILE_SIZE 1024 +#define RFILE ".rnd" #ifdef OPENSSL_SYS_VMS /* - * Misc hacks needed for specific cases. - * * __FILE_ptr32 is a type provided by DEC C headers (types.h specifically) * to make sure the FILE* is a 32-bit pointer no matter what. We know that - * stdio function return this type (a study of stdio.h proves it). - */ -# if __INITIAL_POINTER_SIZE == 64 -# pragma pointer_size save -# pragma pointer_size 32 -typedef char *char_ptr32; -# pragma pointer_size restore -# endif - -/* + * stdio functions return this type (a study of stdio.h proves it). + * * This declaration is a nasty hack to get around vms' extension to fopen for * passing in sharing options being disabled by /STANDARD=ANSI89 */ @@ -72,12 +63,9 @@ static __FILE_ptr32 (*const vms_fopen)(const char *, const char *, ...) = (__FILE_ptr32 (*)(const char *, const char *, ...))fopen; # define VMS_OPEN_ATTRS \ "shr=get,put,upd,del","ctx=bin,stm","rfm=stm","rat=none","mrs=0" - -# define openssl_fopen(fname,mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS) +# define openssl_fopen(fname, mode) vms_fopen((fname), (mode), VMS_OPEN_ATTRS) #endif -#define RFILE ".rnd" - /* * Note that these functions are intended for seed files only. Entropy * devices and EGD sockets are handled in rand_unix.c If |bytes| is |