Improved handling of key-material

2017-09-01 14:21:53 +02:00
parent 239d582cb2
commit 0294a5c0dd
7 changed files with 203 additions and 91 deletions
@@ -349,12 +349,19 @@ func (device *Device) RoutineEncryption() {
 		// encrypt content (append to header)

 		binary.LittleEndian.PutUint64(nonce[4:], elem.nonce)
-		elem.packet = elem.keyPair.send.Seal(
-			header,
-			nonce[:],
-			elem.packet,
-			nil,
-		)
+		elem.keyPair.send.mutex.RLock()
+		if elem.keyPair.send.aead == nil {
+			// very unlikely (the key was deleted during queuing)
+			elem.Drop()
+		} else {
+			elem.packet = elem.keyPair.send.aead.Seal(
+				header,
+				nonce[:],
+				elem.packet,
+				nil,
+			)
+		}
+		elem.keyPair.send.mutex.RUnlock()
 		elem.mutex.Unlock()

 		// refresh key if necessary