[Libreoffice-commits] online.git: wsd/ProofKey.cpp

[Andras Timar (via logerrit)]

 wsd/ProofKey.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0645a647c40ddade5e286dcdceae3e90ce4cb2b
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed Apr 22 23:18:36 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed Apr 22 23:52:21 2020 +0200

    Proof: SSH private key format matters
    
    On openSUSE Leap 15.1 the ssh-keygen binary produced a private key
    that caused Poco to throw an exception. Apparently Poco expects
    the private key in PEM format. Apparently on most distros this is
    the default format, but not on openSUSE Leap 15.1 where we need
    to specify it explicitely.
    
    Change-Id: Id142735b13887a1347895f121400ed6d5aecc1f4
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/92736
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/wsd/ProofKey.cpp b/wsd/ProofKey.cpp
index 2c390c19b..836b2967a 100644
--- a/wsd/ProofKey.cpp
+++ b/wsd/ProofKey.cpp
@@ -143,7 +143,7 @@ Proof::Proof()
             std::string msg = e.displayText() +
                 "\nNo proof-key will be present in discovery."
                 "\nIf you need to use WOPI security, generate an RSA key using this command line:"
-                "\n    ssh-keygen -t rsa -N \"\" -f \"" + keyPath + "\"";
+                "\n    ssh-keygen -t rsa -N \"\" -m PEM -f \"" + keyPath + "\"";
             LOG_WRN(msg);
         }
         catch (const Poco::Exception& e)