Mail archive
alpine-devel

Re: [alpine-devel] [PATCH] main/openssh: curve25519pad patch added

From: Timo Teras <timo.teras_at_iki.fi>
Date: Tue, 2 Sep 2014 16:09:47 +0300

On Tue, 02 Sep 2014 12:25:09 +0000
Johannes Matheis <jomat+alpinebuild_at_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 '_at_'
> > 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_at_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_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Tue Sep 02 2014 - 16:09:47 GMT