database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-17 06:41:09 +03:00
Code Activity

Fix error message wording in previous sslinfo commit

Browse Source
This commit is contained in:
Alvaro Herrera
2015-09-08 11:10:20 -03:00
parent 7febdf36ad
commit 625f488711
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/sslinfo/sslinfo.c
View File

@ -124,7 +124,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
if (membuf == NULL) if (membuf == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("failed to create OpenSSL BIO structure"))); errmsg("could not create OpenSSL BIO structure")));
(void) BIO_set_close(membuf, BIO_CLOSE); (void) BIO_set_close(membuf, BIO_CLOSE);
ASN1_STRING_print_ex(membuf, str, ASN1_STRING_print_ex(membuf, str,
((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB) ((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB)
@ -141,7 +141,7 @@ ASN1_STRING_to_text(ASN1_STRING *str)
if (dp != sp) if (dp != sp)
pfree(dp); pfree(dp);
if (BIO_free(membuf) != 1) if (BIO_free(membuf) != 1)
elog(ERROR, "failed to free OpenSSL BIO structure"); elog(ERROR, "could not free OpenSSL BIO structure");
PG_RETURN_TEXT_P(result); PG_RETURN_TEXT_P(result);
} }
@ -283,7 +283,7 @@ X509_NAME_to_text(X509_NAME *name)
if (membuf == NULL) if (membuf == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_OUT_OF_MEMORY), (errcode(ERRCODE_OUT_OF_MEMORY),
errmsg("failed to create BIO"))); errmsg("could not create OpenSSL BIO structure")));
(void) BIO_set_close(membuf, BIO_CLOSE); (void) BIO_set_close(membuf, BIO_CLOSE);
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
@ -293,7 +293,7 @@ X509_NAME_to_text(X509_NAME *name)
if (nid == NID_undef) if (nid == NID_undef)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("failed to get NID for ASN1_OBJECT object"))); errmsg("could not get NID for ASN1_OBJECT object")));
v = X509_NAME_ENTRY_get_data(e); v = X509_NAME_ENTRY_get_data(e);
field_name = OBJ_nid2sn(nid); field_name = OBJ_nid2sn(nid);
if (field_name == NULL) if (field_name == NULL)
@ -301,7 +301,7 @@ X509_NAME_to_text(X509_NAME *name)
if (field_name == NULL) if (field_name == NULL)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_INVALID_PARAMETER_VALUE), (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
errmsg("failed to convert NID %d to an ASN1_OBJECT structure", nid))); errmsg("could not convert NID %d to an ASN1_OBJECT structure", nid)));
BIO_printf(membuf, "/%s=", field_name); BIO_printf(membuf, "/%s=", field_name);
ASN1_STRING_print_ex(membuf, v, ASN1_STRING_print_ex(membuf, v,
((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB) ((ASN1_STRFLGS_RFC2253 & ~ASN1_STRFLGS_ESC_MSB)
@ -320,7 +320,7 @@ X509_NAME_to_text(X509_NAME *name)
if (dp != sp) if (dp != sp)
pfree(dp); pfree(dp);
if (BIO_free(membuf) != 1) if (BIO_free(membuf) != 1)
elog(ERROR, "failed to free OpenSSL BIO structure"); elog(ERROR, "could not free OpenSSL BIO structure");
PG_RETURN_TEXT_P(result); PG_RETURN_TEXT_P(result);
} }