bliss: Remove legacy BLISS signatures
This commit is contained in:
committed by
Tobias Brunner
parent
ec982171d9
commit
4833f29b15
@@ -76,7 +76,6 @@ install-data-local: swanctl.conf
|
||||
test -e "$(DESTDIR)$(swanctldir)/private" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/private" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/rsa" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/rsa" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/ecdsa" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/ecdsa" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/bliss" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/bliss" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/pkcs8" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs8" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/pkcs12" || $(INSTALL) -d -m 750 "$(DESTDIR)$(swanctldir)/pkcs12" || true
|
||||
test -e "$(DESTDIR)$(swanctldir)/swanctl.conf" || $(INSTALL) -m 640 $(srcdir)/swanctl.conf $(DESTDIR)$(swanctldir)/swanctl.conf || true
|
||||
|
||||
@@ -274,7 +274,6 @@ static bool determine_credtype(char *type, credential_type_t *credtype,
|
||||
{ "pkcs8", CRED_PRIVATE_KEY, KEY_ANY, },
|
||||
{ "rsa", CRED_PRIVATE_KEY, KEY_RSA, },
|
||||
{ "ecdsa", CRED_PRIVATE_KEY, KEY_ECDSA, },
|
||||
{ "bliss", CRED_PRIVATE_KEY, KEY_BLISS, },
|
||||
{ "pkcs12", CRED_CONTAINER, CONTAINER_PKCS12, },
|
||||
};
|
||||
int i;
|
||||
@@ -672,7 +671,6 @@ static bool load_secret(load_ctx_t *ctx, char *section)
|
||||
"private",
|
||||
"rsa",
|
||||
"ecdsa",
|
||||
"bliss",
|
||||
"pkcs8",
|
||||
"pkcs12",
|
||||
"token",
|
||||
@@ -922,7 +920,6 @@ int load_creds_cfg(vici_conn_t *conn, command_format_options_t format,
|
||||
load_keys(&ctx, "private", SWANCTL_PRIVATEDIR);
|
||||
load_keys(&ctx, "rsa", SWANCTL_RSADIR);
|
||||
load_keys(&ctx, "ecdsa", SWANCTL_ECDSADIR);
|
||||
load_keys(&ctx, "bliss", SWANCTL_BLISSDIR);
|
||||
load_keys(&ctx, "pkcs8", SWANCTL_PKCS8DIR);
|
||||
|
||||
load_containers(&ctx, "pkcs12", SWANCTL_PKCS12DIR);
|
||||
|
||||
@@ -86,11 +86,6 @@ extern char *swanctl_dir;
|
||||
*/
|
||||
#define SWANCTL_ECDSADIR "ecdsa"
|
||||
|
||||
/**
|
||||
* Directory for BLISS private keys
|
||||
*/
|
||||
#define SWANCTL_BLISSDIR "bliss"
|
||||
|
||||
/**
|
||||
* Directory for PKCS#8 encoded private keys
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user