Module Name: src
Committed By: christos
Date: Thu Feb 8 17:45:30 UTC 2018
Modified Files:
src/usr.sbin/syslogd: tls.c tls.h
Log Message:
include dh.h in the right spot.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/syslogd/tls.c
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/syslogd/tls.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/tls.c
diff -u src/usr.sbin/syslogd/tls.c:1.15 src/usr.sbin/syslogd/tls.c:1.16
--- src/usr.sbin/syslogd/tls.c:1.15 Tue Feb 6 17:04:22 2018
+++ src/usr.sbin/syslogd/tls.c Thu Feb 8 12:45:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.15 2018/02/06 22:04:22 maya Exp $ */
+/* $NetBSD: tls.c,v 1.16 2018/02/08 17:45:29 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.15 2018/02/06 22:04:22 maya Exp $");
+__RCSID("$NetBSD: tls.c,v 1.16 2018/02/08 17:45:29 christos Exp $");
#ifndef DISABLE_TLS
#include <sys/stat.h>
@@ -84,9 +84,6 @@ static const char *TLS_CONN_STATES[] = {
DH *get_dh1024(void);
/* DH parameter precomputed with "openssl dhparam -C -2 1024" */
-#ifndef HEADER_DH_H
-#include <openssl/dh.h>
-#endif
DH *
get_dh1024(void)
{
Index: src/usr.sbin/syslogd/tls.h
diff -u src/usr.sbin/syslogd/tls.h:1.2 src/usr.sbin/syslogd/tls.h:1.3
--- src/usr.sbin/syslogd/tls.h:1.2 Fri Nov 7 02:36:38 2008
+++ src/usr.sbin/syslogd/tls.h Thu Feb 8 12:45:29 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.h,v 1.2 2008/11/07 07:36:38 minskim Exp $ */
+/* $NetBSD: tls.h,v 1.3 2018/02/08 17:45:29 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -45,6 +45,7 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include <openssl/pem.h>
+#include <openssl/dh.h>
/* initial size for TLS inbuf, minimum prefix + linelength
* guaranteed to be accepted */
