X-Original-To: alpine-devel@lists.alpinelinux.org
Delivered-To: alpine-devel@mail.alpinelinux.org
Received: from mail-la0-f41.google.com (mail-la0-f41.google.com [209.85.215.41])
	(using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits))
	(No client certificate requested)
	by mail.alpinelinux.org (Postfix) with ESMTPS id 23050DC0110
	for <alpine-devel@lists.alpinelinux.org>; Tue,  2 Sep 2014 13:10:05 +0000 (UTC)
Received: by mail-la0-f41.google.com with SMTP id gi9so7817410lab.14
        for <alpine-devel@lists.alpinelinux.org>; Tue, 02 Sep 2014 06:10:03 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=sender:date:from:to:cc:subject:message-id:in-reply-to:references
         :mime-version:content-type:content-transfer-encoding;
        bh=X1NWdpIayybqAn+R8eOg8lxY7M7B73YwhEJPaC9Hm98=;
        b=wNi6Q8ojkaX4idShKPu3l4yMigYpDnuhU7ORAsg6VnkMPiQ8kZVzi+NB4MoVj/6U+m
         lnRUlJGpZPxuhMRqRdMcuMLWwIooWorJkcGtjDyBVWu+90P/upEb/SaWYfBNucenmxhq
         lKpB34zSEBNBfZiH1w07Tp+MVD5svHn2V99Ci1Gf5Ez2swncBCsQ5BgNY8rkFNlOGxkX
         ZMrOyekGaGi64Ai7SofkbQKjkGJDP0kzaTN/nHr5vPQz6T341W1mBCFWqhNOp5BJF9FC
         w/8pkCD1Rw9nWF/i9an0ivaFivwe3l2WR6oWc3MwZH0eVrjXI01trhuKsE2tvU9Qf8mP
         7QkQ==
X-Received: by 10.112.134.101 with SMTP id pj5mr32939025lbb.47.1409663402916;
        Tue, 02 Sep 2014 06:10:02 -0700 (PDT)
Received: from vostro ([2001:1bc8:101:f402:21a:9fff:fe0c:4022])
        by mx.google.com with ESMTPSA id uq8sm2482379lac.32.2014.09.02.06.10.02
        for <multiple recipients>
        (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
        Tue, 02 Sep 2014 06:10:02 -0700 (PDT)
Sender: =?UTF-8?Q?Timo_Ter=C3=A4s?= <timo.teras@gmail.com>
Date: Tue, 2 Sep 2014 16:09:47 +0300
From: Timo Teras <timo.teras@iki.fi>
To: Johannes Matheis <jomat+alpinebuild@jmt.gr>
Cc: alpine-devel@lists.alpinelinux.org
Subject: Re: [alpine-devel] [PATCH] main/openssh: curve25519pad patch added
Message-ID: <20140902160947.51e99956@vostro>
In-Reply-To: <1409658864-turnsole-7471@jmt.gr>
References: <1409587469-turnsole-84454@jmt.gr>
	<20140902082034.0b8bffb4@vostro>
	<1409658864-turnsole-7471@jmt.gr>
X-Mailer: Claws Mail 3.10.1 (GTK+ 2.24.23; x86_64-alpine-linux-musl)
X-Mailinglist: alpine-devel
Precedence: list
List-Id: Alpine Development <alpine-devel.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-devel+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-devel@lists.alpinelinux.org>
List-Help: <mailto:alpine-devel+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-devel+subscribe@lists.alpinelinux.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Tue, 02 Sep 2014 12:25:09 +0000
Johannes Matheis <jomat+alpinebuild@jmt.gr> wrote:

> Excerpts from Timo Teras's message of 2014-09-02 05:20:34 +0000:
> > The mailing list archives seem to have auto-converted all '@'
> > symbols to string ' at ' including the patch's string literals. The
> > patch you have attached is mangled and incorrect.
> 
> I can't reconstruct that. The attached file is identical with the
> output of 'git format-patch'. It applies without errors. The md5sum
> of it is: 1e38829821d8b2759ac106b644a11e7d
> 
> ~/aports/main/openssh% wget -qO-
> http://lists.alpinelinux.org/alpine-devel/\
> att-4054/0001-main-openssh-curve25519pad-patch-added.patch | patch
> patching file APKBUILD patching file openssh-curve25519pad.patch
> ~/aports/main/openssh%
> 
> I additionally uploaded it to http://sprunge.us/LMhW
> 
> Please don't hesitate to contact me again if you're still experiencing
> problems with it.

No, nothing wrong with the patch against aports. It's the
openssh-curve25519pad.patch that you are adding (which you assumedly
wgetted from openssl archives).

That file has:

+	kex_prop = filter_proposal(kex_prop, "curve25519-sha256 at
libssh.org");

But if you look cvsweb, the real code is:

	kex_prop = filter_proposal(kex_prop, "curve25519-sha256@libssh.org");

See:
http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/compat.c?rev=1.85&content-type=text/x-cvsweb-markup

In otherwords, wget from openssh mailing list archive produces
incorrect patch file. You need to find better archive, the original bug
report, or recreate the original patch from openssh version control.


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---