Package: sugar-toolkit-gtk3 / 0.112-3

020190101~39b7e606.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
Description: get_profile() - handle new OpenSSH DSA key format
 OpenSSH changed the format of the DSA key,
 and this broke Sugar connection to Jabber.
Author: James Cameron <quozl@laptop.org>
Origin: Upstream, https://github.com/sugarlabs/sugar-toolkit-gtk3/commit/39b7e606
Bug: https://bugs.sugarlabs.org/ticket/4992
Bug: https://github.com/sugarlabs/sugar/issues/814
Bug-Debian: https://bugs.debian.org/928801
Last-Update: 2019-05-11
--- a/src/sugar3/profile.py
+++ b/src/sugar3/profile.py
@@ -115,10 +115,12 @@
         end_found = False
         for l in lines:
             l = l.strip()
-            if l.startswith('-----BEGIN DSA PRIVATE KEY-----'):
+            if l.startswith(['-----BEGIN DSA PRIVATE KEY-----',
+                             '-----BEGIN OPENSSH PRIVATE KEY-----']):
                 begin_found = True
                 continue
-            if l.startswith('-----END DSA PRIVATE KEY-----'):
+            if l.startswith(['-----END DSA PRIVATE KEY-----',
+                             '-----END OPENSSH PRIVATE KEY-----']):
                 end_found = True
                 continue
             key += l