Allow ASCII-armored PGP pub keys to be passed into -pgp-keys.

Fixes #940
This commit is contained in:
Jeff Mitchell
2016-01-18 17:01:52 -05:00
parent 0e2a0cd5b5
commit 3ecd88bd5c
4 changed files with 70 additions and 7 deletions

View File

@@ -148,8 +148,8 @@ func TestInit_PGP(t *testing.T) {
args = []string{
"-address", addr,
"-key-shares", "3",
"-pgp-keys", pubFiles[0] + ",@" + pubFiles[1] + "," + pubFiles[2],
"-key-shares", "4",
"-pgp-keys", pubFiles[0] + ",@" + pubFiles[1] + "," + pubFiles[2] + "," + pubFiles[3],
"-key-threshold", "2",
}
@@ -182,7 +182,7 @@ func TestInit_PGP(t *testing.T) {
}
expected := &vault.SealConfig{
SecretShares: 3,
SecretShares: 4,
SecretThreshold: 2,
PGPKeys: pgpKeys,
}