diff options
| author | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2020-12-27 21:37:42 -0500 |
| commit | 3187ef7c46c5b884267a88f2d6119c9a05f1bbba (patch) | |
| tree | 6ff5e31d8ffaaf806ee908fe2ef8733c7ba348ef /src/backend/utils/misc/guc.c | |
| parent | facad31474ac6dace3894ebc7c45dc3cc829422e (diff) | |
Revert "Add key management system" (978f869b99) & later commits
The patch needs test cases, reorganization, and cfbot testing.
Technically reverts commits 5c31afc49d..e35b2bad1a (exclusive/inclusive)
and 08db7c63f3..ccbe34139b.
Reported-by: Tom Lane, Michael Paquier
Discussion: https://postgr.es/m/E1ktAAG-0002V2-VB@gemulon.postgresql.org
Diffstat (limited to 'src/backend/utils/misc/guc.c')
| -rw-r--r-- | src/backend/utils/misc/guc.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index bbaf037bc6e..878fcc22365 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -47,7 +47,6 @@ #include "commands/vacuum.h" #include "commands/variable.h" #include "common/string.h" -#include "crypto/kmgr.h" #include "funcapi.h" #include "jit/jit.h" #include "libpq/auth.h" @@ -746,8 +745,6 @@ const char *const config_group_names[] = gettext_noop("Statistics / Monitoring"), /* STATS_COLLECTOR */ gettext_noop("Statistics / Query and Index Statistics Collector"), - /* ENCRYPTION */ - gettext_noop("Encryption"), /* AUTOVACUUM */ gettext_noop("Autovacuum"), /* CLIENT_CONN */ @@ -3392,17 +3389,6 @@ static struct config_int ConfigureNamesInt[] = check_huge_page_size, NULL, NULL }, - { - {"file_encryption_keylen", PGC_INTERNAL, PRESET_OPTIONS, - gettext_noop("Shows the bit length of the file encryption key."), - NULL, - GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE - }, - &file_encryption_keylen, - 0, 0, 256, - NULL, NULL, NULL - }, - /* End-of-list marker */ { {NULL, 0, 0, NULL, NULL}, NULL, 0, 0, 0, NULL, NULL, NULL @@ -4398,16 +4384,6 @@ static struct config_string ConfigureNamesString[] = }, { - {"cluster_key_command", PGC_SIGHUP, ENCRYPTION, - gettext_noop("Command to obtain cluster key for cluster file encryption."), - NULL - }, - &cluster_key_command, - "", - NULL, NULL, NULL - }, - - { {"application_name", PGC_USERSET, LOGGING_WHAT, gettext_noop("Sets the application name to be reported in statistics and logs."), NULL, |