From 344294659efc0602e9f7c918c44bedd0373b8649 Mon Sep 17 00:00:00 2001
From: Sanjana Rajan <srajan1@stanford.edu>
Date: Thu, 27 Oct 2016 11:50:30 -0700
Subject: [PATCH] invalidate expired primary keys

---
 src/key.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/key.js b/src/key.js
index 0b8b034f..d0897cc7 100644
--- a/src/key.js
+++ b/src/key.js
@@ -358,7 +358,7 @@ Key.prototype.getEncryptionKeyPacket = function() {
   }
   // if no valid subkey for encryption, evaluate primary key
   var primaryUser = this.getPrimaryUser();
-  if (primaryUser &&
+  if (primaryUser && primaryUser.selfCertificate && !primaryUser.selfCertificate.isExpired &&
       isValidEncryptionKeyPacket(this.primaryKey, primaryUser.selfCertificate)) {
     return this.primaryKey;
   }