Commit aeae7995 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Sanity check keylength in PVK files. 

PR#2277
(cherry picked from commit 733a6c882e92f8221bd03a51643bb47f5f81bb81)
parent cf3792b3

crypto/pem/pvkfmt.c

+5 −0
Original line number Diff line number Diff line
@@ -755,6 +755,11 @@ static EVP_PKEY *do_PVK_body(const unsigned char **in, 
		/* Copy BLOBHEADER across, decrypt rest */

		memcpy(enctmp, p, 8);

		p += 8;

		if (keylen < 8)

			{

			PEMerr(PEM_F_DO_PVK_BODY, PEM_R_PVK_TOO_SHORT);

			return NULL;

			}

		inlen = keylen - 8;

		q = enctmp + 8;

		EVP_CIPHER_CTX_init(&cctx);