[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  675fa85413a130607ec780ce9edaa6dd7ee1500f (commit)
      from  85aebfcc6eedceaed34012a8b2c27c43ef402f95 (commit)


- Log -----------------------------------------------------------------
commit 675fa85413a130607ec780ce9edaa6dd7ee1500f
Author: neighbads <16126598+neighbads at users.noreply.github.com>
Date:   Wed Jul 11 15:40:03 2018 +0800

    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 at oracle.com>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6694)

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

Summary of changes:
 crypto/sm2/sm2_crypt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/sm2/sm2_crypt.c b/crypto/sm2/sm2_crypt.c
index aedf905..d6f9c81 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;
 }