From: neighbads <16126598+neighbads@users.noreply.github.com>
Date: Wed, 11 Jul 2018 07:40:03 +0000 (+0800)
Subject: Update sm2_crypt.c
X-Git-Tag: OpenSSL_1_1_1-pre9~101
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=675fa85413a130607ec780ce9edaa6dd7ee1500f;p=oweals%2Fopenssl.git

Update sm2_crypt.c

asn1_encode : x, y  =>    0 | x，0 | y
(because of DER encoding rules when x and y have high bit set)

CLA: Trivial

Reviewed-by: Paul Dale <paul.dale@oracle.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6694)
---

diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index aedf9054c1..d6f9c81d8c 100644
--- a/crypto/sm2/sm2_crypt.c
+++ b/crypto/sm2/sm2_crypt.c
@@ -95,7 +95,7 @@ int sm2_ciphertext_size(const EC_KEY *key, const EVP_MD *digest, size_t msg_len,
     if (field_size == 0 || md_size < 0)
         return 0;
 
-    *ct_size = 10 + 2 * field_size + (size_t)md_size + msg_len;
+    *ct_size = 12 + 2 * field_size + (size_t)md_size + msg_len;
     return 1;
 }