summaryrefslogtreecommitdiffstats
path: root/lib/libcrypto/ui/ui_util.c
diff options
context:
space:
mode:
authordjm <djm@openbsd.org>2008-09-06 12:17:47 +0000
committerdjm <djm@openbsd.org>2008-09-06 12:17:47 +0000
commit4fcf65c5c59fcf6124cf9f1fd81aa546850f974c (patch)
tree3c0b4c46d91bcb87c8eef7a1e84711159b17f71b /lib/libcrypto/ui/ui_util.c
parentimport of OpenSSL 0.9.8h (diff)
downloadwireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.tar.xz
wireguard-openbsd-4fcf65c5c59fcf6124cf9f1fd81aa546850f974c.zip
resolve conflicts
Diffstat (limited to 'lib/libcrypto/ui/ui_util.c')
-rw-r--r--lib/libcrypto/ui/ui_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libcrypto/ui/ui_util.c b/lib/libcrypto/ui/ui_util.c
index 46bc8c1a9a0..5d9760bb7b3 100644
--- a/lib/libcrypto/ui/ui_util.c
+++ b/lib/libcrypto/ui/ui_util.c
@@ -54,7 +54,7 @@
*/
#include <string.h>
-#include <openssl/ui.h>
+#include "ui_locl.h"
int UI_UTIL_read_pw_string(char *buf,int length,const char *prompt,int verify)
{