diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2009-04-06 06:33:21 +0000 |
| commit | 4af955ab47cb58f0856af2543cfd369ca621acf4 (patch) | |
| tree | 2a9f13536ecfa4cb24b1f0b68532d101a9c44ef6 /lib/libcrypto/ui | |
| parent | cea69e0d929b3248b3139c9ca312f9c85933095f (diff) | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/ui')
| -rw-r--r-- | lib/libcrypto/ui/ui_lib.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/libcrypto/ui/ui_lib.c b/lib/libcrypto/ui/ui_lib.c index 7ab249c3be3..ac0100808f5 100644 --- a/lib/libcrypto/ui/ui_lib.c +++ b/lib/libcrypto/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; } |