diff options
| author | simon <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2009-06-07 19:56:18 +0000 |
| commit | fc5b6d55de4ea73602809deec0b965745f83a804 (patch) | |
| tree | 873f9f63931a5d069bbcb053ea49eec4a92802dc /crypto/ui | |
| parent | 212fba63d3a2fed2e6ca619035a42526db27a3b8 (diff) | |
| download | FreeBSD-src-fc5b6d55de4ea73602809deec0b965745f83a804.zip FreeBSD-src-fc5b6d55de4ea73602809deec0b965745f83a804.tar.gz | |
Import OpenSSL 0.9.8k.
Diffstat (limited to 'crypto/ui')
| -rw-r--r-- | crypto/ui/Makefile | 2 | ||||
| -rw-r--r-- | crypto/ui/ui_lib.c | 1 | ||||
| -rw-r--r-- | crypto/ui/ui_openssl.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/crypto/ui/Makefile b/crypto/ui/Makefile index a685659..4755e20 100644 --- a/crypto/ui/Makefile +++ b/crypto/ui/Makefile @@ -37,7 +37,7 @@ top: all: lib lib: $(LIBOBJ) - $(AR) $(LIB) $(LIBOBJ) + $(ARX) $(LIB) $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib diff --git a/crypto/ui/ui_lib.c b/crypto/ui/ui_lib.c index 7ab249c..ac01008 100644 --- a/crypto/ui/ui_lib.c +++ b/crypto/ui/ui_lib.c @@ -90,6 +90,7 @@ UI *UI_new_method(const UI_METHOD *method) ret->strings=NULL; ret->user_data=NULL; + ret->flags=0; CRYPTO_new_ex_data(CRYPTO_EX_INDEX_UI, ret, &ret->ex_data); return ret; } diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c index 1f23a45..ef930bf 100644 --- a/crypto/ui/ui_openssl.c +++ b/crypto/ui/ui_openssl.c @@ -677,6 +677,8 @@ static int noecho_fgets(char *buf, int size, FILE *tty) size--; #ifdef WIN16TTY i=_inchar(); +#elif defined(_WIN32) + i=_getch(); #else i=getch(); #endif |
