pgcrypto: Detect errors with EVP calls from OpenSSL

michaelpq · michaelpq · commit 95992e5ed93d · 2020-12-08T15:22:59.000+09:00
The following routines are called within pgcrypto when handling digests
but there were no checks for failures:
- EVP_MD_CTX_size (can fail with -1 as of 3.0.0)
- EVP_MD_CTX_block_size (can fail with -1 as of 3.0.0)
- EVP_DigestInit_ex
- EVP_DigestUpdate
- EVP_DigestFinal_ex

A set of elog(ERROR) is added by this commit to detect such failures,
that should never happen except in the event of a processing failure
internal to OpenSSL.

Note that it would be possible to use ERR_reason_error_string() to get
more context about such errors, but these refer mainly to the internals
of OpenSSL, so it is not really obvious how useful that would be.  This
is left out for simplicity.

Per report from Coverity.  Thanks to Tom Lane for the discussion.

Backpatch-through: 9.5
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
@@ -267,40 +267,51 @@ static unsigned
 digest_result_size(PX_MD *h)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
+	int			result = EVP_MD_CTX_size(digest->ctx);
 
-	return EVP_MD_CTX_size(digest->ctx);
+	if (result < 0)
+		elog(ERROR, "EVP_MD_CTX_size() failed");
+
+	return result;
 }
 
 static unsigned
 digest_block_size(PX_MD *h)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
+	int			result = EVP_MD_CTX_block_size(digest->ctx);
+
+	if (result < 0)
+		elog(ERROR, "EVP_MD_CTX_block_size() failed");
 
-	return EVP_MD_CTX_block_size(digest->ctx);
+	return result;
 }
 
 static void
 digest_reset(PX_MD *h)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestInit_ex(digest->ctx, digest->algo, NULL);
+	if (!EVP_DigestInit_ex(digest->ctx, digest->algo, NULL))
+		elog(ERROR, "EVP_DigestInit_ex() failed");
 }
 
 static void
 digest_update(PX_MD *h, const uint8 *data, unsigned dlen)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestUpdate(digest->ctx, data, dlen);
+	if (!EVP_DigestUpdate(digest->ctx, data, dlen))
+		elog(ERROR, "EVP_DigestUpdate() failed");
 }
 
 static void
 digest_finish(PX_MD *h, uint8 *dst)
 {
 	OSSLDigest *digest = (OSSLDigest *) h->p.ptr;
 
-	EVP_DigestFinal_ex(digest->ctx, dst, NULL);
+	if (!EVP_DigestFinal_ex(digest->ctx, dst, NULL))
+		elog(ERROR, "EVP_DigestFinal_ex() failed");
 }
 
 static void

Original file line number	Diff line number	Diff line change
`@@ -267,40 +267,51 @@ static unsigned`
`267`	`267`	`digest_result_size(PX_MD *h)`
`268`	`268`	`{`
`269`	`269`	`OSSLDigest digest = (OSSLDigest ) h->p.ptr;`
	`270`	`+ int result = EVP_MD_CTX_size(digest->ctx);`
`270`	`271`
`271`		`- return EVP_MD_CTX_size(digest->ctx);`
	`272`	`+ if (result < 0)`
	`273`	`+ elog(ERROR, "EVP_MD_CTX_size() failed");`
	`274`	`+`
	`275`	`+ return result;`
`272`	`276`	`}`
`273`	`277`
`274`	`278`	`static unsigned`
`275`	`279`	`digest_block_size(PX_MD *h)`
`276`	`280`	`{`
`277`	`281`	`OSSLDigest digest = (OSSLDigest ) h->p.ptr;`
	`282`	`+ int result = EVP_MD_CTX_block_size(digest->ctx);`
	`283`	`+`
	`284`	`+ if (result < 0)`
	`285`	`+ elog(ERROR, "EVP_MD_CTX_block_size() failed");`
`278`	`286`
`279`		`- return EVP_MD_CTX_block_size(digest->ctx);`
	`287`	`+ return result;`
`280`	`288`	`}`
`281`	`289`
`282`	`290`	`static void`
`283`	`291`	`digest_reset(PX_MD *h)`
`284`	`292`	`{`
`285`	`293`	`OSSLDigest digest = (OSSLDigest ) h->p.ptr;`
`286`	`294`
`287`		`- EVP_DigestInit_ex(digest->ctx, digest->algo, NULL);`
	`295`	`+ if (!EVP_DigestInit_ex(digest->ctx, digest->algo, NULL))`
	`296`	`+ elog(ERROR, "EVP_DigestInit_ex() failed");`
`288`	`297`	`}`
`289`	`298`
`290`	`299`	`static void`
`291`	`300`	`digest_update(PX_MD h, const uint8 data, unsigned dlen)`
`292`	`301`	`{`
`293`	`302`	`OSSLDigest digest = (OSSLDigest ) h->p.ptr;`
`294`	`303`
`295`		`- EVP_DigestUpdate(digest->ctx, data, dlen);`
	`304`	`+ if (!EVP_DigestUpdate(digest->ctx, data, dlen))`
	`305`	`+ elog(ERROR, "EVP_DigestUpdate() failed");`
`296`	`306`	`}`
`297`	`307`
`298`	`308`	`static void`
`299`	`309`	`digest_finish(PX_MD h, uint8 dst)`
`300`	`310`	`{`
`301`	`311`	`OSSLDigest digest = (OSSLDigest ) h->p.ptr;`
`302`	`312`
`303`		`- EVP_DigestFinal_ex(digest->ctx, dst, NULL);`
	`313`	`+ if (!EVP_DigestFinal_ex(digest->ctx, dst, NULL))`
	`314`	`+ elog(ERROR, "EVP_DigestFinal_ex() failed");`
`304`	`315`	`}`
`305`	`316`
`306`	`317`	`static void`