The branch master has been updated
via 2e9d61ecd81a6a512a0700486ccc1b3784b4c969 (commit)
from 7817e74dc8540abad63d62d8585d8efe9c458fcf (commit)
- Log -----------------------------------------------------------------
commit 2e9d61ecd81a6a512a0700486ccc1b3784b4c969
Author: Laszlo Ersek <ler...@redhat.com>
Date: Thu May 9 21:29:48 2019 +0200
crypto/evp/evp_key.c: #define BUFSIZ if <stdio.h> doesn't #define it
CLA: trivial
Fixes #8904
Commit 48feaceb53fa ("Remove the possibility to disable the UI module
entirely", 2017-07-03) made the BUFSIZ references in "evp_key.c"
unconditional, by deleting the preprocessing directive "#ifndef
OPENSSL_NO_UI". This breaks the build when compiling OpenSSL for edk2
(OPENSSL_SYS_UEFI), because edk2's <stdio.h> doesn't #define BUFSIZ.
Provide a fallback definition, like we do in "crypto/ui/ui_util.c" (from
commit 984d6c605216, "Fix no-stdio build", 2015-09-29).
Signed-off-by: Laszlo Ersek <ler...@redhat.com>
Reviewed-by: Tomas Mraz <tm...@fedoraproject.org>
Reviewed-by: Matt Caswell <m...@openssl.org>
Reviewed-by: Paul Dale <paul.d...@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8922)
-----------------------------------------------------------------------
Summary of changes:
crypto/evp/evp_key.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/crypto/evp/evp_key.c b/crypto/evp/evp_key.c
index fc65b4c..3aa49aa 100644
--- a/crypto/evp/evp_key.c
+++ b/crypto/evp/evp_key.c
@@ -14,6 +14,10 @@
#include <openssl/evp.h>
#include <openssl/ui.h>
+#ifndef BUFSIZ
+# define BUFSIZ 256
+#endif
+
/* should be init to zeros. */
static char prompt_string[80];
