summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src/crypto/ui/ui_openssl.c
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-07-11 08:44:47 +0000
committerjsing <jsing@openbsd.org>2014-07-11 08:44:47 +0000
commitb6ab114e77db2581d5bda2ca4b0aa0d68b2e0f90 (patch)
tree732b2a0b08456ceb9bb211abdcc82bbe057fff19 /lib/libssl/src/crypto/ui/ui_openssl.c
parentAdd a small note about LibReSSL at the start of this. (diff)
downloadwireguard-openbsd-b6ab114e77db2581d5bda2ca4b0aa0d68b2e0f90.tar.xz
wireguard-openbsd-b6ab114e77db2581d5bda2ca4b0aa0d68b2e0f90.zip
Only import cryptlib.h in the four source files that actually need it.
Remove the openssl public includes from cryptlib.h and add a small number of includes into the source files that actually need them. While here, also sort/group/tidy the includes. ok beck@ miod@
Diffstat (limited to 'lib/libssl/src/crypto/ui/ui_openssl.c')
-rw-r--r--lib/libssl/src/crypto/ui/ui_openssl.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libssl/src/crypto/ui/ui_openssl.c b/lib/libssl/src/crypto/ui/ui_openssl.c
index 32298625ca2..f7f01bb4f13 100644
--- a/lib/libssl/src/crypto/ui/ui_openssl.c
+++ b/lib/libssl/src/crypto/ui/ui_openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_openssl.c,v 1.21 2014/06/12 15:49:31 deraadt Exp $ */
+/* $OpenBSD: ui_openssl.c,v 1.22 2014/07/11 08:44:49 jsing Exp $ */
/* Written by Richard Levitte (richard@levitte.org) and others
* for the OpenSSL project 2001.
*/
@@ -114,26 +114,23 @@
* [including the GNU Public Licence.]
*/
+#include <sys/ioctl.h>
+
#include <openssl/opensslconf.h>
+#include <errno.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
-#include <errno.h>
-
-#include <unistd.h>
#include <termios.h>
+#include <unistd.h>
#include "ui_locl.h"
-#include "cryptlib.h"
-
-#include <sys/ioctl.h>
#ifndef NX509_SIG
#define NX509_SIG 32
#endif
-
/* Define globals. They are protected by a lock */
static struct sigaction savsig[NX509_SIG];