79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
|
commit b28a3cef416fcfb92fbb9ea7fd3c71df52c6c9fc
|
||
|
|
Author: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
Date: Mon Aug 12 19:02:14 2024 +0200
|
||
|
|
|
||
|
|
openpgp: Do not accept non-matching key responses
|
||
|
|
|
||
|
|
When generating RSA key pair using PKCS#15 init, the driver could accept
|
||
|
|
responses relevant to ECC keys, which made further processing in the
|
||
|
|
pkcs15-init failing/accessing invalid parts of structures.
|
||
|
|
|
||
|
|
Thanks oss-fuzz!
|
||
|
|
|
||
|
|
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=71010
|
||
|
|
|
||
|
|
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||
|
|
|
||
|
|
Index: opensc-0.22.0/src/libopensc/card-openpgp.c
|
||
|
|
===================================================================
|
||
|
|
--- opensc-0.22.0.orig/src/libopensc/card-openpgp.c
|
||
|
|
+++ opensc-0.22.0/src/libopensc/card-openpgp.c
|
||
|
|
@@ -2657,14 +2657,21 @@ pgp_calculate_and_store_fingerprint(sc_c
|
||
|
|
/* update the blob containing fingerprints (00C5) */
|
||
|
|
sc_log(card->ctx, "Updating fingerprint blob 00C5.");
|
||
|
|
fpseq_blob = pgp_find_blob(card, 0x00C5);
|
||
|
|
- if (fpseq_blob == NULL)
|
||
|
|
- LOG_TEST_GOTO_ERR(card->ctx, SC_ERROR_OUT_OF_MEMORY, "Cannot find blob 00C5");
|
||
|
|
+ if (fpseq_blob == NULL) {
|
||
|
|
+ r = SC_ERROR_OUT_OF_MEMORY;
|
||
|
|
+ LOG_TEST_GOTO_ERR(card->ctx, r, "Cannot find blob 00C5");
|
||
|
|
+ }
|
||
|
|
+ if (20 * key_info->key_id > fpseq_blob->len) {
|
||
|
|
+ r = SC_ERROR_OBJECT_NOT_VALID;
|
||
|
|
+ LOG_TEST_GOTO_ERR(card->ctx, r, "The 00C5 blob is not large enough");
|
||
|
|
+ }
|
||
|
|
|
||
|
|
/* save the fingerprints sequence */
|
||
|
|
newdata = malloc(fpseq_blob->len);
|
||
|
|
- if (newdata == NULL)
|
||
|
|
- LOG_TEST_GOTO_ERR(card->ctx, SC_ERROR_OUT_OF_MEMORY,
|
||
|
|
- "Not enough memory to update fingerprint blob 00C5");
|
||
|
|
+ if (newdata == NULL) {
|
||
|
|
+ r = SC_ERROR_OUT_OF_MEMORY;
|
||
|
|
+ LOG_TEST_GOTO_ERR(card->ctx, r, "Not enough memory to update fingerprint blob 00C5");
|
||
|
|
+ }
|
||
|
|
|
||
|
|
memcpy(newdata, fpseq_blob->data, fpseq_blob->len);
|
||
|
|
/* move p to the portion holding the fingerprint of the current key */
|
||
|
|
@@ -2778,6 +2785,9 @@ pgp_parse_and_set_pubkey_output(sc_card_
|
||
|
|
|
||
|
|
/* RSA modulus */
|
||
|
|
if (tag == 0x0081) {
|
||
|
|
+ if (key_info->algorithm != SC_OPENPGP_KEYALGO_RSA) {
|
||
|
|
+ LOG_FUNC_RETURN(card->ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED);
|
||
|
|
+ }
|
||
|
|
if ((BYTES4BITS(key_info->u.rsa.modulus_len) < len) /* modulus_len is in bits */
|
||
|
|
|| key_info->u.rsa.modulus == NULL) {
|
||
|
|
|
||
|
|
@@ -2793,6 +2803,9 @@ pgp_parse_and_set_pubkey_output(sc_card_
|
||
|
|
}
|
||
|
|
/* RSA public exponent */
|
||
|
|
else if (tag == 0x0082) {
|
||
|
|
+ if (key_info->algorithm != SC_OPENPGP_KEYALGO_RSA) {
|
||
|
|
+ LOG_FUNC_RETURN(card->ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED);
|
||
|
|
+ }
|
||
|
|
if ((BYTES4BITS(key_info->u.rsa.exponent_len) < len) /* exponent_len is in bits */
|
||
|
|
|| key_info->u.rsa.exponent == NULL) {
|
||
|
|
|
||
|
|
@@ -2808,6 +2821,10 @@ pgp_parse_and_set_pubkey_output(sc_card_
|
||
|
|
}
|
||
|
|
/* ECC public key */
|
||
|
|
else if (tag == 0x0086) {
|
||
|
|
+ if (key_info->algorithm != SC_OPENPGP_KEYALGO_ECDSA &&
|
||
|
|
+ key_info->algorithm != SC_OPENPGP_KEYALGO_ECDH) {
|
||
|
|
+ LOG_FUNC_RETURN(card->ctx, SC_ERROR_UNKNOWN_DATA_RECEIVED);
|
||
|
|
+ }
|
||
|
|
/* set the output data */
|
||
|
|
/* len is ecpoint length + format byte
|
||
|
|
* see section 7.2.14 of 3.3.1 specs */
|