diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2008-09-06 12:17:55 +0000 |
| commit | 96de7a4399a8c71cbb70d6252fa77acfd76b3f09 (patch) | |
| tree | e6f6e4aad1952944ccd27e9eb47ea48b9a78dde7 /lib/libcrypto/ui/ui_util.c | |
| parent | ec7710fe8f10fb624fbc33c0bbad2474e0c26979 (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/ui/ui_util.c')
| -rw-r--r-- | lib/libcrypto/ui/ui_util.c | 2 |
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) { |