Commit 8ff889c2 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS: setbuf() only takes 32-bit pointers 



Giving setbuf() a 64-bit pointer isn't faulty, as the argument is
passed by a 64-bit register anyway, so you only get a warning
(MAYLOSEDATA2) pointing out that only the least significant 32 bits
will be used.

However, we know that a FILE* returned by fopen() and such really is a
32-bit pointer (a study of the system header files make that clear),
so we temporarly turn off that warning when calling setbuf().

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent d7295cd6

crypto/rand/randfile.c

+40 −4
Original line number Diff line number Diff line
@@ -64,12 +64,42 @@ 
#define RAND_DATA 1024



#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).

 * Additionally, we create a similar char pointer type for the sake of

 * vms_setbuf below.

 */

# if __INITIAL_POINTER_SIZE == 64

#  pragma pointer_size save

#  pragma pointer_size 32

# endif

typedef char *char_ptr32;

# if __INITIAL_POINTER_SIZE == 64

#  pragma pointer_size restore

# endif



/*

 * On VMS, setbuf() will only take 32-bit pointers, and a compilation

 * with /POINTER_SIZE=64 will give off a MAYLOSEDATA2 warning here.

 * Since we know that the FILE* really is a 32-bit pointer expanded to

 * 64 bits, we also know it's safe to convert it back to a 32-bit pointer.

 * As for the buffer parameter, we only use NULL here, so that passes as

 * well...

 */

static void vms_setbuf(FILE *fp, char *buf)

{

    setbuf((__FILE_ptr32)fp, (char_ptr32)buf);

}

/*

 * This declaration is a nasty hack to get around vms' extension to fopen for

 * passing in sharing options being disabled by our /STANDARD=ANSI89

 * passing in sharing options being disabled by /STANDARD=ANSI89

 */

static FILE *(*const vms_fopen)(const char *, const char *, ...) =

    (FILE *(*)(const char *, const char *, ...))fopen;

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"

#endif
@@ -127,7 +157,13 @@ int RAND_load_file(const char *file, long bytes) 
         * because we will waste system entropy.

         */

        bytes = (bytes == -1) ? 2048 : bytes; /* ok, is 2048 enough? */

        setbuf(in, NULL); /* don't do buffered reads */



        /* don't do buffered reads */

# ifdef OPENSSL_SYS_VMS

        vms_setbuf(in, NULL);

# else

        setbuf(in, NULL);

# endif

    }

#endif

    for (;;) {