database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Docs: fix incorrect spelling of contrib/pgcrypto option.

Browse Source 
pgp_sym_encrypt's option is spelled "sess-key", not "enable-session-key".
Spotted by Jeff Janes.

In passing, improve a comment in pgp-pgsql.c to make it clearer that
the debugging options are intentionally undocumented.
This commit is contained in:
Tom Lane 2014-11-03 11:11:34 -05:00
parent f229170c75
commit 21495a2bb7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/pgcrypto/pgp-pgsql.c
View File

@ -241,7 +241,10 @@ set_arg(PGP_Context *ctx, char *key, char *val,
res = pgp_set_convert_crlf(ctx, atoi(val)); res = pgp_set_convert_crlf(ctx, atoi(val));
else if (strcmp(key, "unicode-mode") == 0) else if (strcmp(key, "unicode-mode") == 0)
res = pgp_set_unicode_mode(ctx, atoi(val)); res = pgp_set_unicode_mode(ctx, atoi(val));
/* decrypt debug */ /*
* The remaining options are for debugging/testing and are therefore not
* documented in the user-facing docs.
*/
else if (ex != NULL && strcmp(key, "debug") == 0) else if (ex != NULL && strcmp(key, "debug") == 0)
ex->debug = atoi(val); ex->debug = atoi(val);
else if (ex != NULL && strcmp(key, "expect-cipher-algo") == 0) else if (ex != NULL && strcmp(key, "expect-cipher-algo") == 0)

4
doc/src/sgml/pgcrypto.sgml
View File

@ -802,11 +802,11 @@ Applies to: pgp_sym_encrypt, pgp_pub_encrypt
</sect4> </sect4>
<sect4> <sect4>
<title>enable-session-key</title> <title>sess-key</title>
<para> <para>
Use separate session key. Public-key encryption always uses a separate Use separate session key. Public-key encryption always uses a separate
session key; this is for symmetric-key encryption, which by default session key; this option is for symmetric-key encryption, which by default
uses the S2K key directly. uses the S2K key directly.
</para> </para>
<literallayout> <literallayout>