Attachment 3174 Details for Bug 2390 – Make PROTOCOL.key agree more closely with reality

[patch] Make PROTOCOL.key agree more closely with reality

0001-Make-PROTOCOL.key-agree-more-closely-with-reality.patch (text/plain), 1.36 KB, created by Colin Watson on 2018-08-28 20:23:02 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Watson

Created: 2018-08-28 20:23:02 AEST

Size: 1.36 KB

patch

obsolete

>From effb0a95b96f1c6c1f3a449e7f60217e9f0388b5 Mon Sep 17 00:00:00 2001
>From: Colin Watson <cjwatson@debian.org>
>Date: Tue, 28 Aug 2018 11:15:19 +0100
>Subject: [PATCH] Make PROTOCOL.key agree more closely with reality
>
>Private keys are encoded as byte arrays rather than as protocol strings
>(i.e. they have no preceding length).
>
>I also used "byte" rather than "char" and "uint32" rather than "int", to
>match the vocabulary defined in RFC4251.
>
>Reported by Simon Tatham, bz#2390.
>---
> PROTOCOL.key | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
>diff --git a/PROTOCOL.key b/PROTOCOL.key
>index 959bd7ae..6f49c3f7 100644
>--- a/PROTOCOL.key
>+++ b/PROTOCOL.key
>@@ -11,7 +11,7 @@ an encrypted list of matching private keys.
> 	string	ciphername
> 	string	kdfname
> 	string	kdfoptions
>-	int	number of keys N
>+	uint32	number of keys N
> 	string	publickey1
> 	string	publickey2
> 	...
>@@ -35,18 +35,18 @@ of the cipher block size.
> 
> 	uint32	checkint
> 	uint32	checkint
>-	string	privatekey1
>+	byte[]	privatekey1
> 	string	comment1
>-	string	privatekey2
>+	byte[]	privatekey2
> 	string	comment2
> 	...
>-	string	privatekeyN
>+	byte[]	privatekeyN
> 	string	commentN
>-	char	1
>-	char	2
>-	char	3
>+	byte	1
>+	byte	2
>+	byte	3
> 	...
>-	char	padlen % 255
>+	byte	padlen % 255
> 
> Before the key is encrypted, a random integer is assigned
> to both checkint fields so successful decryption can be
>-- 
>2.18.0
>

Actions: View | Diff

Attachments on bug 2390: 2607 | 2608 | 3174