]> git.ipfire.org Git - people/amarx/ipfire-3.x.git/blob - openssl/patches/openssl-1.0.0e-chil-fixes.patch
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
[people/amarx/ipfire-3.x.git] / openssl / patches / openssl-1.0.0e-chil-fixes.patch
1 diff -up openssl-1.0.0e/engines/e_chil.c.chil openssl-1.0.0e/engines/e_chil.c
2 --- openssl-1.0.0e/engines/e_chil.c.chil 2010-06-15 19:25:12.000000000 +0200
3 +++ openssl-1.0.0e/engines/e_chil.c 2011-09-21 17:32:03.000000000 +0200
4 @@ -1261,6 +1261,11 @@ static int hwcrhk_insert_card(const char
5 UI *ui;
6 void *callback_data = NULL;
7 UI_METHOD *ui_method = NULL;
8 + /* Despite what the documentation says prompt_info can be
9 + * an empty string.
10 + */
11 + if (prompt_info && !*prompt_info)
12 + prompt_info = NULL;
13
14 if (cactx)
15 {
16 @@ -1287,7 +1292,7 @@ static int hwcrhk_insert_card(const char
17
18 if (ui)
19 {
20 - char answer;
21 + char answer = '\0';
22 char buf[BUFSIZ];
23 /* Despite what the documentation says wrong_info can be
24 * an empty string.