projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5247c03
)
Fix UI_get0_action_string()
author
Richard Levitte
<levitte@openssl.org>
Fri, 10 Mar 2017 23:54:52 +0000
(
00:54
+0100)
committer
Richard Levitte
<levitte@openssl.org>
Sat, 11 Mar 2017 00:27:31 +0000
(
01:27
+0100)
It shouldn't try to return an action description for UIT_PROMPT type
UI strings.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2904)
(cherry picked from commit
6e470e190853f59a394dc92fefd74666c94266f4
)
(cherry picked from commit
f31c714e923e76f54ff3b492f646662ef57f7d59
)
crypto/ui/ui_lib.c
patch
|
blob
|
history
diff --git
a/crypto/ui/ui_lib.c
b/crypto/ui/ui_lib.c
index 3cc067c3b7ee80d4c4675871632fc141da9070a7..643ae593439aeb6d6da2c2afcdf6e7693783674b 100644
(file)
--- a/
crypto/ui/ui_lib.c
+++ b/
crypto/ui/ui_lib.c
@@
-747,7
+747,6
@@
const char *UI_get0_action_string(UI_STRING *uis)
if (!uis)
return NULL;
switch (uis->type) {
- case UIT_PROMPT:
case UIT_BOOLEAN:
return uis->_.boolean_data.action_desc;
default: