Skip to content

Commit

Permalink
Fix integration tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Umayr Shahid <umayr.shahid@gmail.com>
  • Loading branch information
@umayr
umayr committed Apr 10, 2017
1 parent 8d1f160 commit 74457e5
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions cmd/notary/integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ func TestInitWithRootKey(t *testing.T) {
require.NoError(t, err)

// if the key has a root role, AddKey sets the gun to "" so we have done the same here
encryptedPEMPrivKey, err := utils.EncryptPrivateKey(privKey, data.CanonicalRootRole, "", testPassphrase)
encryptedPEMPrivKey, err := utils.ConvertPrivateKeyToPKCS8(privKey, data.CanonicalRootRole, "", testPassphrase)
require.NoError(t, err)
encryptedPEMKeyFilename := filepath.Join(tempDir, "encrypted_key.key")
err = ioutil.WriteFile(encryptedPEMKeyFilename, encryptedPEMPrivKey, 0644)
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestInitWithRootKey(t *testing.T) {
// check error if unencrypted PEM used
unencryptedPrivKey, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)
unencryptedPEMPrivKey, err := utils.KeyToPEM(unencryptedPrivKey, data.CanonicalRootRole, "")
unencryptedPEMPrivKey, err := utils.ConvertPrivateKeyToPKCS8(unencryptedPrivKey, data.CanonicalRootRole, "", "")
require.NoError(t, err)
unencryptedPEMKeyFilename := filepath.Join(tempDir, "unencrypted_key.key")
err = ioutil.WriteFile(unencryptedPEMKeyFilename, unencryptedPEMPrivKey, 0644)
Expand All @@ -158,7 +158,7 @@ func TestInitWithRootKey(t *testing.T) {
require.NoError(t, err)

// Blank gun name since it is a root key
badPassPEMPrivKey, err := utils.EncryptPrivateKey(badPassPrivKey, data.CanonicalRootRole, "", "bad_pass")
badPassPEMPrivKey, err := utils.ConvertPrivateKeyToPKCS8(badPassPrivKey, data.CanonicalRootRole, "", "bad_pass")
require.NoError(t, err)
badPassPEMKeyFilename := filepath.Join(tempDir, "badpass_key.key")
err = ioutil.WriteFile(badPassPEMKeyFilename, badPassPEMPrivKey, 0644)
Expand All @@ -170,7 +170,7 @@ func TestInitWithRootKey(t *testing.T) {
// check error if wrong role specified
snapshotPrivKey, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)
snapshotPEMPrivKey, err := utils.KeyToPEM(snapshotPrivKey, data.CanonicalSnapshotRole, "gun2")
snapshotPEMPrivKey, err := utils.ConvertPrivateKeyToPKCS8(snapshotPrivKey, data.CanonicalSnapshotRole, "gun2", "")
require.NoError(t, err)
snapshotPEMKeyFilename := filepath.Join(tempDir, "snapshot_key.key")
err = ioutil.WriteFile(snapshotPEMKeyFilename, snapshotPEMPrivKey, 0644)
Expand Down Expand Up @@ -913,9 +913,9 @@ func TestClientDelegationsPublishing(t *testing.T) {
tempFile.Close()
defer os.Remove(tempFile.Name())

privKeyBytesNoRole, err := utils.KeyToPEM(privKey, "", "")
privKeyBytesNoRole, err := utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)
privKeyBytesWithRole, err := utils.KeyToPEM(privKey, "user", "")
privKeyBytesWithRole, err := utils.ConvertPrivateKeyToPKCS8(privKey, "user", "", "")
require.NoError(t, err)

// Set up targets for publishing
Expand Down Expand Up @@ -1345,15 +1345,15 @@ func TestKeyRotation(t *testing.T) {
// create encrypted root keys
rootPrivKey1, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)
encryptedPEMPrivKey1, err := utils.EncryptPrivateKey(rootPrivKey1, data.CanonicalRootRole, "", testPassphrase)
encryptedPEMPrivKey1, err := utils.ConvertPrivateKeyToPKCS8(rootPrivKey1, data.CanonicalRootRole, "", testPassphrase)
require.NoError(t, err)
encryptedPEMKeyFilename1 := filepath.Join(tempDir, "encrypted_key.key")
err = ioutil.WriteFile(encryptedPEMKeyFilename1, encryptedPEMPrivKey1, 0644)
require.NoError(t, err)

rootPrivKey2, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)
encryptedPEMPrivKey2, err := utils.EncryptPrivateKey(rootPrivKey2, data.CanonicalRootRole, "", testPassphrase)
encryptedPEMPrivKey2, err := utils.ConvertPrivateKeyToPKCS8(rootPrivKey2, data.CanonicalRootRole, "", testPassphrase)
require.NoError(t, err)
encryptedPEMKeyFilename2 := filepath.Join(tempDir, "encrypted_key2.key")
err = ioutil.WriteFile(encryptedPEMKeyFilename2, encryptedPEMPrivKey2, 0644)
Expand Down Expand Up @@ -1426,7 +1426,7 @@ func TestKeyRotationNonRoot(t *testing.T) {
privKey, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err := utils.EncryptPrivateKey(privKey, data.CanonicalTargetsRole, "", testPassphrase)
pemBytes, err := utils.ConvertPrivateKeyToPKCS8(privKey, data.CanonicalTargetsRole, "", testPassphrase)
require.NoError(t, err)

nBytes, err := tempFile.Write(pemBytes)
Expand All @@ -1441,7 +1441,7 @@ func TestKeyRotationNonRoot(t *testing.T) {
privKey2, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes2, err := utils.KeyToPEM(privKey2, data.CanonicalTargetsRole, "")
pemBytes2, err := utils.ConvertPrivateKeyToPKCS8(privKey2, data.CanonicalTargetsRole, "", "")
require.NoError(t, err)

nBytes2, err := tempFile2.Write(pemBytes2)
Expand Down Expand Up @@ -2269,7 +2269,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err := utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err := utils.EncryptPrivateKey(privKey, data.CanonicalRootRole, "", "")
pemBytes, err := utils.ConvertPrivateKeyToPKCS8(privKey, data.CanonicalRootRole, "", "")
require.NoError(t, err)

nBytes, err := tempFile.Write(pemBytes)
Expand Down Expand Up @@ -2297,7 +2297,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)

nBytes, err = tempFile2.Write(pemBytes)
Expand All @@ -2323,7 +2323,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)

nBytes, err = tempFile3.Write(pemBytes)
Expand Down Expand Up @@ -2353,7 +2353,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)

