Update openssl to 1.0.2d

Also update Cryptlib to edk2 r17731

Signed-off-by: Gary Ching-Pang Lin <glin@suse.com>

1 files changed, 31 insertions, 16 deletions

diff --git a/Cryptlib/OpenSSL/crypto/evp/p_sign.c b/Cryptlib/OpenSSL/crypto/evp/p_sign.c
index 6f319127..1b9ba060 100644
--- a/Cryptlib/OpenSSL/crypto/evp/p_sign.c
+++ b/Cryptlib/OpenSSL/crypto/evp/p_sign.c
@@ -79,10 +79,37 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
 {
     unsigned char m[EVP_MAX_MD_SIZE];
     unsigned int m_len;
-    int i, ok = 0, v;
+    int i = 0, ok = 0, v;
     EVP_MD_CTX tmp_ctx;
+    EVP_PKEY_CTX *pkctx = NULL;
 
     *siglen = 0;
+    EVP_MD_CTX_init(&tmp_ctx);
+    if (!EVP_MD_CTX_copy_ex(&tmp_ctx, ctx))
+        goto err;
+    if (!EVP_DigestFinal_ex(&tmp_ctx, &(m[0]), &m_len))
+        goto err;
+    EVP_MD_CTX_cleanup(&tmp_ctx);
+
+    if (ctx->digest->flags & EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) {
+        size_t sltmp = (size_t)EVP_PKEY_size(pkey);
+        i = 0;
+        pkctx = EVP_PKEY_CTX_new(pkey, NULL);
+        if (!pkctx)
+            goto err;
+        if (EVP_PKEY_sign_init(pkctx) <= 0)
+            goto err;
+        if (EVP_PKEY_CTX_set_signature_md(pkctx, ctx->digest) <= 0)
+            goto err;
+        if (EVP_PKEY_sign(pkctx, sigret, &sltmp, m, m_len) <= 0)
+            goto err;
+        *siglen = sltmp;
+        i = 1;
+ err:
+        EVP_PKEY_CTX_free(pkctx);
+        return i;
+    }
+
     for (i = 0; i < 4; i++) {
         v = ctx->digest->required_pkey_type[i];
         if (v == 0)
@@ -96,23 +123,11 @@ int EVP_SignFinal(EVP_MD_CTX *ctx, unsigned char *sigret,
         EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_WRONG_PUBLIC_KEY_TYPE);
         return (0);
     }
+
     if (ctx->digest->sign == NULL) {
         EVPerr(EVP_F_EVP_SIGNFINAL, EVP_R_NO_SIGN_FUNCTION_CONFIGURED);
         return (0);
     }
-    EVP_MD_CTX_init(&tmp_ctx);
-    EVP_MD_CTX_copy_ex(&tmp_ctx, ctx);
-    if (ctx->digest->flags & EVP_MD_FLAG_SVCTX) {
-        EVP_MD_SVCTX sctmp;
-        sctmp.mctx = &tmp_ctx;
-        sctmp.key = pkey->pkey.ptr;
-        i = ctx->digest->sign(ctx->digest->type,
-                              NULL, -1, sigret, siglen, &sctmp);
-    } else {
-        EVP_DigestFinal_ex(&tmp_ctx, &(m[0]), &m_len);
-        i = ctx->digest->sign(ctx->digest->type, m, m_len, sigret, siglen,
-                              pkey->pkey.ptr);
-    }
-    EVP_MD_CTX_cleanup(&tmp_ctx);
-    return i;
+    return (ctx->digest->sign(ctx->digest->type, m, m_len, sigret, siglen,
+                              pkey->pkey.ptr));
 }