wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a memory leak with di2_X509_CRL reuse

Browse source 
Additionally avoid undefined behavior with
in-place memcpy in X509_CRL_digest.

Fixes #8099

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8112)

(cherry picked from commit a727627922)
This commit is contained in:
Bernd Edlinger 2019-01-29 14:16:28 +01:00
parent 822e6d95e0
commit 7193394aee
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
crypto/x509/x_crl.c
View file

@ -158,6 +158,18 @@ static int crl_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
int idx; int idx;
switch (operation) { switch (operation) {
case ASN1_OP_D2I_PRE:
if (crl->meth->crl_free) {
if (!crl->meth->crl_free(crl))
return 0;
}
AUTHORITY_KEYID_free(crl->akid);
ISSUING_DIST_POINT_free(crl->idp);
ASN1_INTEGER_free(crl->crl_number);
ASN1_INTEGER_free(crl->base_crl_number);
sk_GENERAL_NAMES_pop_free(crl->issuers, GENERAL_NAMES_free);
/* fall thru */
case ASN1_OP_NEW_POST: case ASN1_OP_NEW_POST:
crl->idp = NULL; crl->idp = NULL;
crl->akid = NULL; crl->akid = NULL;

15
test/crltest.c
View file

@ -357,6 +357,20 @@ static int test_unknown_critical_crl(int n)
return r; return r;
} }
static int test_reuse_crl(void)
{
X509_CRL *reused_crl = CRL_from_strings(kBasicCRL);
char *p;
BIO *b = glue2bio(kRevokedCRL, &p);
reused_crl = PEM_read_bio_X509_CRL(b, &reused_crl, NULL, NULL);
OPENSSL_free(p);
BIO_free(b);
X509_CRL_free(reused_crl);
return 1;
}
int setup_tests(void) int setup_tests(void)
{ {
if (!TEST_ptr(test_root = X509_from_strings(kCRLTestRoot)) if (!TEST_ptr(test_root = X509_from_strings(kCRLTestRoot))
@ -368,6 +382,7 @@ int setup_tests(void)
ADD_TEST(test_bad_issuer_crl); ADD_TEST(test_bad_issuer_crl);
ADD_TEST(test_known_critical_crl); ADD_TEST(test_known_critical_crl);
ADD_ALL_TESTS(test_unknown_critical_crl, OSSL_NELEM(unknown_critical_crls)); ADD_ALL_TESTS(test_unknown_critical_crl, OSSL_NELEM(unknown_critical_crls));
ADD_TEST(test_reuse_crl);
return 1; return 1;
} }