nBytes, err = tempFile4.Write(pemBytes)
Expand Down Expand Up @@ -2384,7 +2384,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)

nBytes, err = tempFile5.Write(pemBytes)
Expand Down Expand Up @@ -2415,7 +2415,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, data.CanonicalRootRole, "", testPassphrase)
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, data.CanonicalRootRole, "", testPassphrase)
require.NoError(t, err)

nBytes, err = tempFile6.Write(pemBytes)
Expand All @@ -2441,7 +2441,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)

nBytes, err = tempFile7.Write(pemBytes)
Expand Down Expand Up @@ -2471,7 +2471,7 @@ func TestClientKeyImport(t *testing.T) {
privKey, err = utils.GenerateECDSAKey(rand.Reader)
require.NoError(t, err)

pemBytes, err = utils.EncryptPrivateKey(privKey, data.CanonicalSnapshotRole, "", "")
pemBytes, err = utils.ConvertPrivateKeyToPKCS8(privKey, data.CanonicalSnapshotRole, "", "")
require.NoError(t, err)

nBytes, err = tempFile8.Write(pemBytes)
Expand Down Expand Up @@ -2515,7 +2515,7 @@ func TestAddDelImportKeyPublishFlow(t *testing.T) {
keyFile, err := ioutil.TempFile("", "pemfile")
require.NoError(t, err)
defer os.Remove(keyFile.Name())
pemBytes, err := utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err := utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)
nBytes, err := keyFile.Write(pemBytes)
require.NoError(t, err)
Expand Down Expand Up @@ -2768,7 +2768,7 @@ func TestDelegationKeyImportExport(t *testing.T) {
defer os.Remove(keyFile.Name())
privKey, err := utils.GenerateRSAKey(rand.Reader, 2048)
require.NoError(t, err)
pemBytes, err := utils.EncryptPrivateKey(privKey, "", "", "")
pemBytes, err := utils.ConvertPrivateKeyToPKCS8(privKey, "", "", "")
require.NoError(t, err)
nBytes, err := keyFile.Write(pemBytes)
require.NoError(t, err)
Expand Down

0 comments on commit 74457e5

Please sign in to comment.