Commit 9a1e34e5 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

MacOS updates.

parent 2b6313d0

crypto/des/enc_writ.c

+5 −2
Original line number Diff line number Diff line
@@ -153,12 +153,15 @@ int des_enc_write(int fd, const void *_buf, int len, 
		{

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

		 * got upto. */

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

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

		if (i == -1)

			{

#ifdef EINTR

			if (errno == EINTR)

				i=0;

			else 	/* This is really a bad error - very bad

			else

#endif

			        /* This is really a bad error - very bad

				 * It will stuff-up both ends. */

				return(-1);

			}

crypto/md32_common.h

+6 −1
Original line number Diff line number Diff line
@@ -182,7 +182,12 @@ 
# if defined(_MSC_VER)

#  define ROTATE(a,n)	_lrotl(a,n)

# elif defined(__MWERKS__)

#  ifdef __POWERPC__

#   defined ROTATE(a,n)	__rlwinm(a,n,0,31)

#  else

#   define ROTATE(a,n)	__rol(a,n)

#  endif

 B

# elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM)

  /*

   * Some GNU C inline assembler templates. Note that these are

crypto/objects/obj_dat.c

+1 −5
Original line number Diff line number Diff line
@@ -214,16 +214,12 @@ int OBJ_new_nid(int num) 
int OBJ_add_object(ASN1_OBJECT *obj)

	{

	ASN1_OBJECT *o;

	ADDED_OBJ *ao[4],*aop;

	ADDED_OBJ *ao[4]={NULL,NULL,NULL,NULL},*aop;

	int i;



	if (added == NULL)

		if (!init_added()) return(0);

	if ((o=OBJ_dup(obj)) == NULL) goto err;

	ao[ADDED_DATA]=NULL;

	ao[ADDED_SNAME]=NULL;

	ao[ADDED_LNAME]=NULL;

	ao[ADDED_NID]=NULL;

	ao[ADDED_NID]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));

	if ((o->length != 0) && (obj->data != NULL))

		ao[ADDED_DATA]=(ADDED_OBJ *)Malloc(sizeof(ADDED_OBJ));

crypto/rand/md_rand.c

+3 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ static void ssleay_rand_bytes(unsigned char *buf, int num) 
	MD_CTX m;

	static int init=1;

	unsigned long l;

#ifndef MSDOS

#ifndef GETPID_IS_MEANINGLESS

	pid_t curr_pid = getpid();

#endif

#ifdef DEVRANDOM
@@ -327,7 +327,7 @@ static void ssleay_rand_bytes(unsigned char *buf, int num) 
		/* put in some default random data, we need more than

		 * just this */

		RAND_seed(&m,sizeof(m));

#ifndef MSDOS

#ifndef GETPID_IS_MEANINGLESS

		l=curr_pid;

		RAND_seed(&l,sizeof(l));

		l=getuid();
@@ -386,7 +386,7 @@ static void ssleay_rand_bytes(unsigned char *buf, int num) 
		j=(num >= MD_DIGEST_LENGTH/2)?MD_DIGEST_LENGTH/2:num;

		num-=j;

		MD_Init(&m);

#ifndef MSDOS

#ifndef GETPID_IS_MEANINGLESS

		if (curr_pid) /* just in the first iteration to save time */

			{

			MD_Update(&m,(unsigned char*)&curr_pid,sizeof curr_pid);

crypto/ripemd/rmd_one.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
 */



#include <stdio.h>

#include <memory.h>

#include <string.h>

#include <openssl/ripemd.h>



unsigned char *RIPEMD160(unsigned char *d, unsigned long n,