Commit 49e3c9d8 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Mask libcrypto references to stat with OPENSSL_NO_POSIX_IO.

parent 1715e488

crypto/rand/randfile.c

+9 −5
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ 
#ifndef NO_SYS_TYPES_H

# include <sys/types.h>

#endif

#ifdef MAC_OS_pre_X

# include <stat.h>

#else

#ifndef OPENSSL_NO_POSIX_IO

# include <sys/stat.h>

#endif
@@ -96,21 +94,25 @@ int RAND_load_file(const char *file, long bytes) 
	 * if bytes == -1, read complete file. */



	MS_STATIC unsigned char buf[BUFSIZE];

#ifndef OPENSSL_NO_POSIX_IO

	struct stat sb;

#endif

	int i,ret=0,n;

	FILE *in;



	if (file == NULL) return(0);



#ifndef OPENSSL_NO_POSIX_IO

	i=stat(file,&sb);

	/* If the state fails, put some crap in anyway */

	RAND_add(&sb,sizeof(sb),0.0);

	if (i < 0) return(0);

#endif

	if (bytes == 0) return(ret);



	in=fopen(file,"rb");

	if (in == NULL) goto err;

#if defined(S_IFBLK) && defined(S_IFCHR)

#if defined(S_IFBLK) && defined(S_IFCHR) && !defined(OPNESSL_NO_POSIX_IO)

	if (sb.st_mode & (S_IFBLK | S_IFCHR)) {

	  /* this file is a device. we don't want read an infinite number

	   * of bytes from a random device, nor do we want to use buffered
@@ -149,6 +151,7 @@ int RAND_write_file(const char *file) 
	int i,ret=0,rand_err=0;

	FILE *out = NULL;

	int n;

#ifndef OPENSSL_NO_POSIX_IO

	struct stat sb;

	

	i=stat(file,&sb);
@@ -164,8 +167,9 @@ int RAND_write_file(const char *file) 
	  }

#endif

	}

#endif



#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32)

#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) && !defined(OPENSSL_NO_POSIX_IO)

	{

	/* For some reason Win32 can't write to files created this way */

crypto/x509/by_dir.c

+6 −4
Original line number Diff line number Diff line
@@ -65,9 +65,7 @@ 
#ifndef NO_SYS_TYPES_H

# include <sys/types.h>

#endif

#ifdef MAC_OS_pre_X

# include <stat.h>

#else

#ifndef OPENSSL_NO_POSIX_IO

# include <sys/stat.h>

#endif
@@ -254,7 +252,6 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, 
	int i,j,k;

	unsigned long h;

	BUF_MEM *b=NULL;

	struct stat st;

	X509_OBJECT stmp,*tmp;

	const char *postfix="";
@@ -334,8 +331,13 @@ static int get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, 
					postfix,k);

				}

			k++;

#ifndef OPENSSL_NO_POSIX_IO

			{

			struct stat st;

			if (stat(b->data,&st) < 0)

				break;

			}

#endif

			/* found one. */

			if (type == X509_LU_X509)

				{