5 files changed, 9 insertions, 9 deletions
diff --git a/src/pkg/crypto/openpgp/packet/encrypted_key.go b/src/pkg/crypto/openpgp/packet/encrypted_key.go
index 4a926cdb1..b11a9b830 100644
--- a/src/pkg/crypto/openpgp/packet/encrypted_key.go
+++ b/src/pkg/crypto/openpgp/packet/encrypted_key.go
@@ -20,8 +20,8 @@ type EncryptedKey struct {
 	KeyId      uint64
 	Algo       PublicKeyAlgorithm
 	Encrypted  []byte
-	CipherFunc CipherFunction // only valid after a sucessful Decrypt
-	Key        []byte         // only valid after a sucessful Decrypt
+	CipherFunc CipherFunction // only valid after a successful Decrypt
+	Key        []byte         // only valid after a successful Decrypt
 }
 
 func (e *EncryptedKey) parse(r io.Reader) (err os.Error) {
diff --git a/src/pkg/crypto/openpgp/packet/literal.go b/src/pkg/crypto/openpgp/packet/literal.go
index 5f72d6a2c..04f50e53e 100644
--- a/src/pkg/crypto/openpgp/packet/literal.go
+++ b/src/pkg/crypto/openpgp/packet/literal.go
@@ -14,11 +14,11 @@ import (
 type LiteralData struct {
 	IsBinary bool
 	FileName string
-	Time     uint32 // Unix epoc time. Either creation time or modification time. 0 means undefined.
+	Time     uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined.
 	Body     io.Reader
 }
 
-// ForEyesOnly return whether the contents of the LiteralData have been marked
+// ForEyesOnly returns whether the contents of the LiteralData have been marked
 // as especially sensitive.
 func (l *LiteralData) ForEyesOnly() bool {
 	return l.FileName == "_CONSOLE"
diff --git a/src/pkg/crypto/openpgp/packet/packet.go b/src/pkg/crypto/openpgp/packet/packet.go
index 80e25e250..269603ba4 100644
--- a/src/pkg/crypto/openpgp/packet/packet.go
+++ b/src/pkg/crypto/openpgp/packet/packet.go
@@ -261,13 +261,13 @@ func Read(r io.Reader) (p Packet, err os.Error) {
 	case packetTypePrivateKey, packetTypePrivateSubkey:
 		pk := new(PrivateKey)
 		if tag == packetTypePrivateSubkey {
-			pk.IsSubKey = true
+			pk.IsSubkey = true
 		}
 		p = pk
 	case packetTypePublicKey, packetTypePublicSubkey:
 		pk := new(PublicKey)
 		if tag == packetTypePublicSubkey {
-			pk.IsSubKey = true
+			pk.IsSubkey = true
 		}
 		p = pk
 	case packetTypeCompressed:
@@ -300,7 +300,7 @@ type SignatureType uint8
 
 const (
 	SigTypeBinary        SignatureType = 0
-	SigTypeText          SignatureType = 1
+	SigTypeText          = 1
 	SigTypeGenericCert   = 0x10
 	SigTypePersonaCert   = 0x11
 	SigTypeCasualCert    = 0x12
diff --git a/src/pkg/crypto/openpgp/packet/public_key.go b/src/pkg/crypto/openpgp/packet/public_key.go
index 4a2ed0aca..8866bdaaa 100644
--- a/src/pkg/crypto/openpgp/packet/public_key.go
+++ b/src/pkg/crypto/openpgp/packet/public_key.go
@@ -23,7 +23,7 @@ type PublicKey struct {
 	PublicKey    interface{} // Either a *rsa.PublicKey or *dsa.PublicKey
 	Fingerprint  [20]byte
 	KeyId        uint64
-	IsSubKey     bool
+	IsSubkey     bool
 
 	n, e, p, q, g, y parsedMPI
 }
diff --git a/src/pkg/crypto/openpgp/packet/symmetrically_encrypted_test.go b/src/pkg/crypto/openpgp/packet/symmetrically_encrypted_test.go
index ee5a30d32..5543b2029 100644
--- a/src/pkg/crypto/openpgp/packet/symmetrically_encrypted_test.go
+++ b/src/pkg/crypto/openpgp/packet/symmetrically_encrypted_test.go
@@ -54,7 +54,7 @@ func testMDCReader(t *testing.T) {
 
 		err = mdcReader.Close()
 		if err != nil {
-			t.Errorf("stride: %d, error on Close: %s", err)
+			t.Errorf("stride: %d, error on Close: %s", stride, err)
 		}
 	}