OpenSSHKey: when writing to agent, ensure comment string is at least …

…one byte This unbreaks adding keys to gpg-agent. Signed-off-by: Steven Noonan <[email protected]>
keepassxreboot · Mar 8, 2018 · fc1cab2 · fc1cab2
1 parent aa63277
commit fc1cab2
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/src/sshagent/OpenSSHKey.cpp b/src/sshagent/OpenSSHKey.cpp
@@ -552,9 +552,18 @@ bool OpenSSHKey::writePrivate(BinaryStream& stream)
         }
     }
 
-    if (!stream.writeString(m_comment)) {
-        m_error = tr("Unexpected EOF when writing private key");
-        return false;
+    if (m_comment.length() == 0) {
+        // gpg-agent fails to understand zero-length comment strings, so we
+        // need to provide a string that is at least one character long.
+        if (!stream.writeString(QString(" "))) {
+            m_error = tr("Unexpected EOF when writing private key");
+            return false;
+        }
+    } else {
+        if (!stream.writeString(m_comment)) {
+            m_error = tr("Unexpected EOF when writing private key");
+            return false;
+        }
     }
 
     return true;