mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-27 04:33:29 +00:00
opensc: Fix CVE-2023-40660
Add patch file to fix CVE
Upstream-Status: Backport [940e8bc764]
Signed-off-by: virendra thakur <virendrak@kpit.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
parent
de760c31d1
commit
2c3c2d25b6
55
meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch
Normal file
55
meta-oe/recipes-support/opensc/opensc/CVE-2023-40660.patch
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
Origin: https://github.com/OpenSC/OpenSC/commit/868f76fb31255fd3fdacfc3e476452efeb61c3e7
|
||||||
|
From: Frank Morgner <frankmorgner@gmail.com>
|
||||||
|
Date: Wed, 21 Jun 2023 12:27:23 +0200
|
||||||
|
Subject: Fixed PIN authentication bypass
|
||||||
|
|
||||||
|
If two processes are accessing a token, then one process may leave the
|
||||||
|
card usable with an authenticated PIN so that a key may sign/decrypt any
|
||||||
|
data. This is especially the case if the token does not support a way of
|
||||||
|
resetting the authentication status (logout).
|
||||||
|
|
||||||
|
We have some tracking of the authentication status in software via
|
||||||
|
PKCS#11, Minidriver (os-wise) and CryptoTokenKit, which is why a
|
||||||
|
PIN-prompt will appear even though the card may technically be unlocked
|
||||||
|
as described in the above example. However, before this change, an empty
|
||||||
|
PIN was not verified (likely yielding an error during PIN-verification),
|
||||||
|
but it was just checked whether the PIN is authenticated. This defeats
|
||||||
|
the purpose of the PIN verification, because an empty PIN is not the
|
||||||
|
correct one. Especially during OS Logon, we don't want that kind of
|
||||||
|
shortcut, but we want the user to verify the correct PIN (even though
|
||||||
|
the token was left unattended and authentication at the computer).
|
||||||
|
|
||||||
|
This essentially reverts commit e6f7373ef066cfab6e3162e8b5f692683db23864.
|
||||||
|
|
||||||
|
CVE: CVE-2023-40660
|
||||||
|
Upstream-Status: Backport [https://salsa.debian.org/opensc-team/opensc/-/commit/940e8bc764047c873f88bb1396933a5368d03533]
|
||||||
|
Signed-off-by: Virendra Thakur <virendrak@kpit.com>
|
||||||
|
---
|
||||||
|
src/libopensc/pkcs15-pin.c | 13 -------------
|
||||||
|
1 file changed, 13 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/libopensc/pkcs15-pin.c b/src/libopensc/pkcs15-pin.c
|
||||||
|
index 80a185fecd..393234efe4 100644
|
||||||
|
--- a/src/libopensc/pkcs15-pin.c
|
||||||
|
+++ b/src/libopensc/pkcs15-pin.c
|
||||||
|
@@ -307,19 +307,6 @@
|
||||||
|
LOG_FUNC_RETURN(ctx, SC_ERROR_INVALID_PIN_REFERENCE);
|
||||||
|
auth_info = (struct sc_pkcs15_auth_info *)pin_obj->data;
|
||||||
|
|
||||||
|
- /*
|
||||||
|
- * if pin cache is disabled, we can get here with no PIN data.
|
||||||
|
- * in this case, to avoid error or unnecessary pin prompting on pinpad,
|
||||||
|
- * check if the PIN has been already verified and the access condition
|
||||||
|
- * is still open on card.
|
||||||
|
- */
|
||||||
|
- if (pinlen == 0) {
|
||||||
|
- r = sc_pkcs15_get_pin_info(p15card, pin_obj);
|
||||||
|
-
|
||||||
|
- if (r == SC_SUCCESS && auth_info->logged_in == SC_PIN_STATE_LOGGED_IN)
|
||||||
|
- LOG_FUNC_RETURN(ctx, r);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
r = _validate_pin(p15card, auth_info, pinlen);
|
||||||
|
|
||||||
|
if (r)
|
||||||
|
|
||||||
@ -15,6 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7"
|
|||||||
SRCREV = "c902e1992195e00ada12d71beb1029287cd72037"
|
SRCREV = "c902e1992195e00ada12d71beb1029287cd72037"
|
||||||
SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \
|
SRC_URI = "git://github.com/OpenSC/OpenSC;branch=master;protocol=https \
|
||||||
file://CVE-2023-2977.patch \
|
file://CVE-2023-2977.patch \
|
||||||
|
file://CVE-2023-40660.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
# CVE-2021-34193 is a duplicate CVE covering the 5 individual
|
# CVE-2021-34193 is a duplicate CVE covering the 5 individual
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user