From 9ef4b8ba1e4873b656cf8c77e933356c2a2a7875 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 16 Jan 2020 14:36:07 -0500
Subject: [PATCH] use loop instead of lambda, only call die if all tries fail

---
 .../cobbzilla/util/security/RsaKeyPair.java   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/cobbzilla/util/security/RsaKeyPair.java b/src/main/java/org/cobbzilla/util/security/RsaKeyPair.java
index d086dc0..71647b8 100644
--- a/src/main/java/org/cobbzilla/util/security/RsaKeyPair.java
+++ b/src/main/java/org/cobbzilla/util/security/RsaKeyPair.java
@@ -135,14 +135,14 @@ public class RsaKeyPair {
     }
 
     public RsaMessage encrypt(String data, RsaKeyPair recipient) {
-        return retry(() -> {
-            @Cleanup("delete") final TempDir temp = new TempDir();
-
-            secureFile(temp, "data", data);
-            secureFile(temp, "recipient.crt", recipient.getPublicKey());
-            secureFile(temp, "sender.key", getPrivateKey());
-            secureFile(temp, "sender.crt", getPublicKey());
+        Exception lastEx = null;
+        for (int i=0; i<MAX_RETRIES; i++) {
             try {
+                @Cleanup("delete") final TempDir temp = new TempDir();
+                secureFile(temp, "data", data);
+                secureFile(temp, "recipient.crt", recipient.getPublicKey());
+                secureFile(temp, "sender.key", getPrivateKey());
+                secureFile(temp, "sender.crt", getPublicKey());
                 execScript("cd "+abs(temp)+" && " +
                         // generate random symmetric key
                         "openssl rand -out secret.key 32 && " +
@@ -162,9 +162,11 @@ public class RsaKeyPair {
                         .setData(Base64.readB64(temp, "data.enc"))
                         .setSignature(Base64.readB64(temp, "data.sig"));
             } catch (Exception e) {
-                return die("encrypt: "+e);
+                lastEx = e;
+                log.warn("encrypt: "+shortError(e));
             }
-        }, MAX_RETRIES);
+        }
+        return die("encrypt: "+lastEx);
     }
 
     public String decrypt(RsaMessage message, RsaKeyPair sender) {