Commit f17c4561 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Backport http://cvs.openssl.org/chngview?cn=17710 from HEAD. 

PR: 1230
parent 1ff7b649

crypto/bio/bss_file.c

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static long MS_CALLBACK file_ctrl(BIO *b, int cmd, long num, void *ptr) 
#endif

		{

#if defined(OPENSSL_SYS_WINDOWS)

		int fd = fileno((FILE*)ptr);

		int fd = _fileno((FILE*)ptr);

		if (num & BIO_FP_TEXT)

			_setmode(fd,_O_TEXT);

		else

crypto/des/enc_read.c

+4 −0
Original line number Diff line number Diff line
@@ -147,7 +147,11 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, 
	/* first - get the length */

	while (net_num < HDRSIZE) 

		{

#ifndef _WIN32

		i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);

#else

		i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);

#endif

#ifdef EINTR

		if ((i == -1) && (errno == EINTR)) continue;

#endif

crypto/des/enc_writ.c

+4 −0
Original line number Diff line number Diff line
@@ -153,7 +153,11 @@ int DES_enc_write(int fd, const void *_buf, int len, 
		{

		/* eay 26/08/92 I was not doing writing from where we

		 * got up to. */

#ifndef _WIN32

		i=write(fd,(void *)&(outbuf[j]),outnum-j);

#else

		i=_write(fd,(void *)&(outbuf[j]),outnum-j);

#endif

		if (i == -1)

			{

#ifdef EINTR

crypto/ocsp/ocsp_ht.c

+2 −1
Original line number Diff line number Diff line
@@ -56,11 +56,12 @@ 
 *

 */



#include <openssl/asn1.h>

#include <stdio.h>

#include <stdlib.h>

#include <ctype.h>

#include <string.h>

#include "e_os.h"

#include <openssl/asn1.h>

#include <openssl/ocsp.h>

#include <openssl/err.h>

#include <openssl/buffer.h>

crypto/rand/randfile.c

+7 −0
Original line number Diff line number Diff line
@@ -81,6 +81,13 @@ 
# include <sys/stat.h>

#endif



#ifdef _WIN32

#define stat	_stat

#define chmod	_chmod

#define open	_open

#define fdopen	_fdopen

#endif



#undef BUFSIZE

#define BUFSIZE	1024

#define RAND_DATA 1024