[openssl] master update

[patrick.steuer at de.ibm.com]

The branch master has been updated
       via  af7f656cd91d99d62567e2b20c61f07cb4d81d0b (commit)
      from  7b2ce4a6e817e4385ff77fea0c6e349294c7b756 (commit)


- Log -----------------------------------------------------------------
commit af7f656cd91d99d62567e2b20c61f07cb4d81d0b
Author: Patrick Steuer <patrick.steuer at de.ibm.com>
Date:   Tue Mar 3 13:29:03 2020 +0100

    crypto/ec/curve448/eddsa.c: fix EBCDIC platforms
    
    Signed-off-by: Patrick Steuer <patrick.steuer at de.ibm.com>
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/11229)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/curve448/eddsa.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/ec/curve448/eddsa.c b/crypto/ec/curve448/eddsa.c
index 95fd66571e..b5762cb584 100644
--- a/crypto/ec/curve448/eddsa.c
+++ b/crypto/ec/curve448/eddsa.c
@@ -58,7 +58,12 @@ static c448_error_t hash_init_with_dom(OPENSSL_CTX *ctx, EVP_MD_CTX *hashctx,
                                        const uint8_t *context,
                                        size_t context_len)
 {
-    const char *dom_s = "SigEd448";
+#ifdef CHARSET_EBCDIC
+    const char dom_s[] = {0x53, 0x69, 0x67, 0x45,
+                          0x64, 0x34, 0x34, 0x38, 0x00};
+#else
+    const char dom_s[] = "SigEd448";
+#endif
     uint8_t dom[2];
     EVP_MD *shake256 = NULL;