Make Time and Filename public (#87)

CHANGELOG.md

@@ -95,7 +95,7 @@ NewPlainMessageFromFile(data []byte, filename string, modTime int) *PlainMessage
 - Use aes256 cipher for password-encrypted messages.
 - The helpers `EncryptSignMessageArmored`, `DecryptVerifyMessageArmored`, `DecryptVerifyAttachment`, and`DecryptBinaryMessageArmored`
     now accept private keys as public keys and perform automatic casting if the keys are locked.
-- The `PlainMessage` struct now contains the fields `filename` (string) and `time` (uint32)
+- The `PlainMessage` struct now contains the fields `Filename` (string) and `Time` (uint32)
 - All the Decrypt* functions return the filename, type, and time specified in the encrypted message
 
 ### Fixed

crypto/attachment.go

@@ -102,7 +102,7 @@ func (keyRing *KeyRing) newAttachmentProcessor(
 // Specifically designed for attachments rather than text messages.
 func (keyRing *KeyRing) EncryptAttachment(message *PlainMessage, filename string) (*PGPSplitMessage, error) {
 	if filename == "" {
-		filename = message.filename
+		filename = message.Filename
 	}
 
 	ap, err := keyRing.newAttachmentProcessor(
@@ -124,7 +124,7 @@ func (keyRing *KeyRing) EncryptAttachment(message *PlainMessage, filename string
 }
 
 // NewLowMemoryAttachmentProcessor creates an AttachmentProcessor which can be used
-// to encrypt a file. It takes an estimatedSize and fileName as hints about the
+// to encrypt a file. It takes an estimatedSize and filename as hints about the
 // file. It is optimized for low-memory environments and collects garbage every
 // megabyte.
 func (keyRing *KeyRing) NewLowMemoryAttachmentProcessor(
@@ -160,7 +160,7 @@ func (keyRing *KeyRing) DecryptAttachment(message *PGPSplitMessage) (*PlainMessa
 	return &PlainMessage{
 		Data:     b,
 		TextType: !md.LiteralData.IsBinary,
-		filename: md.LiteralData.FileName,
-		time:     md.LiteralData.Time,
+		Filename: md.LiteralData.FileName,
+		Time:     md.LiteralData.Time,
 	}, nil
 }

crypto/keyring_message.go

@@ -147,7 +147,7 @@ func asymmetricDecrypt(
 	return &PlainMessage{
 		Data:     body,
 		TextType: !messageDetails.LiteralData.IsBinary,
-		filename: messageDetails.LiteralData.FileName,
-		time:     messageDetails.LiteralData.Time,
+		Filename: messageDetails.LiteralData.FileName,
+		Time:     messageDetails.LiteralData.Time,
 	}, err
 }

crypto/message.go

@@ -28,9 +28,9 @@ type PlainMessage struct {
 	// If the content is text or binary
 	TextType bool
 	// The file's latest modification time
-	time uint32
+	Time uint32
 	// The encrypted message's filename
-	filename string
+	Filename string
 }
 
 // PGPMessage stores a PGP-encrypted message.
@@ -67,7 +67,7 @@ func NewPlainMessage(data []byte) *PlainMessage {
 	return &PlainMessage{
 		Data:     clone(data),
 		TextType: false,
-		time:     uint32(GetUnixTime()),
+		Time:     uint32(GetUnixTime()),
 	}
 }
 
@@ -78,8 +78,8 @@ func NewPlainMessageFromFile(data []byte, filename string, time uint32) *PlainMe
 	return &PlainMessage{
 		Data:     clone(data),
 		TextType: false,
-		filename: filename,
-		time:     time,
+		Filename: filename,
+		Time:     time,
 	}
 }
 
@@ -89,7 +89,7 @@ func NewPlainMessageFromString(text string) *PlainMessage {
 	return &PlainMessage{
 		Data:     []byte(strings.ReplaceAll(strings.ReplaceAll(text, "\r\n", "\n"), "\n", "\r\n")),
 		TextType: true,
-		time:     uint32(GetUnixTime()),
+		Time:     uint32(GetUnixTime()),
 	}
 }
 
@@ -222,12 +222,12 @@ func (msg *PlainMessage) IsBinary() bool {
 
 // GetFilename returns the file name of the message as a string.
 func (msg *PlainMessage) GetFilename() string {
-	return msg.filename
+	return msg.Filename
 }
 
 // GetTime returns the modification time of a file (if provided in the ciphertext).
 func (msg *PlainMessage) GetTime() uint32 {
-	return msg.time
+	return msg.Time
 }
 
 // GetBinary returns the unarmored binary content of the message as a []byte.

crypto/password.go

@@ -165,7 +165,7 @@ func passwordDecrypt(encryptedIO io.Reader, password []byte) (*PlainMessage, err
 	return &PlainMessage{
 		Data:     messageBuf.Bytes(),
 		TextType: !md.LiteralData.IsBinary,
-		filename: md.LiteralData.FileName,
-		time:     md.LiteralData.Time,
+		Filename: md.LiteralData.FileName,
+		Time:     md.LiteralData.Time,
 	}, nil
 }

crypto/sessionkey.go

@@ -219,8 +219,8 @@ func (sk *SessionKey) Decrypt(dataPacket []byte) (*PlainMessage, error) {
 	return &PlainMessage{
 		Data:     messageBuf.Bytes(),
 		TextType: !md.LiteralData.IsBinary,
-		filename: md.LiteralData.FileName,
-		time:     md.LiteralData.Time,
+		Filename: md.LiteralData.FileName,
+		Time:     md.LiteralData.Time,
 	}, err
 }