openbsd/src/lib/libcrypto/cms/cms_smime.c, branch OPENBSD_6_8_BASE

Fix a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey.

2019-10-04T18:03:56+00:00

(Note that the CMS code is currently disabled.) Port of Edlinger's Fix for CVE-2019-1563 from OpenSSL 1.1.1 (old license) tests from bluhm@ ok jsing commit e21f8cf78a125cd3c8c0d1a1a6c8bb0b901f893f Author: Bernd Edlinger Date: Sun Sep 1 00:16:28 2019 +0200 Fix a padding oracle in PKCS7_dataDecode and CMS_decrypt_set1_pkey An attack is simple, if the first CMS_recipientInfo is valid but the second CMS_recipientInfo is chosen ciphertext. If the second recipientInfo decodes to PKCS #1 v1.5 form plaintext, the correct encryption key will be replaced by garbage, and the message cannot be decoded, but if the RSA decryption fails, the correct encryption key is used and the recipient will not notice the attack. As a work around for this potential attack the length of the decrypted key must be equal to the cipher default key length, in case the certifiate is not given and all recipientInfo are tried out. The old behaviour can be re-enabled in the CMS code by setting the CMS_DEBUG_DECRYPT flag. Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/9777) (cherry picked from commit 5840ed0cd1e6487d247efbc1a04136a41d7b3a37)

Use ERR_asprintf_error_data() instead of ERR_add_error_data().

2019-08-11T14:51:15+00:00

Convert CMSerr() to CMSerror().

2019-08-11T10:38:27+00:00

Unlike OpenSSL we do not have our own special ssize_t.

2019-08-11T06:47:18+00:00

More style(9), whitespace and readability fixes.

2019-08-10T18:15:52+00:00

Files are identical once whitespace and newlines are removed.

First pass at style(9).

2019-08-10T16:42:20+00:00

Whitespace only and no change according to diff -w.

Fix includes for non-installed headers.

2019-08-10T16:39:17+00:00

Add $OpenBSD$ tags.

2019-08-10T16:03:54+00:00

Restore the original per-file licenses for CMS.

2019-08-10T16:02:24+00:00

These were removed in OpenSSL b1322259d93cf6b6286f9febcd468b6a9f577d91.

Work towards supporting Cryptographic Message Syntax (CMS) in libcrypto.

2019-08-10T15:55:20+00:00

Cryptographic Message Syntax (CMS) is a standard for cryptographically protecting messages, as defined in RFC 5652. It is derived from PKCS #7 version 1.5 and utilises various ASN.1 structures, making it complex and fairly heavyweight. Various protocols - including RPKI (RFC 6480) - have been built on top of it, which means it is necessary to support CMS, in order to support RPKI. This imports around 6,000 lines of code from OpenSSL 1.1.1, which is still under the original OpenSSL license. Further work will occur in tree. Requested by and discussed with many. ok deraadt@ tb@