summaryrefslogtreecommitdiffstats
path: root/providers
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2021-08-13 14:14:51 +0100
committerMatt Caswell <matt@openssl.org>2021-08-24 14:22:07 +0100
commit36cf45ef3ba71e44a8be06ee81cb31aa02cb0010 (patch)
tree0ee29a85738c2ad5363c826336e5543accbf41ea /providers
parent4b8a8bb75229b64d1c7598d845fdc3c7e7d7eee2 (diff)
Correctly calculate the length of SM2 plaintext given the ciphertext
Previously the length of the SM2 plaintext could be incorrectly calculated. The plaintext length was calculated by taking the ciphertext length and taking off an "overhead" value. The overhead value was assumed to have a "fixed" element of 10 bytes. This is incorrect since in some circumstances it can be more than 10 bytes. Additionally the overhead included the length of two integers C1x and C1y, which were assumed to be the same length as the field size (32 bytes for the SM2 curve). However in some cases these integers can have an additional padding byte when the msb is set, to disambiguate them from negative integers. Additionally the integers can also be less than 32 bytes in length in some cases. If the calculated overhead is incorrect and larger than the actual value this can result in the calculated plaintext length being too small. Applications are likely to allocate buffer sizes based on this and therefore a buffer overrun can occur. CVE-2021-3711 Issue reported by John Ouyang. Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Diffstat (limited to 'providers')
-rw-r--r--providers/implementations/asymciphers/sm2_enc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/providers/implementations/asymciphers/sm2_enc.c b/providers/implementations/asymciphers/sm2_enc.c
index c9dba32ffb..9577d16e83 100644
--- a/providers/implementations/asymciphers/sm2_enc.c
+++ b/providers/implementations/asymciphers/sm2_enc.c
@@ -110,7 +110,7 @@ static int sm2_asym_decrypt(void *vpsm2ctx, unsigned char *out, size_t *outlen,
return 0;
if (out == NULL) {
- if (!ossl_sm2_plaintext_size(psm2ctx->key, md, inlen, outlen))
+ if (!ossl_sm2_plaintext_size(in, inlen, outlen))
return 0;
return 1;
}