aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--contrib/pgcrypto/openssl.c4
-rw-r--r--contrib/pgcrypto/px.c1
-rw-r--r--contrib/pgcrypto/px.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/contrib/pgcrypto/openssl.c b/contrib/pgcrypto/openssl.c
index 68fd61b716f..53e64297c28 100644
--- 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
index c139798f3b2..40b6a04d526 100644
--- 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
index f175862f8e0..4ef40f3f1c5 100644
--- 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 */