j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Use the HAVE_OPENSSL_xxx_H defined from m4/openssl.m4 during

Browse source 
configure.
This commit is contained in:
Ivo Timmermans 2000-11-15 01:06:13 +00:00
parent 6fb4a5b6be
commit bb2495e569
5 changed files with 80 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/connlist.h
View file

@ -17,14 +17,25 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: connlist.h,v 1.1.2.12 2000/11/04 20:44:26 guus Exp $
$Id: connlist.h,v 1.1.2.13 2000/11/15 01:06:10 zarq Exp $
*/
#ifndef __TINC_CONNLIST_H__
#define __TINC_CONNLIST_H__
#include <openssl/evp.h>
#include <openssl/rsa.h>
#include "config.h"
#ifdef HAVE_OPENSSL_EVP_H
# include <openssl/evp.h>
#else
# include <evp.h>
#endif
#ifdef HAVE_OPENSSL_RSA_H
# include <openssl/rsa.h>
#else
# include <rsa.h>
#endif
#include "net.h"
#include "conf.h"

9
src/meta.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: meta.c,v 1.1.2.9 2000/11/04 20:44:26 guus Exp $
$Id: meta.c,v 1.1.2.10 2000/11/15 01:06:10 zarq Exp $
*/
#include "config.h"
@ -27,10 +27,15 @@
#include <syslog.h>
#include <sys/signal.h>
#include <sys/socket.h>
#include <openssl/evp.h>
#include <unistd.h>
#include <string.h>
#ifdef HAVE_OPENSSL_EVP_H
# include <openssl/evp.h>
#else
# include <evp.h>
#endif
#include "net.h"
#include "system.h"
#include "protocol.h"

23
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: net.c,v 1.35.4.70 2000/11/08 17:56:34 guus Exp $
$Id: net.c,v 1.35.4.71 2000/11/15 01:06:10 zarq Exp $
*/
#include "config.h"
@ -39,9 +39,24 @@
#include <syslog.h>
#include <unistd.h>
#include <sys/ioctl.h>
#include <openssl/rand.h>
#include <openssl/evp.h>
#include <openssl/err.h>
#ifdef HAVE_OPENSSL_RAND_H
# include <openssl/rand.h>
#else
# include <rand.h>
#endif
#ifdef HAVE_OPENSSL_EVP_H
# include <openssl/evp.h>
#else
# include <evp.h>
#endif
#ifdef HAVE_OPENSSL_ERR_H
# include <openssl/err.h>
#else
# include <err.h>
#endif
#ifdef HAVE_TUNTAP
#include LINUX_IF_TUN_H

23
src/protocol.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: protocol.c,v 1.28.4.59 2000/11/07 22:02:14 guus Exp $
$Id: protocol.c,v 1.28.4.60 2000/11/15 01:06:11 zarq Exp $
*/
#include "config.h"
@ -36,9 +36,24 @@
#include <netinet/in.h>
#include <openssl/sha.h>
#include <openssl/rand.h>
#include <openssl/evp.h>
#ifdef HAVE_OPENSSL_SHA_H
# include <openssl/sha.h>
#else
# include <sha.h>
#endif
#ifdef HAVE_OPENSSL_RAND_H
# include <openssl/rand.h>
#else
# include <rand.h>
#endif
#ifdef HAVE_OPENSSL_EVP_H
# include <openssl/evp.h>
#else
# include <evp.h>
#endif
#include "conf.h"
#include "net.h"

25
src/tincd.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
$Id: tincd.c,v 1.10.4.27 2000/11/08 20:52:37 guus Exp $
$Id: tincd.c,v 1.10.4.28 2000/11/15 01:06:13 zarq Exp $
*/
#include "config.h"
@ -31,9 +31,6 @@
#include <syslog.h>
#include <unistd.h>
#include <signal.h>
#include <openssl/rand.h>
#include <openssl/rsa.h>
#include <openssl/err.h>
#include <string.h>
#include <termios.h>
@ -41,6 +38,26 @@
# include <sys/ioctl.h>
#endif
#ifdef HAVE_OPENSSL_RAND_H
# include <openssl/rand.h>
#else
# include <rand.h>
#endif
#ifdef HAVE_OPENSSL_RSA_H
# include <openssl/rsa.h>
#else
# include <rsa.h>
#endif
#ifdef HAVE_OPENSSL_ERR_H
# include <openssl/err.h>
#else
# include <err.h>
#endif
#include <pidfile.h>
#include <utils.h>
#include <xalloc.h>