pgcrypto: report init errors as PXE_CIPHER_INIT

danielgustafsson · danielgustafsson · commit 0250a167a07d · 2022-05-06T14:41:33.000+02:00
Report OpenSSL errors during initialization as PXE_CIPHER_INIT since that's just what they were, and not generic unknown errors. This also removes the last users of the generic error, and thus it can be removed. Discussion: http://postgr.es/m/C89D932C-501E-4473-9750-638CFCD9095E@yesql.se
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
@@ -209,13 +209,13 @@ px_find_digest(const char *name, PX_MD **res)
 	if (!ctx)
 	{
 		pfree(digest);
-		return -1;
+		return PXE_CIPHER_INIT;
 	}
 	if (EVP_DigestInit_ex(ctx, md, NULL) == 0)
 	{
 		EVP_MD_CTX_destroy(ctx);
 		pfree(digest);
-		return -1;
+		return PXE_CIPHER_INIT;
 	}
 
 	digest->algo = md;
diff --git a/contrib/pgcrypto/px.c b/contrib/pgcrypto/px.c
@@ -41,7 +41,6 @@ struct error_desc
 
 static const struct error_desc px_err_list[] = {
 	{PXE_OK, "Everything ok"},
-	{PXE_ERR_GENERIC, "Some PX error (not specified)"},
 	{PXE_NO_HASH, "No such hash algorithm"},
 	{PXE_NO_CIPHER, "No such cipher algorithm"},
 	{PXE_BAD_OPTION, "Unknown option"},
diff --git a/contrib/pgcrypto/px.h b/contrib/pgcrypto/px.h
@@ -44,7 +44,7 @@
  * PX error codes
  */
 #define PXE_OK						0
-#define PXE_ERR_GENERIC				-1
+/* -1 is unused */
 #define PXE_NO_HASH					-2
 #define PXE_NO_CIPHER				-3
 /* -4 is unused */

Original file line number	Diff line number	Diff line change
`@@ -209,13 +209,13 @@ px_find_digest(const char name, PX_MD *res)`
`209`	`209`	`if (!ctx)`
`210`	`210`	`{`
`211`	`211`	`pfree(digest);`
`212`		`- return -1;`
	`212`	`+ return PXE_CIPHER_INIT;`
`213`	`213`	`}`
`214`	`214`	`if (EVP_DigestInit_ex(ctx, md, NULL) == 0)`
`215`	`215`	`{`
`216`	`216`	`EVP_MD_CTX_destroy(ctx);`
`217`	`217`	`pfree(digest);`
`218`		`- return -1;`
	`218`	`+ return PXE_CIPHER_INIT;`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`digest->algo = md;`