summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2010-06-11 10:15:32 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2010-06-11 10:15:32 +0000
commit8fa2f91c818ce45400b30d5e673b6f295dc53682 (patch)
tree0d015fedb00faf366b38b91de65f1fe0a0755a11
parent39b1b5eab1b7933012dbedee3339064974f6983d (diff)
tweak the code slightly so we can remove -lssl
ok reyk@
-rw-r--r--sbin/iked/Makefile4
-rw-r--r--sbin/iked/ca.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/sbin/iked/Makefile b/sbin/iked/Makefile
index 9ff2dcf1a2f..3a07381dfb9 100644
--- a/sbin/iked/Makefile
+++ b/sbin/iked/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2010/06/10 08:29:47 reyk Exp $
+# $OpenBSD: Makefile,v 1.4 2010/06/11 10:15:31 jsg Exp $
# $vantronix: Makefile,v 1.22 2010/06/02 12:22:58 reyk Exp $
PROG= iked
@@ -10,7 +10,7 @@ SRCS+= parse.y
MAN= iked.conf.5 iked.8
#NOMAN= yes
-LDADD= -lutil -levent -lssl -lcrypto
+LDADD= -lutil -levent -lcrypto
DPADD= ${LIBUTIL} ${LIBEVENT} ${LIBSSL} ${LIBCRYPTO}
CFLAGS+= -Wall -I${.CURDIR}
CFLAGS+= -Wstrict-prototypes -Wmissing-prototypes
diff --git a/sbin/iked/ca.c b/sbin/iked/ca.c
index 55736105c84..e3b27651f35 100644
--- a/sbin/iked/ca.c
+++ b/sbin/iked/ca.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ca.c,v 1.3 2010/06/10 14:09:19 jsg Exp $ */
+/* $OpenBSD: ca.c,v 1.4 2010/06/11 10:15:31 jsg Exp $ */
/* $vantronix: ca.c,v 1.29 2010/06/02 12:22:58 reyk Exp $ */
/*
@@ -818,7 +818,7 @@ void
ca_sslinit(void)
{
OpenSSL_add_all_algorithms();
- SSL_load_error_strings();
+ ERR_load_crypto_strings();
/* Init hardware crypto engines. */
ENGINE_load_builtin_engines();