Merge "veyron/security,veyron/runtimes/google/security: Move all caveat implementations to veyron/security."
diff --git a/runtimes/google/security/identity_chain.go b/runtimes/google/security/identity_chain.go
index ca6ca3d..b8439e0 100644
--- a/runtimes/google/security/identity_chain.go
+++ b/runtimes/google/security/identity_chain.go
@@ -11,7 +11,6 @@
"reflect"
"time"
- icaveat "veyron/runtimes/google/security/caveat"
"veyron/runtimes/google/security/keys"
"veyron/security/caveat"
@@ -211,7 +210,7 @@
}
func (id *chainPrivateID) MintDischarge(cav security.ThirdPartyCaveat, ctx security.Context, duration time.Duration, dischargeCaveats []security.ServiceCaveat) (security.ThirdPartyDischarge, error) {
- return icaveat.NewPublicKeyDischarge(id, cav, ctx, duration, dischargeCaveats)
+ return caveat.NewPublicKeyDischarge(id, cav, ctx, duration, dischargeCaveats)
}
// newChainPrivateID returns a new PrivateID containing a freshly generated
diff --git a/runtimes/google/security/identity_test.go b/runtimes/google/security/identity_test.go
index 55ebf89..5c3a141 100644
--- a/runtimes/google/security/identity_test.go
+++ b/runtimes/google/security/identity_test.go
@@ -8,7 +8,7 @@
"testing"
"time"
- "veyron/runtimes/google/security/caveat"
+ "veyron/security/caveat"
"veyron2/security"
"veyron2/security/wire"
"veyron2/vom"
diff --git a/runtimes/google/security/caveat/public_key_caveat.go b/security/caveat/public_key_caveat.go
similarity index 97%
rename from runtimes/google/security/caveat/public_key_caveat.go
rename to security/caveat/public_key_caveat.go
index f142359..6c5d622 100644
--- a/runtimes/google/security/caveat/public_key_caveat.go
+++ b/security/caveat/public_key_caveat.go
@@ -1,4 +1,3 @@
-// Package caveat provides some third-party caveat implementations for the Google runtime.
package caveat
import (
@@ -11,7 +10,6 @@
"math/big"
"time"
- vcaveat "veyron/security/caveat"
"veyron2/security"
"veyron2/security/wire"
"veyron2/vom"
@@ -197,7 +195,7 @@
return nil, fmt.Errorf("failed to validate DischargeMintingCaveat: %s", err)
}
now := time.Now()
- expiryCaveat := &vcaveat.Expiry{IssueTime: now, ExpiryTime: now.Add(duration)}
+ expiryCaveat := &Expiry{IssueTime: now, ExpiryTime: now.Add(duration)}
caveats = append(caveats, security.UniversalCaveat(expiryCaveat))
encodedCaveats, err := wire.EncodeCaveats(caveats)
if err != nil {
