Hi,
The new SSH key format, ed25519, is not present in /etc/X11/xdm/Xsession. --- Xsession.cpp.orig Tue Feb 25 09:33:26 2014 +++ Xsession.cpp Tue Feb 25 09:33:50 2014 @@ -44,6 +44,7 @@ id1=$HOME/.ssh/identity id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa id4=$HOME/.ssh/id_ecdsa +id5=$HOME/.ssh/id_ed25519 if [ -z "$SSH_AGENT_PID" ]; then |
On 02/25/14 09:38, Tristan Le Guern wrote:
> Hi, > > The new SSH key format, ed25519, is not present in /etc/X11/xdm/Xsession. > > --- Xsession.cpp.orig Tue Feb 25 09:33:26 2014 > +++ Xsession.cpp Tue Feb 25 09:33:50 2014 > @@ -44,6 +44,7 @@ id1=$HOME/.ssh/identity > id2=$HOME/.ssh/id_dsa > id3=$HOME/.ssh/id_rsa > id4=$HOME/.ssh/id_ecdsa > +id5=$HOME/.ssh/id_ed25519 > if [ -z "$SSH_AGENT_PID" ]; > then > In xenocara/app/xdm/config/ by the way ... |
In reply to this post by Tristan Le Guern-3
On 2014/02/25 09:38, Tristan Le Guern wrote:
> Hi, > > The new SSH key format, ed25519, is not present in /etc/X11/xdm/Xsession. > > --- Xsession.cpp.orig Tue Feb 25 09:33:26 2014 > +++ Xsession.cpp Tue Feb 25 09:33:50 2014 > @@ -44,6 +44,7 @@ id1=$HOME/.ssh/identity > id2=$HOME/.ssh/id_dsa > id3=$HOME/.ssh/id_rsa > id4=$HOME/.ssh/id_ecdsa > +id5=$HOME/.ssh/id_ed25519 > if [ -z "$SSH_AGENT_PID" ]; > then > It needs to be added to the check as well, that's just a variable definition. I think it's low-impact though, it would be fairly unusual to have id_ed25519 without at least one of the other files, so I don't see much harm in waiting until after we've tagged 5.5 if that's preferred. Index: Xsession.cpp =================================================================== RCS file: /cvs/xenocara/app/xdm/config/Xsession.cpp,v retrieving revision 1.12 diff -u -p -r1.12 Xsession.cpp --- Xsession.cpp 19 May 2013 07:22:53 -0000 1.12 +++ Xsession.cpp 25 Feb 2014 09:36:48 -0000 @@ -44,9 +44,10 @@ id1=$HOME/.ssh/identity id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa id4=$HOME/.ssh/id_ecdsa +id5=$HOME/.ssh/id_ed25519 if [ -z "$SSH_AGENT_PID" ]; then - if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; + if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ]; then eval `ssh-agent -s` ssh-add < /dev/null |
On Tue, Feb 25, 2014 at 09:41:24AM +0000, Stuart Henderson wrote:
> On 2014/02/25 09:38, Tristan Le Guern wrote: > > Hi, > > > > The new SSH key format, ed25519, is not present in /etc/X11/xdm/Xsession. > > > > --- Xsession.cpp.orig Tue Feb 25 09:33:26 2014 > > +++ Xsession.cpp Tue Feb 25 09:33:50 2014 > > @@ -44,6 +44,7 @@ id1=$HOME/.ssh/identity > > id2=$HOME/.ssh/id_dsa > > id3=$HOME/.ssh/id_rsa > > id4=$HOME/.ssh/id_ecdsa > > +id5=$HOME/.ssh/id_ed25519 > > if [ -z "$SSH_AGENT_PID" ]; > > then > > > > It needs to be added to the check as well, that's just a variable > definition. I think it's low-impact though, it would be fairly unusual > to have id_ed25519 without at least one of the other files, so I > don't see much harm in waiting until after we've tagged 5.5 if that's > preferred. ok for that one. But don't forget about app/xinit/xinitrc.cpp which also contains simila code. I'll handle it later this evening if no one beats me. > > > Index: Xsession.cpp > =================================================================== > RCS file: /cvs/xenocara/app/xdm/config/Xsession.cpp,v > retrieving revision 1.12 > diff -u -p -r1.12 Xsession.cpp > --- Xsession.cpp 19 May 2013 07:22:53 -0000 1.12 > +++ Xsession.cpp 25 Feb 2014 09:36:48 -0000 > @@ -44,9 +44,10 @@ id1=$HOME/.ssh/identity > id2=$HOME/.ssh/id_dsa > id3=$HOME/.ssh/id_rsa > id4=$HOME/.ssh/id_ecdsa > +id5=$HOME/.ssh/id_ed25519 > if [ -z "$SSH_AGENT_PID" ]; > then > - if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; > + if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ]; > then > eval `ssh-agent -s` > ssh-add < /dev/null > -- Matthieu Herrb |
In reply to this post by Tristan Le Guern-3
Please get this solved and commited ASAP, or it will miss release.
|
On Tue, Feb 25, 2014 at 08:59:02AM -0700, Theo de Raadt wrote:
> Please get this solved and commited ASAP, or it will miss release. Sorry I was busy with other stuff. So here is the full diff ok ? Index: app/xdm/config/Xsession.cpp =================================================================== RCS file: /cvs/OpenBSD/xenocara/app/xdm/config/Xsession.cpp,v retrieving revision 1.12 diff -u -r1.12 Xsession.cpp --- app/xdm/config/Xsession.cpp 19 May 2013 07:22:53 -0000 1.12 +++ app/xdm/config/Xsession.cpp 25 Feb 2014 22:08:18 -0000 @@ -44,9 +44,10 @@ id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa id4=$HOME/.ssh/id_ecdsa +id5=$HOME/.ssh/id_ed25519 if [ -z "$SSH_AGENT_PID" ]; then - if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; + if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ]; then eval `ssh-agent -s` ssh-add < /dev/null Index: app/xinit/xinitrc.cpp =================================================================== RCS file: /cvs/OpenBSD/xenocara/app/xinit/xinitrc.cpp,v retrieving revision 1.10 diff -u -r1.10 xinitrc.cpp --- app/xinit/xinitrc.cpp 19 May 2013 07:22:53 -0000 1.10 +++ app/xinit/xinitrc.cpp 25 Feb 2014 22:08:18 -0000 @@ -45,9 +45,11 @@ id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa id4=$HOME/.ssh/id_ecdsa +id5=$HOME/.ssh/id_id_ed25519 + if [ -z "$SSH_AGENT_PID" ]; then - if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 ]; + if [ -x /usr/bin/ssh-agent ] && [ -f $id1 -o -f $id2 -o -f $id3 -o -f $id4 -o -f $id5 ]; then eval `ssh-agent -s` ssh-add < /dev/null -- Matthieu Herrb |
In reply to this post by Tristan Le Guern-3
OK.
|
On Tue, Feb 25, 2014 at 03:12:15PM -0700, Theo de Raadt wrote:
> OK. oops Pablo Méndez Hernández <[hidden email]> pointed out there is a typo in my commit. ok ? Index: xinitrc.cpp =================================================================== RCS file: /cvs/OpenBSD/xenocara/app/xinit/xinitrc.cpp,v retrieving revision 1.11 diff -u -p -u -r1.11 xinitrc.cpp --- xinitrc.cpp 25 Feb 2014 22:16:24 -0000 1.11 +++ xinitrc.cpp 26 Feb 2014 12:45:25 -0000 @@ -45,7 +45,7 @@ id1=$HOME/.ssh/identity id2=$HOME/.ssh/id_dsa id3=$HOME/.ssh/id_rsa id4=$HOME/.ssh/id_ecdsa -id5=$HOME/.ssh/id_id_ed25519 +id5=$HOME/.ssh/id_ed25519 if [ -z "$SSH_AGENT_PID" ]; then -- Matthieu Herrb |
Matthieu Herrb <[hidden email]> writes:
> On Tue, Feb 25, 2014 at 03:12:15PM -0700, Theo de Raadt wrote: >> OK. > > oops Pablo Méndez Hernández <[hidden email]> pointed out there is a > typo in my commit. ok ? Sure. > Index: xinitrc.cpp > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/app/xinit/xinitrc.cpp,v > retrieving revision 1.11 > diff -u -p -u -r1.11 xinitrc.cpp > --- xinitrc.cpp 25 Feb 2014 22:16:24 -0000 1.11 > +++ xinitrc.cpp 26 Feb 2014 12:45:25 -0000 > @@ -45,7 +45,7 @@ id1=$HOME/.ssh/identity > id2=$HOME/.ssh/id_dsa > id3=$HOME/.ssh/id_rsa > id4=$HOME/.ssh/id_ecdsa > -id5=$HOME/.ssh/id_id_ed25519 > +id5=$HOME/.ssh/id_ed25519 > > if [ -z "$SSH_AGENT_PID" ]; > then -- jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE |
In reply to this post by Matthieu Herrb
On Wed, Feb 26, 2014 at 1:47 PM, Matthieu Herrb <[hidden email]> wrote:
> On Tue, Feb 25, 2014 at 03:12:15PM -0700, Theo de Raadt wrote: >> OK. > > oops Pablo Méndez Hernández <[hidden email]> pointed out there is a > typo in my commit. ok ? Yes. > Index: xinitrc.cpp > =================================================================== > RCS file: /cvs/OpenBSD/xenocara/app/xinit/xinitrc.cpp,v > retrieving revision 1.11 > diff -u -p -u -r1.11 xinitrc.cpp > --- xinitrc.cpp 25 Feb 2014 22:16:24 -0000 1.11 > +++ xinitrc.cpp 26 Feb 2014 12:45:25 -0000 > @@ -45,7 +45,7 @@ id1=$HOME/.ssh/identity > id2=$HOME/.ssh/id_dsa > id3=$HOME/.ssh/id_rsa > id4=$HOME/.ssh/id_ecdsa > -id5=$HOME/.ssh/id_id_ed25519 > +id5=$HOME/.ssh/id_ed25519 > > if [ -z "$SSH_AGENT_PID" ]; > then > > -- > Matthieu Herrb |
In reply to this post by Tristan Le Guern-3
Right away please.
|
Free forum by Nabble | Edit this page |