summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authortb <>2021-09-08 14:33:02 +0000
committertb <>2021-09-08 14:33:02 +0000
commit3cf90a6ed0ff5924618eaa5e5bb778b4d28de985 (patch)
treef88dffe43f68d172e6a78aaadce30d542ecdb977 /src/lib
parenta394d274abf3e2b60889bd0f714d8720c2b5936f (diff)
downloadopenbsd-3cf90a6ed0ff5924618eaa5e5bb778b4d28de985.tar.gz
openbsd-3cf90a6ed0ff5924618eaa5e5bb778b4d28de985.tar.bz2
openbsd-3cf90a6ed0ff5924618eaa5e5bb778b4d28de985.zip
Fix leak in cms_RecipientInfo_kekri_decrypt()
Free ec->key before reassigning it. From OpenSSL 1.1.1, 58e1e397 ok inoguchi
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/cms/cms_env.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c
index 74d957eee0..a88ea63662 100644
--- a/src/lib/libcrypto/cms/cms_env.c
+++ b/src/lib/libcrypto/cms/cms_env.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: cms_env.c,v 1.23 2019/10/04 18:03:56 tb Exp $ */ 1/* $OpenBSD: cms_env.c,v 1.24 2021/09/08 14:33:02 tb Exp $ */
2/* 2/*
3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 3 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
4 * project. 4 * project.
@@ -792,6 +792,7 @@ cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
792 goto err; 792 goto err;
793 } 793 }
794 794
795 freezero(ec->key, ec->keylen);
795 ec->key = ukey; 796 ec->key = ukey;
796 ec->keylen = ukeylen; 797 ec->keylen = ukeylen;
797 798