Commit fdb31225 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Port to MacOS X 


svn:r88
parent 8878d8cc

configure.in

+3 −1
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ if (test ! -z "$ac_cv_openssldir" && test "x$ac_cv_openssldir" != "x(system)") ; 
fi

LIBS="$saved_LIBS -lcrypto"



AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h sys/poll.h sys/types.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h, , AC_MSG_WARN(some headers were not found, compilation may fail))

dnl The warning message here is no longer strictly accurate.



AC_CHECK_HEADERS(unistd.h string.h signal.h netdb.h ctype.h poll.h sys/poll.h sys/types.h sys/fcntl.h sys/ioctl.h sys/socket.h sys/time.h netinet/in.h arpa/inet.h errno.h assert.h, , AC_MSG_WARN(some headers were not found, compilation may fail))



AC_OUTPUT(Makefile src/Makefile src/common/Makefile src/smtpap/Makefile src/orkeygen/Makefile src/httpap/Makefile src/or/Makefile)

src/common/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ noinst_LIBRARIES = libor.a 


#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

src/common/crypto.c

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ int crypto_cipher_decrypt_init_cipher(crypto_cipher_env_t *env) 
    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 @@ int crypto_cipher_encrypt(crypto_cipher_env_t *env, unsigned char *from, size_t 
  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;

src/common/utils.c

+6 −2
Original line number Diff line number Diff line
@@ -8,8 +8,11 @@ 
/*

 * Changes :

 * $Log$

 * Revision 1.1  2002/06/26 22:45:50  arma

 * Initial revision

 * 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

 *

 * Revision 1.6  2002/03/03 00:06:45  mp292

 * Modifications to support re-transmission.
@@ -38,6 +41,7 @@ 
#include <unistd.h>

#include <sys/socket.h>

#include <stdio.h>

#include <string.h>



#include "utils.h"

#include "log.h"

src/httpap/httpap.c

+4 −1
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ 
/*

 * Changes :

 * $Log$

 * Revision 1.7  2002/09/03 18:44:23  nickm

 * Port to MacOS X

 *

 * Revision 1.6  2002/08/24 07:56:22  arma

 * proxies send port in host order as ascii string

 *
@@ -45,6 +48,7 @@ 
#include <sys/types.h>

#include <sys/socket.h>

#include <sys/time.h>

#include <sys/wait.h>

#include <netinet/in.h>

#include <netdb.h>

#include <arpa/inet.h>
@@ -53,7 +57,6 @@ 
#include <stdio.h>

#include <unistd.h>

#include <signal.h>

#include <wait.h>

#include <stdarg.h>

#include <ctype.h>

#include <stdint.h>