[or-cvs] Port to MacOS X

[Nick Mathewson]

Update of /home/or/cvsroot/src/common
In directory moria.seul.org:/tmp/cvs-serv32503/src/common

Modified Files:
	Makefile.am crypto.c utils.c 
Log Message:
Port to MacOS X

Index: Makefile.am
===================================================================
RCS file: /home/or/cvsroot/src/common/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	22 Aug 2002 07:30:03 -0000	1.5
+++ Makefile.am	3 Sep 2002 18:44:23 -0000	1.6
@@ -3,9 +3,9 @@
 
 #CFLAGS  = -Wall -Wpointer-arith -O2
 
-libor_a_SOURCES = config.c log.c utils.c crypto.c
+libor_a_SOURCES = config.c log.c utils.c crypto.c fakepoll.c
 
 noinst_HEADERS = config.h log.h \
 		     policies.h utils.h \
-                     ss.h version.h crypto.h
+                     ss.h version.h crypto.h fakepoll.h
 

Index: crypto.c
===================================================================
RCS file: /home/or/cvsroot/src/common/crypto.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- crypto.c	22 Aug 2002 07:30:03 -0000	1.3
+++ crypto.c	3 Sep 2002 18:44:23 -0000	1.4
@@ -508,7 +508,7 @@
     return 0;
 }
 
-int crypto_cipher_encrypt(crypto_cipher_env_t *env, unsigned char *from, size_t fromlen, unsigned char *to)
+int crypto_cipher_encrypt(crypto_cipher_env_t *env, unsigned char *from, unsigned int fromlen, unsigned char *to)
 {
   int tolen;
   
@@ -517,7 +517,7 @@
   return !(EVP_EncryptUpdate((EVP_CIPHER_CTX *)env->aux, to, &tolen, from, fromlen));
 }
 
-int crypto_cipher_decrypt(crypto_cipher_env_t *env, unsigned char *from, size_t fromlen, unsigned char *to)
+int crypto_cipher_decrypt(crypto_cipher_env_t *env, unsigned char *from, unsigned int fromlen, unsigned char *to)
 {
   int tolen;
   

Index: utils.c
===================================================================
RCS file: /home/or/cvsroot/src/common/utils.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- utils.c	26 Jun 2002 22:45:50 -0000	1.1.1.1
+++ utils.c	3 Sep 2002 18:44:23 -0000	1.2
@@ -8,6 +8,9 @@
 /*
  * Changes :
  * $Log$
+ * Revision 1.2  2002/09/03 18:44:23  nickm
+ * Port to MacOS X
+ *
  * Revision 1.1.1.1  2002/06/26 22:45:50  arma
  * initial commit: current code
  *
@@ -38,6 +41,7 @@
 #include <unistd.h>
 #include <sys/socket.h>
 #include <stdio.h>
+#include <string.h>
 
 #include "utils.h"
 #include "log.h"